Changeset 2853 in josm for trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java

Timestamp:

2010-01-13T20:22:11+01:00 (14 years ago)

Author:

mjulius

Message:

fix messages for the rest

File:

• trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
+import java.text.MessageFormat;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -17 +17 @@
 
     public static void ensureValidPrimitiveId(PrimitiveId id, String parameterName) throws IllegalArgumentException {
-        if (id == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", parameterName));
+        ensureParameterNotNull(id, parameterName);
         if (id.getUniqueId() <= 0)
-            throw new IllegalArgumentException(tr("Expected unique id > 0 for primitive id, got {0}", id.getUniqueId()));
+            throw new IllegalArgumentException(MessageFormat.format("Expected unique id > 0 for primitive ''{1}'', got {0}", id.getUniqueId(), parameterName));
     }
 
     public static void ensureValidVersion(long version, String parameterName) throws IllegalArgumentException {
         if (version < 0)
-            throw new IllegalArgumentException(tr("Expected value of type long > 0 for parameter ''{0}'', got {1}", parameterName, version));
+            throw new IllegalArgumentException(MessageFormat.format("Expected value of type long > 0 for parameter ''{0}'', got {1}", parameterName, version));
     }
 
     public static void ensureParameterNotNull(Object value, String parameterName) {
         if (value == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", parameterName));
+            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' must not be null", parameterName));
     }
 
@@ -42 +41 @@
      */
     public static void ensureValidNodeId(PrimitiveId id, String parameterName) throws IllegalArgumentException {
-        if (id == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", parameterName));
+        ensureParameterNotNull(id, parameterName);
         if (! id.getType().equals(OsmPrimitiveType.NODE))
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' of type node expected, got ''{1}''", parameterName, id.getType().getAPIName()));
+            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' of type node expected, got ''{1}''", parameterName, id.getType().getAPIName()));
     }
 }