Changeset 8505 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-06-19T23:18:44+02:00 (9 years ago)

Author:

simon04

Message:

fix #11559 - Relation editor: add button to sort the selected relation members and all members below (for experts only)

Location:

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

Files:

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

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

@@ -33 +33 @@
 import javax.swing.BorderFactory;
 import javax.swing.InputMap;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -56 +57 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.CopyAction;
+import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.AddCommand;
@@ -114 +116 @@
      */
     private JMenuItem windowMenuItem;
+    /**
+     * Button for performing the {@link org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.SortBelowAction}.
+     */
+    private JButton sortBelowButton;
 
     /**
@@ -508 +514 @@
         memberTableModel.addTableModelListener(sortAction);
         tb.add(sortAction);
+        final SortBelowAction sortBelowAction = new SortBelowAction();
+        memberTableModel.addTableModelListener(sortBelowAction);
+        memberTableModel.getSelectionModel().addListSelectionListener(sortBelowAction);
+        sortBelowButton = tb.add(sortBelowAction);
 
         // -- reverse action
@@ -603 +613 @@
         super.setVisible(visible);
         if (visible) {
+            sortBelowButton.setVisible(ExpertToggleAction.isExpert());
             RelationDialogManager.getRelationDialogManager().positionOnScreen(this);
             if(windowMenuItem == null) {
@@ -1059 +1070 @@
     }
 
+    class SortBelowAction extends AbstractAction implements TableModelListener, ListSelectionListener {
+        public SortBelowAction() {
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "sort_below"));
+            putValue(NAME, tr("Sort below"));
+            putValue(SHORT_DESCRIPTION, tr("Sort the selected relation members and all members below"));
+            updateEnabledState();
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            memberTableModel.sortBelow();
+        }
+
+        protected void updateEnabledState() {
+            setEnabled(memberTableModel.getRowCount() > 0 && !memberTableModel.getSelectionModel().isSelectionEmpty());
+        }
+
+        @Override
+        public void tableChanged(TableModelEvent e) {
+            updateEnabledState();
+        }
+
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+            updateEnabledState();
+        }
+    }
+
     class ReverseAction extends AbstractAction implements TableModelListener {
         public ReverseAction() {

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

@@ -718 +718 @@
     }
 
+    /**
+     * Sort the selected relation members and all members below by the way they are linked.
+     */
+    void sortBelow() {
+        final List<RelationMember> subList = members.subList(getSelectionModel().getMinSelectionIndex(), members.size());
+        final List<RelationMember> sorted = relationSorter.sortMembers(subList);
+        subList.clear();
+        subList.addAll(sorted);
+        fireTableDataChanged();
+        setSelectedMembers(sorted);
+    }
+
     WayConnectionType getWayConnection(int i) {
         if (connectionType == null) {