Changeset 13669 in josm for trunk/src/org

Timestamp:

2018-04-23T22:40:10+02:00 (6 years ago)

Author:

Don-vip

Message:

move a few methods from Node to INode

Location:

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

Files:

• INode.java (modified) (1 diff)
• Node.java (modified) (1 diff)
• NodeData.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)

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

@@ -43 +43 @@
     void setEastNorth(EastNorth eastNorth);
 
+    /**
+     * Check whether this node connects 2 ways.
+     *
+     * @return true if isReferredByWays(2) returns true
+     * @see #isReferredByWays(int)
+     * @since 13669
+     */
+    default boolean isConnectionNode() {
+        return isReferredByWays(2);
+    }
+
+    /**
+     * Return true, if this primitive is referred by at least n ways
+     * @param n Minimal number of ways to return true. Must be positive
+     * @return {@code true} if this primitive is referred by at least n ways
+     * @since 13669
+     */
+    boolean isReferredByWays(int n);
+
     @Override
     default int compareTo(IPrimitive o) {

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

@@ -325 +325 @@
     }
 
-    /**
-     * Check whether this node connects 2 ways.
-     *
-     * @return true if isReferredByWays(2) returns true
-     * @see #isReferredByWays(int)
-     */
-    public boolean isConnectionNode() {
-        return isReferredByWays(2);
+    @Override
+    public boolean isReferredByWays(int n) {
+        return isNodeReferredByWays(n);
     }
 

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

@@ -99 +99 @@
         visitor.visit(this);
     }
+
+    @Override
+    public boolean isReferredByWays(int n) {
+        return false;
+    }
 }

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

@@ -1024 +1024 @@
 
     /**
-      Return true, if this primitive is referred by at least n ways
-      @param n Minimal number of ways to return true. Must be positive
+     * Return true, if this primitive is a node referred by at least n ways
+     * @param n Minimal number of ways to return true. Must be positive
      * @return {@code true} if this primitive is referred by at least n ways
      */
-    public final boolean isReferredByWays(int n) {
+    protected final boolean isNodeReferredByWays(int n) {
         // Count only referrers that are members of the same dataset (primitive can have some fake references, for example
         // when way is cloned