Changeset 6038 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

Timestamp:

2013-06-28T17:39:49+02:00 (11 years ago)

Author:

akks

Message:

fix #8829: relation was often hanging JOSM after 6036 + better highlighting

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified) (4 diffs)

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

@@ -21 +21 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -118 +119 @@
     }
 
-    private void initHighlighting() {
-        getMemberTableModel().getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+    ListSelectionListener highlighterListener = new ListSelectionListener() {
             @Override
             public void valueChanged(ListSelectionEvent lse) {
                 if (Main.isDisplayingMapView()) {
                     Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers();
-                    ArrayList<OsmPrimitive> toHighlight = new ArrayList<OsmPrimitive>();
+                    final ArrayList<OsmPrimitive> toHighlight = new ArrayList<OsmPrimitive>();
                     for (RelationMember r: sel) {
                         if (r.getMember().isUsable()) {
@@ -130 +130 @@
                         }
                     }
-                    if (highlightHelper.highlightOnly(toHighlight)) {
-                        Main.map.mapView.repaint();
-                    }
+                    SwingUtilities.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (highlightHelper.highlightOnly(toHighlight)) {
+                                Main.map.mapView.repaint();
+                            }
+                        }
+                    });
                 }
-            }});
+            }};
+    
+    private void initHighlighting() {
+        getMemberTableModel().getSelectionModel().addListSelectionListener(highlighterListener);
         if (Main.isDisplayingMapView()) {
             HighlightHelper.clearAllHighlighted();
@@ -200 +208 @@
         super.unlinkAsListener();
         MapView.removeLayerChangeListener(zoomToGap);
-        highlightHelper.clear();
+    }
+    
+    public void stopHighlighting() {
+        if (highlighterListener == null) return;
+        getMemberTableModel().getSelectionModel().removeListSelectionListener(highlighterListener);
+        highlighterListener = null;
+        if (Main.isDisplayingMapView()) {
+            HighlightHelper.clearAllHighlighted();
+            Main.map.mapView.repaint();
+        }
     }