Changeset 19279 in josm

Timestamp:

2025-01-10T07:16:23+01:00 (2 weeks ago)

Author:

GerdP

Message:

fix #24037

• revert the changes from r17423 in GenericRelationEditor
• use GuiHelper.runInEDT() to avoid the EDT violations reported in #20228

Location:

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

Files:

• GenericRelationEditor.java (modified) (8 diffs)
• MemberTableModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -6 +6 @@
 
 import java.awt.BorderLayout;
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -162 +161 @@
     private final ArrayList<FlavorListener> clipboardListeners = new ArrayList<>();
 
-    private Component selectedTabPane;
-    private final JTabbedPane tabbedPane;
-
     /**
      * Creates a new relation editor for the given relation. The relation will be saved if the user
@@ -236 +232 @@
 
         getContentPane().setLayout(new BorderLayout());
+        final JTabbedPane tabbedPane;
         tabbedPane = new JTabbedPane();
         tabbedPane.add(tr("Tags and Members"), pnl);
@@ -241 +238 @@
         tabbedPane.add(tr("Parent Relations"), referrerBrowser);
         tabbedPane.add(tr("Child Relations"), new ChildRelationBrowser(getLayer(), relation));
-        selectedTabPane = tabbedPane.getSelectedComponent();
         tabbedPane.addChangeListener(e -> {
             JTabbedPane sourceTabbedPane = (JTabbedPane) e.getSource();
@@ -249 +245 @@
                 referrerBrowser.init();
             }
-            // see #20228
-            boolean selIsTagsAndMembers = sourceTabbedPane.getSelectedComponent() == pnl;
-            if (selectedTabPane == pnl && !selIsTagsAndMembers) {
-                unregisterMain();
-            } else if (selectedTabPane != pnl && selIsTagsAndMembers) {
-                registerMain();
-            }
-            selectedTabPane = sourceTabbedPane.getSelectedComponent();
         });
 
@@ -329 +317 @@
         HelpUtil.setHelpContext(getRootPane(), ht("/Dialog/RelationEditor"));
         UndoRedoHandler.getInstance().addCommandQueueListener(this);
-    }
-
-    private void registerMain() {
-        selectionTableModel.register();
-        memberTableModel.register();
-        memberTable.registerListeners();
-    }
-
-    private void unregisterMain() {
-        selectionTableModel.unregister();
-        memberTableModel.unregister();
-        memberTable.unregisterListeners();
     }
 
@@ -789 +765 @@
             //
             memberTable.stopHighlighting();
-            if (tabbedPane != null && tr("Tags and Members").equals(tabbedPane.getTitleAt(tabbedPane.getSelectedIndex()))) {
-                unregisterMain();
-            }
+            selectionTableModel.unregister();
+            memberTableModel.unregister();
+            memberTable.unregisterListeners();
+
             if (windowMenuItem != null) {
                 MainApplication.getMenu().windowMenu.remove(windowMenuItem);
@@ -898 +875 @@
         super.dispose(); // call before setting relation to null, see #20304
         setRelation(null);
-        selectedTabPane = null;
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -133 +133 @@
         // just trigger a repaint - the display name of the relation members may have changed
         Collection<RelationMember> sel = getSelectedMembers();
-        GuiHelper.runInEDT(this::fireTableDataChanged);
-        setSelectedMembers(sel);
+        GuiHelper.runInEDT(() -> {
+            fireTableDataChanged();
+            setSelectedMembers(sel);
+        });
     }