Changeset 4104 in josm

Timestamp:

2011-05-30T09:58:49+02:00 (14 years ago)

Author:

bastiK

Message:

see #6233 (patch by brycenesbitt) - Updated elements not sorted in upload dialog (Add/Delete are fine)

File:

• trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -72 +72 @@
         sortDeleted();
         sortNew();
+        sortUpdated();
     }
 
@@ -133 +134 @@
         );
     }
+    /* 
+     * Sort list of updated elements, so it looks neat in the confirmation dialog.
+     */
+    protected void sortUpdated() {
+        Collections.sort(
+                toUpdate,
+                new Comparator<OsmPrimitive>() {
+                    public int compare(OsmPrimitive o1, OsmPrimitive o2) {
+                        if (o1 instanceof Node && o2 instanceof Node)
+                            return 0;
+                        else if (o1 instanceof Node)
+                            return -1;
+                        else if (o2 instanceof Node)
+                            return 1;
+
+                        if (o1 instanceof Way && o2 instanceof Way)
+                            return 0;
+                        else if (o1 instanceof Way && o2 instanceof Relation)
+                            return -1;
+                        else if (o2 instanceof Way && o1 instanceof Relation)
+                            return 1;
+
+                        return 0;
+                    }
+                }
+        );
+    }
+    
     /**
      * initializes the API data set with the modified primitives in <code>ds</code>