Changeset 12373 in josm for trunk/src

Timestamp:

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

Author:

michael2402

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• ChangesetDialog.java (modified) (3 diffs)
• changeset/ChangesetInSelectionListModel.java (modified) (2 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);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.changeset;
 
-import java.util.Collection;
-
 import javax.swing.DefaultListSelectionModel;
 
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
-import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 
 /**
  * A table of changesets that displays the ones that are used by the primitives in the current selection.
  */
-public class ChangesetInSelectionListModel extends ChangesetListModel implements SelectionChangedListener, ActiveLayerChangeListener {
+public class ChangesetInSelectionListModel extends ChangesetListModel implements DataSelectionListener {
 
     /**
@@ -26 +20 @@
 
     /* ---------------------------------------------------------------------------- */
-    /* Interface SelectionChangeListener                                            */
+    /* Interface DataSelectionListener                                              */
     /* ---------------------------------------------------------------------------- */
+
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        initFromPrimitives(newSelection);
-    }
-
-    /* ---------------------------------------------------------------------------- */
-    /* Interface LayerChangeListener                                                */
-    /* ---------------------------------------------------------------------------- */
-    @Override
-    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        DataSet newData = e.getSource().getEditDataSet();
-        if (newData == null) {
-            setChangesets(null);
-        } else {
-            initFromPrimitives(newData.getAllSelected());
-        }
+    public void selectionChanged(SelectionChangeEvent event) {
+        initFromPrimitives(event.getSelection());
     }
 }