Changeset 1499 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-03-18T16:13:41+01:00 (15 years ago)

Author:

stoecker

Message:

close #2302 - patch by jttt - optimizations and encapsulation

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmReader.java (modified) (3 diffs)
• OsmWriter.java (modified) (2 diffs)

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

@@ -33 +33 @@
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
+import org.openstreetmap.josm.tools.DateUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -101 +102 @@
                osm.selected = selected;
                osm.deleted = deleted;
-               osm.timestamp = timestamp;
+               osm.setTimestamp(getTimestamp());
                osm.user = user;
                osm.visible = visible;
                osm.version = version;
-               osm.checkTagged();
-               osm.checkDirectionTagged();
                osm.mappaintStyle = null;
           }
@@ -304 +303 @@
           String time = atts.getValue("timestamp");
           if (time != null && time.length() != 0) {
-               /* Do not parse the date here since it wastes a HUGE amount of time.
-                * Moved into OsmPrimitive.
-               try {
-                    current.timestamp = DateParser.parse(time);
-               } catch (ParseException e) {
-                    e.printStackTrace();
-                    throw new SAXException(tr("Couldn''t read time format \"{0}\".",time));
-               }
-               */
-               current.timestamp = time;
+               current.setTimestamp(DateUtils.fromString(time));
           }
 

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.tools.DateUtils;
 
 /**
@@ -201 +202 @@
                 out.print(" action='"+action+"'");
         }
-        if (osm.timestamp != null) {
-            out.print(" timestamp='"+osm.timestamp+"'");
+        if (!osm.isTimestampEmpty()) {
+            out.print(" timestamp='"+DateUtils.fromDate(osm.getTimestamp())+"'");
         }
         // user and visible added with 0.4 API