Changeset 1831 in josm

Timestamp:

2009-07-25T12:02:51+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3079: "Remove selected members from relation" button should be made inactive when none of the currently selected objects exists in the relation

Location:

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

Files:

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

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

@@ -723 +723 @@
                     KeyEvent.VK_S, Shortcut.GROUP_MNEMONIC);
 
+            updateEnabledState();
+        }
+
+        protected void updateEnabledState() {
             DataSet ds = getLayer().data;
-            setEnabled(ds != null && !ds.getSelected().isEmpty());
+            if (ds == null || ds.getSelected().isEmpty()) {
+                setEnabled(false);
+                return;
+            }
+            // only enable the action if we have members referring to the
+            // selected primitives
+            //
+            setEnabled(memberTableModel.hasMembersReferringTo(ds.getSelected()));
         }
 
@@ -732 +743 @@
 
         public void tableChanged(TableModelEvent e) {
-            setEnabled(selectionTableModel.getRowCount() > 0);
+            updateEnabledState();
         }
     }

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

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -403 +404 @@
         return !r.incomplete;
     }
+
+    /**
+     * Replies true if there is at least one relation member in this model
+     * which refers to at least on the primitives in <code>primitives</code>.
+     * 
+     * @param primitives the collection of primitives
+     * @return true if there is at least one relation member in this model
+     * which refers to at least on the primitives in <code>primitives</code>; false
+     * otherwise
+     */
+    public boolean hasMembersReferringTo(Collection<OsmPrimitive> primitives) {
+        if (primitives == null || primitives.isEmpty())
+            return false;
+        HashSet<OsmPrimitive> referrers = new HashSet<OsmPrimitive>();
+        for(RelationMember member : members) {
+            referrers.add(member.member);
+        }
+        Iterator<OsmPrimitive> it = primitives.iterator();
+        while(it.hasNext()) {
+            OsmPrimitive referred = it.next();
+            if (referrers.contains(referred))
+                return true;
+        }
+        return false;
+    }
+
 
     void sort() {