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

Timestamp:

2017-06-09T21:31:00+02:00 (9 years ago)

Author:

michael2402

Message:

Fix listener leak in ChangesetDialog and migrate ChangesetInSelectionListModel to new dataset listeners.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified) (3 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.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager;
@@ -113 +114 @@
         // let the model for changesets in the current selection listen to various events
         ChangesetCache.getInstance().addChangesetCacheListener(inSelectionModel);
-        Main.getLayerManager().addActiveLayerChangeListener(inSelectionModel);
-        DataSet.addSelectionListener(inSelectionModel);
+        SelectionEventManager.getInstance().addSelectionListener(inSelectionModel);
 
         // let the model for changesets in the current layer listen to various
@@ -140 +140 @@
         // remove the list model for the changesets in the current selection as
         // listener
-        //
-        Main.getLayerManager().removeActiveLayerChangeListener(inSelectionModel);
-        DataSet.removeSelectionListener(inSelectionModel);
+        SelectionEventManager.getInstance().removeSelectionListener(inSelectionModel);
+        ChangesetCache.getInstance().removeChangesetCacheListener(inSelectionModel);
     }