Changeset 35574 in osm for applications/editors/josm

Timestamp:

2020-10-10T12:12:51+02:00 (4 years ago)

Author:

GerdP

Message:

see #19885: memory leak with "temporary" objects in validator and actions

• use ChangeNodesCommand instead of ChangeCommand
• simplify code to copy tags from address node

File:

• applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java (modified) (4 diffs)

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java

@@ -16 +16 @@
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Set;
 
@@ -24 +23 @@
 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.DeleteCommand;
@@ -427 +427 @@
             snapToWay(otherNodes, Arrays.asList(nodes));
             if (otherNodes.size() != other.getNodesCount()) {
-                Way newWay = new Way(other);
-                newWay.setNodes(otherNodes);
-                cmds.add(new ChangeCommand(other, newWay));
+                cmds.add(new ChangeNodesCommand(other, otherNodes));
             }
         }
@@ -471 +469 @@
             if (addrNode != null) {
                 Collection<Command> addressCmds = cmdList != null ? cmdList : new LinkedList<>();
-                for (Entry<String, String> entry : addrNode.getKeys().entrySet()) {
-                    w.put(entry.getKey(), entry.getValue());
-                }
+                addrNode.getKeys().forEach(w::put);
                 for (OsmPrimitive p : addrNode.getReferrers()) {
                     Relation r = (Relation) p;