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

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/actions

Files:

• CreateCircleAction.java (modified) (2 diffs)
• SimplifyWayAction.java (modified) (2 diffs)
• mapmode/ImproveWayAccuracyAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.command.AddCommand;
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -234 +234 @@
             cmds.add(new AddCommand(ds, newWay));
         } else {
-            Way newWay = new Way(existingWay);
-            newWay.setNodes(nodesToAdd);
-            cmds.add(new ChangeCommand(ds, existingWay, newWay));
+            cmds.add(new ChangeNodesCommand(ds, existingWay, nodesToAdd));
         }
 

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -31 +31 @@
 import javax.swing.event.ChangeListener;
 
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -411 +411 @@
 
         Collection<Command> cmds = new LinkedList<>();
-        Way newWay = new Way(w);
-        newWay.setNodes(newNodes);
-        cmds.add(new ChangeCommand(w, newWay));
+        cmds.add(new ChangeNodesCommand(w, newNodes));
         cmds.add(new DeleteCommand(w.getDataSet(), delNodes));
         w.getDataSet().clearSelection(delNodes);

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -490 +490 @@
                             UndoRedoHandler.getInstance().add(deleteCmd);
                         }
+                        newWay.setNodes(null);
                     } else {
                         UndoRedoHandler.getInstance().add(new ChangeCommand(targetWay, newWay));

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -17 +17 @@
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Optional;
 
@@ -23 +24 @@
 import org.openstreetmap.josm.actions.MergeNodesAction;
 import org.openstreetmap.josm.command.AddCommand;
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
@@ -1242 +1243 @@
             for (WaySegment virtualWay : virtualWays) {
                 Way w = virtualWay.way;
-                Way wnew = new Way(w);
-                wnew.addNode(virtualWay.lowerIndex + 1, virtualNode);
-                virtualCmds.add(new ChangeCommand(ds, w, wnew));
+                List<Node> modNodes = w.getNodes();
+                modNodes.add(virtualWay.lowerIndex + 1, virtualNode);
+                virtualCmds.add(new ChangeNodesCommand(ds, w, modNodes));
             }
             virtualCmds.add(new MoveCommand(ds, virtualNode, startEN, currentEN));