Changeset 17110 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2020-10-08T10:37:27+02:00 (4 years ago)

Author:

GerdP

Message:

see #19885: memory leak with "temporary" objects in validator and actions
first bunch of changes

• use ChangeNodesCommand instead of ChangeCommand
• call DataSet.clearSelectionHistory() in Dataset.clear()
• remove fake parent way in AbstractMapRenderer

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/DataSet.java (modified) (1 diff)
• osm/visitor/paint/AbstractMapRenderer.java (modified) (2 diffs)
• validation/tests/Coastlines.java (modified) (2 diffs)

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

@@ -1096 +1096 @@
         update(() -> {
             clearSelection();
+            clearSelectionHistory();
             for (OsmPrimitive primitive : allPrimitives) {
                 primitive.setDataset(null);

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.OsmData;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.gui.MapViewState;
@@ -149 +150 @@
             for (WaySegment wseg: data.getHighlightedVirtualNodes()) {
                 if (wseg.way.isUsable() && !wseg.way.isDisabled()) {
-                    visitVirtual(path, wseg.toWay());
+                    Way tmpWay = wseg.toWay();
+                    visitVirtual(path, tmpWay);
+                    tmpWay.setNodes(null);
                 }
             }

trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java

@@ -14 +14 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
@@ -261 +261 @@
             if (it.hasNext()) {
                 Way way = (Way) it.next();
-                Way newWay = new Way(way);
-
-                List<Node> nodesCopy = newWay.getNodes();
+
+                List<Node> nodesCopy = way.getNodes();
                 Collections.reverse(nodesCopy);
-                newWay.setNodes(nodesCopy);
-
-                return new ChangeCommand(way, newWay);
+
+                return new ChangeNodesCommand(way, nodesCopy);
             }
         }