Changeset 2852 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

2010-01-13T20:20:51+01:00 (14 years ago)

Author:

mjulius

Message:

fix messages for io

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -5 +5 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33 +34 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.DateUtils;
 import org.xml.sax.Attributes;
@@ -325 +327 @@
                 return User.createOsmUser(id, name);
             } catch(NumberFormatException e) {
-                throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''.", uid));
+                throwException(MessageFormat.format("Illegal value for attribute ''uid''. Got ''{0}''.", uid));
             }
             return null;
@@ -586 +588 @@
             progressMonitor = NullProgressMonitor.INSTANCE;
         }
-        if (source == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "source"));
+        CheckParameterUtil.ensureParameterNotNull(source, "source");
         OsmReader reader = new OsmReader();
         try {