Changeset 6038 in josm for trunk/src/org/openstreetmap

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/RelationListDialog.java (modified) (3 diffs)
• dialogs/SelectionListDialog.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• dialogs/relation/GenericRelationEditor.java (modified) (3 diffs)
• dialogs/relation/MemberTable.java (modified) (4 diffs)
• util/HighlightHelper.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -20 +21 @@
 import javax.swing.AbstractListModel;
 import javax.swing.DefaultListSelectionModel;
+import javax.swing.FocusManager;
 import javax.swing.JComponent;
 import javax.swing.JList;
@@ -189 +191 @@
         popupMenuHandler.setPrimitives(sel);
         
+        Component focused = FocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+        
         //update highlights
-        if (Main.isDisplayingMapView()) {
-            highlightHelper.highlightOnly(sel);
-            Main.map.mapView.repaint();
+        if (focused==displaylist && Main.isDisplayingMapView()) {
+            if (highlightHelper.highlightOnly(sel)) {
+                Main.map.mapView.repaint();
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -202 +202 @@
                 layer.data.setSelected(Collections.singleton((OsmPrimitive)model.getElementAt(idx)));
             } else if (Main.isDisplayingMapView()) {
-                helper.highlightOnly((OsmPrimitive)model.getElementAt(idx));
-                Main.map.mapView.repaint();
+                if (helper.highlightOnly((OsmPrimitive)model.getElementAt(idx))) {
+                    Main.map.mapView.repaint();
+                }
             }
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -418 +418 @@
                     int row = membershipTable.rowAtPoint(e.getPoint());
                     if (row>=0) {
-                        highlightHelper.highlightOnly((Relation) membershipTable.getValueAt(row, 0));
-                        Main.map.mapView.repaint();
+                        if (highlightHelper.highlightOnly((Relation) membershipTable.getValueAt(row, 0))) {
+                            Main.map.mapView.repaint();
+                        }
                     }
                 }

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

@@ -609 +609 @@
             // make sure all registered listeners are unregistered
             //
+            memberTable.stopHighlighting();
             selectionTableModel.unregister();
             memberTableModel.unregister();
@@ -1358 +1359 @@
         public void run() {
             Main.pref.put("relation.editor.generic.lastrole", tfRole.getText());
+            memberTable.stopHighlighting();
             if (getRelation() == null) {
                 applyNewRelation();
@@ -1398 +1400 @@
         @Override
         public void actionPerformed(ActionEvent e) {
+            memberTable.stopHighlighting();
             if (!memberTableModel.hasSameMembersAs(getRelationSnapshot()) || tagEditorPanel.getModel().isDirty()) {
                 //give the user a chance to save the changes

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();
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java

@@ -48 +48 @@
             needsRepaint |= setHighlight(p, true);
         }
-        //return true;
+
         return needsRepaint;
     }