Changeset 1927 in josm

Timestamp:

Aug 8, 2009 10:53:46 AM (4 years ago)

Author:

Gubaer

Message:

fixed #3213: Adding objects to a relation breaks selecting multiple objects

Location:

trunk

Files:

• images/dialogs/relation (added)
• images/dialogs/relation/deletemembers.png (added)
• images/dialogs/relation/deletemembers.svg (added)
• images/dialogs/relation/selectmembers.png (added)
• images/dialogs/relation/selectmembers.svg (added)
• images/dialogs/relation/selectprimitives.png (added)
• images/dialogs/relation/selectprimitives.svg (added)
• src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (12 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (3 diffs)

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

@@ -334 +334 @@
         editor.setAutoCompletionList(acList);
 
-        SelectionSynchronizer synchronizer = new SelectionSynchronizer();
-        memberTable.getSelectionModel().addListSelectionListener(synchronizer);
-        DataSet.selListeners.add(synchronizer);
         memberTable.addMouseListener(new MemberTableDblClickAdapter());
         memberTableModel.addMemberModelListener(memberTable);
@@ -489 +486 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
+
+        // -----
+        gc.gridy = 0;
         MoveUpAction moveUpAction = new MoveUpAction();
         memberTableModel.getSelectionModel().addListSelectionListener(moveUpAction);
@@ -511 +511 @@
         pnl.add(new JButton(removeSelectedAction), gc);
 
+
         // ------
         gc.gridy = 4;
+        SelectPrimitivesForSelectedMembersAction selectAction = new SelectPrimitivesForSelectedMembersAction();
+        memberTable.getSelectionModel().addListSelectionListener(selectAction);
+        pnl.add(new JButton(selectAction), gc);
+
+        // ------
+        gc.gridy = 5;
         SortAction sortAction = new SortAction();
         pnl.add(new JButton(sortAction), gc);
@@ -518 +525 @@
         // ------
         // just grab the remaining space
-        gc.gridy = 5;
+        gc.gridy = 6;
         gc.weighty = 1.0;
         gc.fill = GridBagConstraints.BOTH;
@@ -550 +557 @@
         // -----
         gc.gridy = 1;
+        SelectedMembersForSelectionAction selectMembersForSelectionAction = new SelectedMembersForSelectionAction();
+        selectionTableModel.addTableModelListener(selectMembersForSelectionAction);
+        memberTableModel.addTableModelListener(selectMembersForSelectionAction);
+        pnl.add(new JButton(selectMembersForSelectionAction), gc);
+
+        // -----
+        gc.gridy = 2;
         RemoveSelectedAction removeSelectedAction = new RemoveSelectedAction();
         selectionTableModel.addTableModelListener(removeSelectedAction);
@@ -556 +570 @@
         // ------
         // just grab the remaining space
-        gc.gridy = 2;
+        gc.gridy = 3;
         gc.weighty = 1.0;
         gc.fill = GridBagConstraints.BOTH;
@@ -562 +576 @@
 
         // -----
-        gc.gridy = 3;
+        gc.gridy = 4;
         gc.weighty = 0.0;
         AddSelectedAtStartAction addSelectionAction = new AddSelectedAtStartAction();
@@ -569 +583 @@
 
         // -----
-        gc.gridy = 4;
+        gc.gridy = 5;
         AddSelectedBeforeSelection addSelectedBeforeSelectionAction = new AddSelectedBeforeSelection();
         selectionTableModel.addTableModelListener(addSelectedBeforeSelectionAction);
@@ -576 +590 @@
 
         // -----
-        gc.gridy = 5;
+        gc.gridy = 6;
         AddSelectedAfterSelection addSelectedAfterSelectionAction = new AddSelectedAfterSelection();
         selectionTableModel.addTableModelListener(addSelectedAfterSelectionAction);
@@ -887 +901 @@
         public RemoveSelectedAction() {
             putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected primitives"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "removeselected"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "deletemembers"));
             // putValue(NAME, tr("Remove Selected"));
             Shortcut.registerShortcut("relationeditor:removeselected", tr("Relation Editor: Remove Selected"),
@@ -912 +926 @@
 
         public void tableChanged(TableModelEvent e) {
+            updateEnabledState();
+        }
+    }
+
+    /**
+     * Selects  members in the relation editor which refer to primitives in the current
+     * selection of the context layer.
+     * 
+     */
+    class SelectedMembersForSelectionAction extends AbstractAction implements TableModelListener {
+        public SelectedMembersForSelectionAction() {
+            putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to primitives in the current selection"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectmembers"));
+            updateEnabledState();
+        }
+
+        protected void updateEnabledState() {
+            boolean enabled = selectionTableModel.getRowCount() > 0
+            &&  !memberTableModel.getChildPrimitives(getLayer().data.getSelected()).isEmpty();
+
+            if (enabled) {
+                putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to {0} primitives in the current selection",memberTableModel.getChildPrimitives(getLayer().data.getSelected()).size()));
+            } else {
+                putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to primitives in the current selection"));
+            }
+            setEnabled(enabled);
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            memberTableModel.selectMembersReferringTo(getLayer().data.getSelected());
+        }
+
+        public void tableChanged(TableModelEvent e) {
+            updateEnabledState();
+
+        }
+    }
+
+    /**
+     * Selects primitives in the layer this editor belongs to. The selected primitives are
+     * equal to the set of primitives the currently selected relation members refer to.
+     * 
+     */
+    class SelectPrimitivesForSelectedMembersAction extends AbstractAction implements ListSelectionListener {
+        public SelectPrimitivesForSelectedMembersAction() {
+            putValue(SHORT_DESCRIPTION, tr("Select primitives for selected relation members"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectprimitives"));
+            updateEnabledState();
+        }
+
+        protected void updateEnabledState() {
+            setEnabled(memberTable.getSelectedRowCount() > 0);
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            getLayer().data.setSelected(memberTableModel.getSelectedChildPrimitives());
+            DataSet.fireSelectionChanged(getLayer().data.getSelected());
+        }
+
+        public void valueChanged(ListSelectionEvent e) {
             updateEnabledState();
         }
@@ -1444 +1518 @@
             if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() == 2) {
                 new EditAction().run();
-            }
-        }
-    }
-
-    /**
-     * Updates the selection in the current data set with the selected referers in
-     * in the member table.
-     */
-    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 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()) {
-                getLayer().data.setSelected(memberTableModel.getSelectedReferers());
-            }
-        }
-
-        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-            // ignore selection change events if they happen for a dataset in another
-            // layer
-            if (!memberTableModel.isActiveLayer()) return;
-            if (!memberTableModel.selectionsAreInSync()) {
-                memberTableModel.selectMembersReferringTo(newSelection);
             }
         }

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

