Changeset 14672 in josm

Timestamp:

2019-01-10T09:42:03+01:00 (5 years ago)

Author:

GerdP

Message:

fix #17184: fix leaks in ValidateUploadHook and ValidatorTreePanel.destroy()

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/upload/ValidateUploadHook.java (modified) (2 diffs)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -27 +27 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.ValidatorLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.tools.GBC;
@@ -149 +150 @@
             .setButtonIcons("ok", "cancel")
             .setContent(p);
-
-        if (ed.showDialog().getValue() != 1) {
+        int rc = ed.showDialog().getValue();
+        GuiHelper.destroyComponents(ed, false);
+        ed.dispose();
+        if (rc != 1) {
             OsmValidator.initializeTests();
             OsmValidator.initializeErrorLayer();

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -25 +25 @@
 import javax.swing.tree.TreeSelectionModel;
 
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
@@ -42 +41 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Destroyable;
@@ -410 +408 @@
     public void destroy() {
         DatasetEventManager.getInstance().removeDatasetListener(this);
-        DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
-        if (ds != null) {
-            ds.removeDataSetListener(this);
-        }
+        ToolTipManager.sharedInstance().unregisterComponent(this);
         clearErrors();
     }