Changeset 12713 in josm for trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

Timestamp:

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

Author:

bastiK

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (modified) (2 diffs)

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

@@ -81 +81 @@
      */
     public HistoryLoadTask add(PrimitiveId pid) {
-        CheckParameterUtil.ensureValidPrimitiveId(pid, "pid");
+        CheckParameterUtil.ensure(pid, "pid", "pid > 0", id -> id.getUniqueId() > 0);
         toLoad.add(pid);
         return this;
@@ -119 +119 @@
      */
     public HistoryLoadTask add(OsmPrimitive primitive) {
-        CheckParameterUtil.ensureValidPrimitiveId(primitive, "primitive");
+        CheckParameterUtil.ensure(primitive, "primitive", "id > 0", prim -> prim.getUniqueId() > 0);
         return add(primitive.getPrimitiveId());
     }