Changeset 13803 in josm for trunk/src/org

Timestamp:

2018-05-21T14:15:26+02:00 (7 years ago)

Author:

Don-vip

Message:

add new class PrimitiveComparator

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• OsmPrimitiveComparator.java (modified) (6 diffs)
• PrimitiveComparator.java (added)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import static java.util.Comparator.comparing;
-import static java.util.Comparator.comparingInt;
-
 import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
-import org.openstreetmap.josm.tools.AlphanumComparator;
 
 /**
- * Comparators for comparing primitives.
+ * Comparators for comparing {@link OsmPrimitive}.
+ * @since 4113
  */
 public final class OsmPrimitiveComparator {
@@ -25 +18 @@
      */
     public static Comparator<OsmPrimitive> comparingNames() {
-        final Comparator<String> digitsLast = comparing(str -> !str.isEmpty() && Character.isDigit(str.charAt(0)) ? 1 : 0);
-        return comparing(memoize(DefaultNameFormatter.getInstance()::format),
-                digitsLast.thenComparing(AlphanumComparator.getInstance()));
+        return PrimitiveComparator.doComparingNames();
     }
 
@@ -36 +27 @@
      */
     public static Comparator<OsmPrimitive> comparingUniqueId() {
-        return comparing(OsmPrimitive::getUniqueId);
+        return PrimitiveComparator.doComparingUniqueId();
     }
 
@@ -45 +36 @@
      */
     public static Comparator<OsmPrimitive> orderingNodesWaysRelations() {
-        return comparingInt(osm -> osm.getType().ordinal());
+        return PrimitiveComparator.doOrderingNodesWaysRelations();
     }
 
@@ -54 +45 @@
      */
     public static Comparator<OsmPrimitive> orderingWaysRelationsNodes() {
-        return comparingInt(osm -> {
-            switch (osm.getType()) {
-                case WAY:
-                    return 1;
-                case RELATION:
-                    return 2;
-                case NODE:
-                    return 3;
-                default:
-                    throw new IllegalStateException();
-            }
-        });
+        return PrimitiveComparator.doOrderingWaysRelationsNodes();
     }
 
@@ -75 +55 @@
      */
     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<>();
-        return t -> cache.computeIfAbsent(t, base);
+        return PrimitiveComparator.doOrderingRelationsWaysNodes();
     }