Changeset 12713 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2017-09-03T12:32:11+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - remove dependencies of CheckParameterUtil on various data classes

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmServerBackreferenceReader.java (modified) (1 diff)
• OsmServerObjectReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

@@ -52 +52 @@
      */
     public OsmServerBackreferenceReader(OsmPrimitive primitive) {
-        CheckParameterUtil.ensureValidPrimitiveId(primitive, "primitive");
+        CheckParameterUtil.ensure(primitive, "primitive", "id > 0", prim -> prim.getUniqueId() > 0);
         this.id = primitive.getId();
         this.primitiveType = OsmPrimitiveType.from(primitive);

trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

@@ -96 +96 @@
 
     protected OsmServerObjectReader(PrimitiveId id, boolean full, int version) {
-        CheckParameterUtil.ensureValidPrimitiveId(id, "id");
+        CheckParameterUtil.ensure(id, "id", "id > 0", pid -> pid.getUniqueId() > 0);
         this.id = id;
         this.full = full;