Ignore:
Timestamp:
2016-06-12T20:46:23+02:00 (8 years ago)
Author:
stoecker
Message:

gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

    r10210 r10364  
    891891    protected final <P extends OsmPrimitive> OsmDataLayer findLayerFor(P primitive) {
    892892        if (primitive != null) {
    893             Iterable<OsmDataLayer> layers = Main.map.mapView.getLayersOfType(OsmDataLayer.class);
     893            Iterable<OsmDataLayer> layers = Main.getLayerManager().getLayersOfType(OsmDataLayer.class);
    894894            // Find layer with same dataset
    895895            for (OsmDataLayer layer : layers) {
Note: See TracChangeset for help on using the changeset viewer.