Changeset 17423 in josm

Timestamp:

2020-12-22T09:28:39+01:00 (3 years ago)

Author:

GerdP

Message:

see #20228: JOSM hangs when downloading children relations

• partly revert r17206 (don't wait) , this should fix the hanging situation
• register / unregister listeners to avoid EDT violations when relation editor doesn't show the "Tags and Members" dialog tab

Location:

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

Files:

• GenericRelationEditor.java (modified) (7 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;
@@ -170 +171 @@
     private final ArrayList<FlavorListener> clipboardListeners = new ArrayList<>();
 
+    private Component selectedTabPane;
+    private JTabbedPane tabbedPane;
+
     /**
      * Creates a new relation editor for the given relation. The relation will be saved if the user
@@ -236 +240 @@
 
         getContentPane().setLayout(new BorderLayout());
-        JTabbedPane tabbedPane = new JTabbedPane();
+        tabbedPane = new JTabbedPane();
         tabbedPane.add(tr("Tags and Members"), pnl);
         referrerBrowser = new ReferringRelationsBrowser(getLayer(), referrerModel);
         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();
@@ -248 +253 @@
                 referrerBrowser.init();
             }
+            // see #20228
+            boolean selIsTagsAndMembers = sourceTabbedPane.getSelectedComponent() == pnl;
+            if (selectedTabPane == pnl && !selIsTagsAndMembers) {
+                unregisterMain();
+            } else if (selectedTabPane != pnl && selIsTagsAndMembers) {
+                registerMain();
+            }
+            selectedTabPane = sourceTabbedPane.getSelectedComponent();
         });
 
@@ -313 +326 @@
         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();
     }
 
@@ -733 +758 @@
             //
             memberTable.stopHighlighting();
-            selectionTableModel.unregister();
-            memberTableModel.unregister();
-            memberTable.unregisterListeners();
+            if (tabbedPane != null && tr("Tags and Members").equals(tabbedPane.getTitleAt(tabbedPane.getSelectedIndex()))) {
+                unregisterMain();
+            }
             if (windowMenuItem != null) {
                 MainApplication.getMenu().windowMenu.remove(windowMenuItem);
@@ -841 +866 @@
         UndoRedoHandler.getInstance().removeCommandQueueListener(this);
         setRelation(null);
+        selectedTabPane = null;
         super.dispose();
     }

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

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