Changeset 11680 in josm for trunk

Timestamp:

2017-03-05T01:10:20+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14458 - sort by default in order [relations, ways, nodes] in selection dialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitiveComparator.java (modified) (1 diff)
• gui/dialogs/SelectionListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java

@@ -69 +69 @@
     }
 
+    /**
+     * Returns a comparator ordering the primitives by type in the order RELATION, WAY, NODE
+     *
+     * @return a comparator ordering the primitives by type in the order RELATION, WAY, NODE
+     * @since 11679
+     */
+    public static Comparator<OsmPrimitive> orderingRelationsWaysNodes() {
+        return comparingInt(osm -> {
+            switch (osm.getType()) {
+                case RELATION:
+                    return 1;
+                case WAY:
+                    return 2;
+                case NODE:
+                    return 3;
+                default:
+                    throw new IllegalStateException();
+            }
+        });
+    }
+
     private static <T, R> Function<T, R> memoize(Function<T, R> base) {
         final Map<T, R> cache = new HashMap<>();

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -17 +17 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -660 +661 @@
             if (selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100_000)) {
                 boolean quick = selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10_000);
-                selection.sort(OsmPrimitiveComparator.orderingWaysRelationsNodes().thenComparing(quick
+                Comparator<OsmPrimitive> c = Main.pref.getBoolean("selection.sort_relations_before_ways", true)
+                        ? OsmPrimitiveComparator.orderingRelationsWaysNodes()
+                        : OsmPrimitiveComparator.orderingWaysRelationsNodes();
+                selection.sort(c.thenComparing(quick
                         ? OsmPrimitiveComparator.comparingUniqueId()
                         : OsmPrimitiveComparator.comparingNames()));