Changeset 14500 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2018-12-03T01:53:41+01:00 (7 years ago)

Author:

Don-vip

Message:

see #17040 - fix memory leak after primitives are copied to clipboard

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (4 diffs)

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

@@ -14 +14 @@
 import java.awt.Rectangle;
 import java.awt.TexturePaint;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
 import java.awt.geom.Area;
@@ -20 +22 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -95 +98 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
+import org.openstreetmap.josm.gui.datatransfer.data.OsmLayerTransferData;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -1054 +1059 @@
         data.removeSelectionListener(this);
         data.removeHighlightUpdateListener(this);
+        removeClipboardDataFor(this);
+    }
+
+    protected static void removeClipboardDataFor(OsmDataLayer osm) {
+        Transferable clipboardContents = ClipboardUtils.getClipboardContent();
+        if (clipboardContents != null) {
+            try {
+                Object o = clipboardContents.getTransferData(OsmLayerTransferData.OSM_FLAVOR);
+                if (o instanceof OsmLayerTransferData && osm.equals(((OsmLayerTransferData) o).getLayer())) {
+                    ClipboardUtils.clear();
+                }
+            } catch (UnsupportedFlavorException | IOException e) {
+                Logging.error(e);
+            }
+        }
     }