Changeset 2716 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-12-31T00:25:21+01:00 (14 years ago)

Author:

mjulius

Message:

fixes #4247 - in relation editor sort only selected members if there are members selected

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (4 diffs)

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

@@ -688 +688 @@
     }
 
-    /**
-     * Sort the relation members by the way they are linked.
-     */
-    void sort() {
-        RelationNodeMap map = new RelationNodeMap(members);
-
+    /*
+     * Sort a collection of relation members by the way they are linked.
+     * 
+     * @param relationMembers collection of relation members
+     * @return sorted collection of relation members
+     */
+    private ArrayList<RelationMember> sortMembers(ArrayList<RelationMember> relationMembers) {
+        RelationNodeMap map = new RelationNodeMap(relationMembers);
         // List of groups of linked members
         //
@@ -722 +724 @@
                 group.addFirst(next);
             }
-
         }
 
@@ -732 +733 @@
         for (LinkedList<Integer> tmpGroup : allGroups) {
             for (Integer p : tmpGroup) {
-                newMembers.add(members.get(p));
+                newMembers.add(relationMembers.get(p));
+            }
+        }
+        return newMembers;
+    }
+
+    /**
+     * Sort the relation members by the way they are linked.
+     */
+    void sort() {
+        ArrayList<RelationMember> selectedMembers = new ArrayList<RelationMember>(getSelectedMembers());
+        ArrayList<RelationMember> sortedMembers = null;
+        ArrayList<RelationMember> newMembers;
+        if (selectedMembers.isEmpty()) {
+            newMembers = sortMembers(members);
+        } else {
+            sortedMembers = sortMembers(selectedMembers);
+            List<Integer> selectedIndices = getSelectedIndices();
+            newMembers = new ArrayList<RelationMember>();
+            boolean inserted = false;
+            for (int i=0; i < members.size(); i++) {
+                if (selectedIndices.contains(i)) {
+                    if (!inserted) {
+                        newMembers.addAll(sortedMembers);
+                        inserted = true;
+                    }
+                } else {
+                    newMembers.add(members.get(i));
+                }
             }
         }
@@ -741 +770 @@
         members.addAll(newMembers);
         fireTableDataChanged();
+        setSelectedMembers(sortedMembers);
     }