Changeset 10332 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

Timestamp:

2016-06-07T08:22:39+02:00 (8 years ago)

Author:

stoecker

Message:

Do not use deprecated EditLayerChangedListener - patch my Michael Zangl - gsoc-core - fix #12924

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

@@ -43 +43 @@
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager;
@@ -115 +114 @@
         // let the model for changesets in the current selection listen to various events
         ChangesetCache.getInstance().addChangesetCacheListener(inSelectionModel);
-        MapView.addEditLayerChangeListener(inSelectionModel);
+        Main.getLayerManager().addActiveLayerChangeListener(inSelectionModel);
         DataSet.addSelectionListener(inSelectionModel);
 
@@ -121 +120 @@
         // events and bootstrap it's content
         ChangesetCache.getInstance().addChangesetCacheListener(inActiveDataLayerModel);
-        MapView.addEditLayerChangeListener(inActiveDataLayerModel);
+        Main.getLayerManager().addActiveLayerChangeListener(inActiveDataLayerModel);
         OsmDataLayer editLayer = Main.main.getEditLayer();
         if (editLayer != null) {
@@ -134 +133 @@
         //
         ChangesetCache.getInstance().removeChangesetCacheListener(inActiveDataLayerModel);
-        MapView.removeEditLayerChangeListener(inActiveDataLayerModel);
+        Main.getLayerManager().removeActiveLayerChangeListener(inActiveDataLayerModel);
         OsmDataLayer editLayer = Main.main.getEditLayer();
         if (editLayer != null) {
@@ -143 +142 @@
         // listener
         //
-        MapView.removeEditLayerChangeListener(inSelectionModel);
+        Main.getLayerManager().removeActiveLayerChangeListener(inSelectionModel);
         DataSet.removeSelectionListener(inSelectionModel);
     }