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

Timestamp:

2007-09-04T10:21:49+02:00 (17 years ago)

Author:

imi

Message:

• removed MinML2 dependency (use javax.xml)
• fixed reorder action (thanks Robert)
• added backup files before saving (thanks Dave)
• added search for last modifying user (thanks Dave)
• fixed import of plugin list and added author field (thanks Shaun)

File:

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

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

@@ -15 +15 @@
 import java.util.Map;
 import java.util.Map.Entry;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
 
 import org.openstreetmap.josm.Main;
@@ -31 +34 @@
 import org.openstreetmap.josm.tools.DateParser;
 import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-
-import uk.co.wilson.xml.MinML2;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
@@ -103 +106 @@
         private HashSet<String> allowedVersions = new HashSet<String>();
 
-        private class Parser extends MinML2 {
+        private class Parser extends DefaultHandler {
                 /**
                  * The current osm primitive to be read.
@@ -296 +299 @@
 
                 // phase 1: Parse nodes and read in raw segments and ways
-                osm.new Parser().parse(new InputStreamReader(source, "UTF-8"));
+                InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
+                try {
+                SAXParserFactory.newInstance().newSAXParser().parse(inputSource, osm.new Parser());
+        } catch (ParserConfigurationException e1) {
+                e1.printStackTrace(); // broken SAXException chaining
+                throw new SAXException(e1);
+        }
                 if (pleaseWaitDlg != null) {
                         pleaseWaitDlg.progress.setValue(0);