Changeset 36217 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

Timestamp:

2024-03-03T10:25:25+01:00 (9 months ago)

Author:

GerdP

Message:

fix #23521: fix some memory leaks

• dispose dialogs
• either avoid to create clones of ways or relations or use setNodes(null) / setMembers(null)
• replaces most ChangeCommand instances by better specialized alternatives
• add some comments
• fix some checkstyle / sonar issues

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (modified) (8 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -19 +20 @@
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeMembersCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -43 +45 @@
  */
 public class ReconstructPolygonAction extends JosmAction implements ChosenRelationListener {
-    private final ChosenRelation rel;
+    private final transient ChosenRelation rel;
 
     private static final List<String> IRRELEVANT_KEYS = Arrays.asList("source", "created_by", "note");
 
+    /**
+     * Reconstruct one or more polygons from multipolygon relation.
+     * @param rel the multipolygon relation
+     */
     public ReconstructPolygonAction(ChosenRelation rel) {
         super(tr("Reconstruct polygon"), "dialogs/filter", tr("Reconstruct polygon from multipolygon relation"),
                 Shortcut.registerShortcut("reltoolbox:reconstructpoly", tr("Relation Toolbox: {0}",
                         tr("Reconstruct polygon from multipolygon relation")),
-                        KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false);
+                        KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, false);
         this.rel = rel;
         rel.addChosenRelationListener(this);
@@ -72 +78 @@
         if (wont) {
             JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
-                    tr("Multipolygon must consist only of ways with one referring relation"),
+                    tr("Multipolygon must consist only of ways"),
                     tr("Reconstruct polygon"), JOptionPane.ERROR_MESSAGE);
             return;
@@ -85 +91 @@
 
         rel.clear();
-        List<OsmPrimitive> newSelection = new ArrayList<>();
         List<Command> commands = new ArrayList<>();
         Command relationDeleteCommand = DeleteCommand.delete(Collections.singleton(r), true, true);
@@ -108 +113 @@
                 // this ring has inner rings, so we leave a multipolygon in
                 // place and don't reconstruct the rings.
+                List<RelationMember> members = new ArrayList<>();
                 Relation n;
+                for (Way w : p.ways) {
+                    members.add(new RelationMember("outer", w));
+                }
+                for (JoinedPolygon i : myInnerWays) {
+                    for (Way w : i.ways) {
+                        members.add(new RelationMember("inner", w));
+                    }
+                }
                 if (relationReused) {
                     n = new Relation();
                     n.setKeys(r.getKeys());
-                } else {
-                    n = new Relation(r);
-                    n.setMembers(null);
-                }
-                for (Way w : p.ways) {
-                    n.addMember(new RelationMember("outer", w));
-                }
-                for (JoinedPolygon i : myInnerWays) {
-                    for (Way w : i.ways) {
-                        n.addMember(new RelationMember("inner", w));
-                    }
-                }
-                if (relationReused) {
+                    n.setMembers(members);
                     commands.add(new AddCommand(ds, n));
                 } else {
                     relationReused = true;
-                    commands.add(new ChangeCommand(r, n));
-                }
-                newSelection.add(n);
+                    commands.add(new ChangeMembersCommand(r, members));
+                }
                 continue;
             }
@@ -186 +187 @@
             result.addNode(result.firstNode());
             result.setKeys(tags);
-            newSelection.add(candidateWay == null ? result : candidateWay);
             commands.add(candidateWay == null ? new AddCommand(ds, result) : new ChangeCommand(candidateWay, result));
         }
@@ -195 +195 @@
             commands.add(0, relationDeleteCommand);
         }
-
         UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Reconstruct polygons from relation {0}",
                 r.getDisplayName(DefaultNameFormatter.getInstance())), commands));
+        Collection<? extends OsmPrimitive> newSelection = UndoRedoHandler.getInstance().getLastCommand().getParticipatingPrimitives();
+        newSelection.removeIf(p -> p.isDeleted());
         ds.setSelected(newSelection);
     }