Changeset 14556 in josm for trunk/src/org

Timestamp:

2018-12-12T15:59:43+01:00 (5 years ago)

Author:

GerdP

Message:

see #17040 more cleanup in OsmDataLayer.destroy()

• remove DatasetListeners previously added
• clear recentRelations
• don't call Dataset.clear() here because there may still be active listeners

• call DataSet.clear in LayerManager after all listeners are removed

Hope this doesn't break unit tests, can't test on my machine.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (1 diff)
• gui/layer/LayerManager.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -1036 +1036 @@
     @Override
     public void clear() {
+        //TODO: Why can't we clear a dataset that is locked?
+        //TODO: Report listeners that are still active (should be none)
         checkModifiable();
         beginUpdate();

trunk/src/org/openstreetmap/josm/gui/layer/LayerManager.java

@@ -12 +12 @@
 import java.util.function.Consumer;
 
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -478 +479 @@
             }
         }
+        if (layer instanceof OsmDataLayer) {
+            DataSet data = ((OsmDataLayer)layer).data;
+            if (data != null && !data.isLocked())
+                data.clear();
+        }
         return e.scheduleForRemoval;
     }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -359 +359 @@
      */
     public final DataSet data;
+    private DataSetListenerAdapter dataSetListenerAdapter;
 
     /**
@@ -412 +413 @@
         this.data = data;
         this.data.setName(name);
+        this.dataSetListenerAdapter = new DataSetListenerAdapter(this);
         this.setAssociatedFile(associatedFile);
-        data.addDataSetListener(new DataSetListenerAdapter(this));
+        data.addDataSetListener(dataSetListenerAdapter);
         data.addDataSetListener(MultipolygonCache.getInstance());
         data.addHighlightUpdateListener(this);
@@ -1059 +1061 @@
         data.removeSelectionListener(this);
         data.removeHighlightUpdateListener(this);
+        data.removeDataSetListener(dataSetListenerAdapter);
+        data.removeDataSetListener(MultipolygonCache.getInstance());
         removeClipboardDataFor(this);
-        if (!data.isLocked()) {
-            data.clear();
-        }
+        recentRelations.clear();
     }