@@ -376 +376 @@
      * @return the set of selected referers
      */
-    public Set<OsmPrimitive> getSelectedReferers() {
+    public Set<OsmPrimitive> getSelectedChildPrimitives() {
         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
         for (RelationMember m: getSelectedMembers()) {
@@ -385 +385 @@
 
     /**
+     * Replies the set of selected referers. Never null, but may be empty.
+     * 
+     * @return the set of selected referers
+     */
+    public Set<OsmPrimitive> getChildPrimitives(Collection<? extends OsmPrimitive> referenceSet) {
+        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        if (referenceSet == null) return null;
+        for (RelationMember m: members) {
+            if (referenceSet.contains(m.member)) {
+                ret.add(m.member);
+            }
+        }
+        return ret;
+    }
+
+
+    /**
      * Replies true, if the selected {@see OsmPrimitive}s in the layer belonging
      * to this model are in sync with the selected referers in this model.
@@ -391 +408 @@
      */
     public boolean selectionsAreInSync() {
-        HashSet<OsmPrimitive> s1 = new HashSet<OsmPrimitive>(getSelectedReferers());
+        HashSet<OsmPrimitive> s1 = new HashSet<OsmPrimitive>(getSelectedChildPrimitives());
         if (s1.size() != layer.data.getSelected().size()) return false;
         s1.removeAll(layer.data.getSelected());