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

Timestamp:

2018-06-11T01:21:41+02:00 (6 years ago)

Author:

Don-vip

Message:

move getPrimitiveById() default implementation from DataSet to OsmData

Location:

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

Files:

• DataSet.java (modified) (1 diff)
• OsmData.java (modified) (1 diff)

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

@@ -776 +776 @@
 
     @Override
-    public OsmPrimitive getPrimitiveById(long id, OsmPrimitiveType type) {
-        return getPrimitiveById(new SimplePrimitiveId(id, type));
-    }
-
-    @Override
     public OsmPrimitive getPrimitiveById(PrimitiveId primitiveId) {
         return primitiveId != null ? primitivesMap.get(primitiveId) : null;

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

@@ -115 +115 @@
      * @throws NullPointerException if type is null
      */
-    O getPrimitiveById(long id, OsmPrimitiveType type);
+    default O getPrimitiveById(long id, OsmPrimitiveType type) {
+        return getPrimitiveById(new SimplePrimitiveId(id, type));
+    }
 
     /**