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

Timestamp:

2024-03-03T10:25:25+01:00 (22 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/AddRemoveMemberAction.java (modified) (5 diffs)

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeMembersCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.UndoRedoHandler;
@@ -82 +82 @@
 
         if (!r.getMemberPrimitives().equals(rel.get().getMemberPrimitives())) {
-            UndoRedoHandler.getInstance().add(new ChangeCommand(rel.get(), r));
+            UndoRedoHandler.getInstance().add(new ChangeMembersCommand(rel.get(), r.getMembers()));
         }
+        r.setMembers(null); // See #19885
     }
 
@@ -96 +97 @@
         if (firstNode != null && !firstNode.equals(lastNode)) {
             for (int i = 0; i < r.getMembersCount(); i++) {
-                if (r.getMember(i).getType().equals(OsmPrimitiveType.WAY)) {
+                if (r.getMember(i).getType() == OsmPrimitiveType.WAY) {
                     Way rw = (Way) r.getMember(i).getMember();
                     Node firstNodeR = rw.firstNode();
@@ -133 +134 @@
 
     protected void updateIcon() {
-        // todo: change icon based on selection
         final int state; // 0=unknown, 1=add, 2=remove, 3=both
         DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null || ds.getSelected() == null
-                || ds.getSelected().isEmpty() || rel == null || rel.get() == null) {
+        if (ds == null || ds.getSelected().isEmpty() || rel == null || rel.get() == null) {
             state = 0;
         } else {
@@ -156 +155 @@
             }
         }
-        GuiHelper.runInEDT(new Runnable() {
-            @Override
-            public void run() {
-                if (state == 0) {
-                    putValue(LARGE_ICON_KEY, ImageProvider.get("relcontext", "addremove"));
-                } else {
-                    String iconName = state == 1 ? "add" : state == 2 ? "remove" : "addremove";
-                    putValue(NAME, null);
-                    putValue(LARGE_ICON_KEY, ImageProvider.get("relcontext", iconName));
-                }
+        GuiHelper.runInEDT(() -> {
+            if (state == 0) {
+                putValue(LARGE_ICON_KEY, ImageProvider.get("relcontext", "addremove"));
+            } else {
+                String iconName = state == 1 ? "add" : state == 2 ? "remove" : "addremove";
+                putValue(NAME, null);
+                putValue(LARGE_ICON_KEY, ImageProvider.get("relcontext", iconName));
             }
         });