Changeset 17215 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2020-10-16T15:22:57+02:00 (4 years ago)

Author:

GerdP

Message:

see #19885: memory leak with "temporary" objects in validator and actions
use new ChangeMembersCommand in PropertiesDialog

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/properties

Files:

• PropertiesDialog.java (modified) (2 diffs)
• RelationRoleEditor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -56 +56 @@
 import org.openstreetmap.josm.actions.relation.DuplicateRelationAction;
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeMembersCommand;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -1154 +1154 @@
                 return;
 
-            Relation rel = new Relation(cur);
+            Relation copy = new Relation(cur);
             for (OsmPrimitive primitive: OsmDataManager.getInstance().getInProgressSelection()) {
-                rel.removeMembersFor(primitive);
-            }
-            UndoRedoHandler.getInstance().add(new ChangeCommand(cur, rel));
+                copy.removeMembersFor(primitive);
+            }
+            UndoRedoHandler.getInstance().add(new ChangeMembersCommand(cur, copy.getMembers()));
+            copy.setMembers(null); // see #19885
 
             tagTable.clearSelection();

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RelationRoleEditor.java

@@ -9 +9 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeMembersCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -45 +45 @@
             return;
         }
-        final Relation newRelation = new Relation(relation);
-        final List<RelationMember> newMembers = newRelation.getMembers();
+        final List<RelationMember> newMembers = relation.getMembers();
         newMembers.replaceAll(m -> members.contains(m) ? new RelationMember(newRole, m.getMember()) : m);
-        newRelation.setMembers(newMembers);
-        UndoRedoHandler.getInstance().add(new ChangeCommand(relation, newRelation));
+        UndoRedoHandler.getInstance().add(new ChangeMembersCommand(relation, newMembers));
     }
 }