Index: /trunk/images/dialogs/relation/deletemembers.svg
===================================================================
--- /trunk/images/dialogs/relation/deletemembers.svg (revision 1927)
+++ /trunk/images/dialogs/relation/deletemembers.svg (revision 1927)
@@ -0,0 +1,113 @@
+
+
+
Index: /trunk/images/dialogs/relation/selectmembers.svg
===================================================================
--- /trunk/images/dialogs/relation/selectmembers.svg (revision 1927)
+++ /trunk/images/dialogs/relation/selectmembers.svg (revision 1927)
@@ -0,0 +1,125 @@
+
+
+
Index: /trunk/images/dialogs/relation/selectprimitives.svg
===================================================================
--- /trunk/images/dialogs/relation/selectprimitives.svg (revision 1927)
+++ /trunk/images/dialogs/relation/selectprimitives.svg (revision 1927)
@@ -0,0 +1,125 @@
+
+
+
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 1926)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 1927)
@@ -334,7 +334,4 @@
editor.setAutoCompletionList(acList);
- SelectionSynchronizer synchronizer = new SelectionSynchronizer();
- memberTable.getSelectionModel().addListSelectionListener(synchronizer);
- DataSet.selListeners.add(synchronizer);
memberTable.addMouseListener(new MemberTableDblClickAdapter());
memberTableModel.addMemberModelListener(memberTable);
@@ -489,4 +486,7 @@
gc.weightx = 0.0;
gc.weighty = 0.0;
+
+ // -----
+ gc.gridy = 0;
MoveUpAction moveUpAction = new MoveUpAction();
memberTableModel.getSelectionModel().addListSelectionListener(moveUpAction);
@@ -511,6 +511,13 @@
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,5 +525,5 @@
// ------
// just grab the remaining space
- gc.gridy = 5;
+ gc.gridy = 6;
gc.weighty = 1.0;
gc.fill = GridBagConstraints.BOTH;
@@ -550,4 +557,11 @@
// -----
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,5 +570,5 @@
// ------
// just grab the remaining space
- gc.gridy = 2;
+ gc.gridy = 3;
gc.weighty = 1.0;
gc.fill = GridBagConstraints.BOTH;
@@ -562,5 +576,5 @@
// -----
- gc.gridy = 3;
+ gc.gridy = 4;
gc.weighty = 0.0;
AddSelectedAtStartAction addSelectionAction = new AddSelectedAtStartAction();
@@ -569,5 +583,5 @@
// -----
- gc.gridy = 4;
+ gc.gridy = 5;
AddSelectedBeforeSelection addSelectedBeforeSelectionAction = new AddSelectedBeforeSelection();
selectionTableModel.addTableModelListener(addSelectedBeforeSelectionAction);
@@ -576,5 +590,5 @@
// -----
- gc.gridy = 5;
+ gc.gridy = 6;
AddSelectedAfterSelection addSelectedAfterSelectionAction = new AddSelectedAfterSelection();
selectionTableModel.addTableModelListener(addSelectedAfterSelectionAction);
@@ -887,5 +901,5 @@
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,4 +926,64 @@
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,36 +1518,4 @@
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 newSelection) {
- // ignore selection change events if they happen for a dataset in another
- // layer
- if (!memberTableModel.isActiveLayer()) return;
- if (!memberTableModel.selectionsAreInSync()) {
- memberTableModel.selectMembersReferringTo(newSelection);
}
}
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 1926)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 1927)
@@ -376,5 +376,5 @@
* @return the set of selected referers
*/
- public Set getSelectedReferers() {
+ public Set getSelectedChildPrimitives() {
HashSet ret = new HashSet();
for (RelationMember m: getSelectedMembers()) {
@@ -385,4 +385,21 @@
/**
+ * Replies the set of selected referers. Never null, but may be empty.
+ *
+ * @return the set of selected referers
+ */
+ public Set getChildPrimitives(Collection referenceSet) {
+ HashSet ret = new HashSet();
+ 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,5 +408,5 @@
*/
public boolean selectionsAreInSync() {
- HashSet s1 = new HashSet(getSelectedReferers());
+ HashSet s1 = new HashSet(getSelectedChildPrimitives());
if (s1.size() != layer.data.getSelected().size()) return false;
s1.removeAll(layer.data.getSelected());