Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 13913)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 13914)
@@ -776,9 +776,4 @@
 
     @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;
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmData.java	(revision 13913)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmData.java	(revision 13914)
@@ -115,5 +115,7 @@
      * @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));
+    }
 
     /**