Changeset 2845 in josm for trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

Timestamp:

2010-01-13T19:55:07+01:00 (14 years ago)

Author:

mjulius

Message:

fix messages for data

File:

• trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.text.MessageFormat;
 import java.util.Collections;
 import java.util.Date;
@@ -13 +14 @@
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -32 +34 @@
     protected void ensurePositiveLong(long value, String name) {
         if (value <= 0)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value));
-    }
-
-    protected void ensureNotNull(Object obj, String name) {
-        if (obj == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", name));
+            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value));
     }
 
@@ -59 +56 @@
             ensurePositiveLong(uid, "uid");
         }
-        ensureNotNull(user, "user");
-        ensureNotNull(timestamp, "timestamp");
+        CheckParameterUtil.ensureParameterNotNull(user, "user");
+        CheckParameterUtil.ensureParameterNotNull(timestamp, "timestamp");
         this.id = id;
         this.version = version;
@@ -113 +110 @@
     public int compareTo(HistoryOsmPrimitive o) {
         if (this.id != o.id)
-            throw new ClassCastException(tr("Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''.", o.id, this.id));
+            throw new ClassCastException(tr("Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''.", o.id, this.id));
         return Long.valueOf(this.version).compareTo(o.version);
     }