Changeset 13924 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-06-12T22:19:16+02:00 (6 years ago)

Author:

Don-vip

Message:

add IPrimitive.getOsm*Id()

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/IPrimitive.java (modified) (1 diff)
• data/osm/PrimitiveId.java (modified) (1 diff)
• gui/history/HistoryLoadTask.java (modified) (1 diff)

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

@@ -199 +199 @@
 
     /**
-     * Replies the unique primitive id for this primitive
+     * Replies the OSM id of this primitive.
+     * By default, returns the same value as {@link #getId}.
+     * Can be overidden by primitive implementations handling an internal id different from the OSM one.
+     *
+     * @return the OSM id of this primitive.
+     * @since 13924
+     */
+    default long getOsmId() {
+        return getId();
+    }
+
+    /**
+     * Replies the OSM primitive id for this primitive.
+     *
+     * @return the OSM primitive id for this primitive
+     * @see #getOsmId
+     * @since 13924
+     */
+    default PrimitiveId getOsmPrimitiveId() {
+        return new SimplePrimitiveId(getOsmId(), getType());
+    }
+
+    /**
+     * Replies the unique primitive id for this primitive.
      *
      * @return the unique primitive id for this primitive
+     * @see #getUniqueId
      */
     default PrimitiveId getPrimitiveId() {

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

@@ -3 +3 @@
 
 /**
-* interface to represent identifaction and type of the datatypes primitives.
+* interface to represent identification and type of the datatypes primitives.
 *
 * @since 2399

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -113 +113 @@
      * Adds an object to be loaded, the object is specified by an OSM primitive.
      *
-     * @param primitive the OSM primitive. Must not be null. primitive.getId() > 0 required.
+     * @param primitive the OSM primitive. Must not be null. primitive.getOsmId() > 0 required.
      * @return this task
      * @throws IllegalArgumentException if the primitive is null
-     * @throws IllegalArgumentException if primitive.getId() <= 0
+     * @throws IllegalArgumentException if primitive.getOsmId() <= 0
      */
     public HistoryLoadTask add(OsmPrimitive primitive) {
-        CheckParameterUtil.ensure(primitive, "primitive", "id > 0", prim -> prim.getUniqueId() > 0);
-        return add(primitive.getPrimitiveId());
+        CheckParameterUtil.ensure(primitive, "primitive", "id > 0", prim -> prim.getOsmId() > 0);
+        return add(primitive.getOsmPrimitiveId());
     }