Changeset 1922 in josm for trunk/src/org

Timestamp:

2009-08-07T22:33:37+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3207 again: Highlighting members in relation editor is broken

Location:

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

Files:

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

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

@@ -1457 +1457 @@
     class SelectionSynchronizer implements ListSelectionListener, SelectionChangedListener{
         public void valueChanged(ListSelectionEvent e) {
+            // as long as the model is computing the final selection it emits selection
+            // change events with getValueIsAdjusting() true. Ignore these events, only
+            // handle the final selection update. Otherwise, infinite loops of property
+            // change events occur.
+            //
             if (e.getValueIsAdjusting())
                 return;
 
-            // Avoid endless loops. memberTableModel is registered as SelectionChangeListener
-            // too. Only update the selection if it is not in sync with what is already
-            // selected.
+            // Avoid infinite loop.  Only update the selection if it is not in sync with what
+            // is already selected. Avoids infinite loops of property change events.
             //
             if (!memberTableModel.selectionsAreInSync()) {

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

@@ -394 +394 @@
     public boolean selectionsAreInSync() {
         HashSet<OsmPrimitive> s1 = new HashSet<OsmPrimitive>(getSelectedReferers());
-        if (s1.size() > layer.data.getSelected().size()) return false;
+        if (s1.size() != layer.data.getSelected().size()) return false;
         s1.removeAll(layer.data.getSelected());
         return s1.isEmpty();
@@ -489 +489 @@
      */
     public void selectMembersReferringTo(Collection<? extends OsmPrimitive> primitives) {
-        if (primitives == null || primitives.isEmpty()) return;
+        if (primitives == null) return;
         getSelectionModel().setValueIsAdjusting(true);
         getSelectionModel().clearSelection();