Changeset 13665 in josm for trunk/src/org

Timestamp:

2018-04-23T21:57:10+02:00 (6 years ago)

Author:

Don-vip

Message:

move primitive comparison logic to interfaces

Location:

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

Files:

• INode.java (modified) (1 diff)
• IPrimitive.java (modified) (5 diffs)
• IRelation.java (modified) (1 diff)
• IWay.java (modified) (1 diff)
• Node.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)
• Relation.java (modified) (1 diff)
• Way.java (modified) (1 diff)

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

@@ -31 +31 @@
 
     @Override
+    default int compareTo(IPrimitive o) {
+        return o instanceof INode ? Long.compare(getUniqueId(), o.getUniqueId()) : 1;
+    }
+
+    @Override
     default String getDisplayName(NameFormatter formatter) {
         return formatter.format(this);

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

@@ -11 +11 @@
  * @since 4098
  */
-public interface IPrimitive extends Tagged, PrimitiveId, Stylable {
+public interface IPrimitive extends Tagged, PrimitiveId, Stylable, Comparable<IPrimitive> {
 
     /**
@@ -147 +147 @@
      * </ul>
      * @return {@code true} if this object is drawable
-     * @since xxx
+     * @since 13664
      */
     default boolean isDrawable() {
@@ -156 +156 @@
      * Determines whether the primitive is selected
      * @return whether the primitive is selected
-     * @since xxx
+     * @since 13664
      */
     default boolean isSelected() {
@@ -165 +165 @@
      * Determines if this primitive is a member of a selected relation.
      * @return {@code true} if this primitive is a member of a selected relation, {@code false} otherwise
-     * @since xxx
+     * @since 13664
      */
     default boolean isMemberOfSelected() {
@@ -174 +174 @@
      * Determines if this primitive is an outer member of a selected multipolygon relation.
      * @return {@code true} if this primitive is an outer member of a selected multipolygon relation, {@code false} otherwise
-     * @since xxx
+     * @since 13664
      */
     default boolean isOuterMemberOfSelected() {

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

@@ -46 +46 @@
 
     @Override
+    default int compareTo(IPrimitive o) {
+        return o instanceof IRelation ? Long.compare(getUniqueId(), o.getUniqueId()) : -1;
+    }
+
+    @Override
     default String getDisplayName(NameFormatter formatter) {
         return formatter.format(this);

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

@@ -44 +44 @@
 
     @Override
+    default int compareTo(IPrimitive o) {
+        if (o instanceof IRelation)
+            return 1;
+        return o instanceof IWay ? Long.compare(getUniqueId(), o.getUniqueId()) : -1;
+    }
+
+    @Override
     default String getDisplayName(NameFormatter formatter) {
         return formatter.format(this);

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

@@ -312 +312 @@
 
     @Override
-    public int compareTo(OsmPrimitive o) {
-        return o instanceof Node ? Long.compare(getUniqueId(), o.getUniqueId()) : 1;
-    }
-
-    @Override
     public OsmPrimitiveType getType() {
         return OsmPrimitiveType.NODE;

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

@@ -42 +42 @@
  * @author imi
  */
-public abstract class OsmPrimitive extends AbstractPrimitive implements Comparable<OsmPrimitive>, TemplateEngineDataProvider {
+public abstract class OsmPrimitive extends AbstractPrimitive implements TemplateEngineDataProvider {
     private static final String SPECIAL_VALUE_ID = "id";
     private static final String SPECIAL_VALUE_LOCAL_NAME = "localname";

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

@@ -318 +318 @@
     }
 
-    @Override
-    public int compareTo(OsmPrimitive o) {
-        return o instanceof Relation ? Long.compare(getUniqueId(), o.getUniqueId()) : -1;
-    }
-
     /**
      * Returns the first member.

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

@@ -333 +333 @@
         }
         return true;
-    }
-
-    @Override
-    public int compareTo(OsmPrimitive o) {
-        if (o instanceof Relation)
-            return 1;
-        return o instanceof Way ? Long.compare(getUniqueId(), o.getUniqueId()) : -1;
     }