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

Timestamp:

2024-03-03T10:25:25+01:00 (2 years 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/RelContextDialog.java (modified) (6 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -18 +18 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -51 +49 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
@@ -111 +107 @@
 
     private final DefaultTableModel relationsData;
-    private final ChosenRelation chosenRelation;
+    private final transient ChosenRelation chosenRelation;
     private final JPanel chosenRelationPanel;
     private final ChosenRelationPopupMenu popupMenu;
@@ -413 +409 @@
     @Override
     public void destroy() {
+        chosenRelation.removeChosenRelationListener(this);
         enterRoleAction.destroy();
         findRelationAction.destroy();
@@ -487 +484 @@
 
         Object answer = optionPane.getValue();
+        dlg.dispose();
         if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
                 || (answer instanceof Integer && (Integer) answer != JOptionPane.OK_OPTION))
@@ -545 +543 @@
             for (int i = 0; i < r.getMembersCount(); i++) {
                 RelationMember m = r.getMember(i);
-                if (selected.contains(m.getMember())) {
-                    if (!role.equals(m.getRole())) {
-                        commands.add(new ChangeRelationMemberRoleCommand(r, i, role));
-                    }
+                if (selected.contains(m.getMember()) && !role.equals(m.getRole())) {
+                    commands.add(new ChangeRelationMemberRoleCommand(r, i, role));
                 }
             }
             if (!commands.isEmpty()) {
-                //                UndoRedoHandler.getInstance().add(new ChangeCommand(chosenRelation.get(), r));
                 UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Change relation member roles to {0}", role), commands));
             }