Changeset 1831 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.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();
         }
     }