Changeset 2845 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.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/DataSetMerger.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -51 +52 @@
      */
     public DataSetMerger(DataSet targetDataSet, DataSet sourceDataSet) throws IllegalArgumentException {
-        if (targetDataSet == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "targetDataSet"));
+        CheckParameterUtil.ensureParameterNotNull(targetDataSet, "targetDataSet");
         this.targetDataSet = targetDataSet;
         this.sourceDataSet = sourceDataSet;
@@ -278 +278 @@
             logger.warning(tr("Target object with id {0} and version {1} is visible although "
                     + "source object with lower version {2} is not visible. "
-                    + "Can''t deal with this inconsistency. Keeping target object. ",
+                    + "Cannot deal with this inconsistency. Keeping target object. ",
                     Long.toString(target.getId()),Long.toString(target.getVersion()), Long.toString(source.getVersion())
             ));