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

Timestamp:

2007-10-11T21:35:15+02:00 (18 years ago)

Author:

framm

Message:

• alleviated #388 by parsing the timestamps only when they are needed.

File:

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

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

@@ -8 +8 @@
 import java.io.InputStreamReader;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -150 +152 @@
                                         current = new OsmPrimitiveData();
                                         readCommon(atts, current);
-                                        ways.put((OsmPrimitiveData)current, new LinkedList<Long>());
+                                        ways.put((OsmPrimitiveData)current, new ArrayList<Long>());
                                 } else if (qName.equals("nd")) {
                                         Collection<Long> list = ways.get(current);
@@ -224 +226 @@
                 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);
@@ -230 +234 @@
                                 throw new SAXException(tr("Couldn't read time format \"{0}\".",time));
                         }
+                        */
+                        current.timestamp = time;
                 }
                 
@@ -290 +296 @@
                         adder.visit(w);
                 }
+                
         }
 
@@ -393 +400 @@
                 throw new SAXException(e1);
         }
-                if (pleaseWaitDlg != null) {
+
+        if (pleaseWaitDlg != null) {
                         pleaseWaitDlg.progress.setValue(0);
                         pleaseWaitDlg.currentAction.setText(tr("Preparing data..."));
                 }
+
                 for (Node n : osm.nodes.values())
                         osm.adder.visit(n);