Changeset 319 in josm for src/org/openstreetmap/josm/io/OsmIdReader.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/OsmIdReader.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import java.util.Map;
 
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
 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;
 
 /**
@@ -21 +24 @@
  * @author Imi
  */
-public class OsmIdReader extends MinML2 {
+public class OsmIdReader extends DefaultHandler {
 
         private boolean cancel;
@@ -41 +44 @@
         this.in = new InputStreamReader(in, "UTF-8");
                 try {
-                parse(this.in);
+                SAXParserFactory.newInstance().newSAXParser().parse(new InputSource(this.in), this);
+        } catch (ParserConfigurationException e) {
+                if (!cancel) {
+                        e.printStackTrace(); // broken SAXException chaining
+                        throw new SAXException(e);
+                }
         } catch (SAXException e) {
                 if (!cancel)