Changeset 2845 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

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

Author:

mjulius

Message:

fix messages for data

File:

• trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -87 +88 @@
      *
      */
-    public void add(Conflict<?> conflict) throws IllegalStateException, IllegalArgumentException {
-        if (conflict == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "conflict"));
+    public void add(Conflict<?> conflict) throws IllegalStateException {
+        CheckParameterUtil.ensureParameterNotNull(conflict, "conflict");
         addConflict(conflict);
         fireConflictAdded();