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

Timestamp:

2006-07-15T15:57:15+02:00 (20 years ago)

Author:

imi

Message:

• fixed some output strings that got messed up due i18n.
• fixed timestamp parsing when reading XML

File:

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

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

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.visitor.AddVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.tools.DateParser;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -145 +146 @@
                 if (time != null && time.length() != 0) {
                         try {
-                                DateFormat df = new SimpleDateFormat("y-M-d H:m:s");
-                                current.timestamp = df.parse(time);
+                                current.timestamp = DateParser.parse(time);
                         } catch (ParseException e) {
                                 e.printStackTrace();
-                                throw new SAXException(tr("Couldn't read time format '{0}'.",time));
+                                throw new SAXException(tr("Couldn''t read time format \"{0}\".",time));
                         }
                 }
@@ -164 +164 @@
                 String s = atts.getValue(value);
                 if (s == null)
-                        throw new SAXException(tr("Missing required attirbute '{0}'.",value));
+                        throw new SAXException(tr("Missing required attirbute \"{0}\".",value));
                 return Long.parseLong(s);
         }