Changeset 13667 in josm for trunk/src/org

Timestamp:

2018-04-23T22:17:10+02:00 (7 years ago)

Author:

Don-vip

Message:

move a few methods from OsmPrimitive to IPrimitive, Relation to IRelation

Location:

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

Files:

• IPrimitive.java (modified) (1 diff)
• IRelation.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)
• Relation.java (modified) (2 diffs)

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

@@ -364 +364 @@
 
     /**
+     * Determines if this object is a relation and behaves as a multipolygon.
+     * @return {@code true} if it is a real multipolygon or a boundary relation
+     * @since 13667
+     */
+    default boolean isMultipolygon() {
+        return false;
+    }
+
+    /**
      * true if this object has direction dependent tags (e.g. oneway)
      * @return {@code true} if this object has direction dependent tags

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

@@ -54 +54 @@
         return formatter.format(this);
     }
+
+    /**
+     * Determines if this relation is a boundary.
+     * @return {@code true} if a boundary relation
+     */
+    default boolean isBoundary() {
+        return "boundary".equals(get("type"));
+    }
+
+    @Override
+    default boolean isMultipolygon() {
+        return "multipolygon".equals(get("type")) || isBoundary();
+    }
 }

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

@@ -1351 +1351 @@
 
     /**
-     * Determines if this object is a relation and behaves as a multipolygon.
-     * @return {@code true} if it is a real mutlipolygon or a boundary relation
-     * @since 10716
-     */
-    public boolean isMultipolygon() {
-        return false;
-    }
-
-    /**
      * If necessary, extend the bbox to contain this primitive
      * @param box a bbox instance

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

@@ -41 +41 @@
 
     /**
-     *
+     * Sets members of the relation.
      * @param members Can be null, in that case all members are removed
      * @since 1925
@@ -430 +430 @@
     }
 
-    /**
-     * Determines if this relation is a boundary.
-     * @return {@code true} if a boundary relation
-     */
-    public boolean isBoundary() {
-        return "boundary".equals(get("type"));
-    }
-
-    @Override
-    public boolean isMultipolygon() {
-        return "multipolygon".equals(get("type")) || isBoundary();
-    }
-
     @Override
     public BBox getBBox() {