Changeset 319 in josm for src/org/openstreetmap/josm/io

Timestamp:

2007-09-04T10:21:49+02:00 (19 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)

Location:

src/org/openstreetmap/josm/io

Files:

• IncompleteDownloader.java (modified) (4 diffs)
• OsmIdReader.java (modified) (3 diffs)
• OsmReader.java (modified) (4 diffs)
• RawGpsReader.java (modified) (4 diffs)

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

@@ -10 +10 @@
 import java.io.InputStreamReader;
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.ArrayList;
+
+import javax.swing.JOptionPane;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -20 +27 @@
 import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
 import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-
-import javax.swing.JOptionPane;
-import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.SequenceCommand;
-
-import uk.co.wilson.xml.MinML2;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
@@ -80 +82 @@
         }
 
-        private static class SegmentParser extends MinML2 {
+        private static class SegmentParser extends DefaultHandler {
                 public long from, to;
                 @Override public void startElement(String ns, String lname, String qname, Attributes a) {
@@ -133 +135 @@
                                 segBuilder.append(line+"\n");
                         SegmentParser segmentParser = new SegmentParser();
-                        segmentParser.parse(new StringReader(segBuilder.toString()));
+                        try {
+                        SAXParserFactory.newInstance().newSAXParser().parse(new InputSource(new StringReader(segBuilder.toString())), segmentParser);
+                } catch (ParserConfigurationException e1) {
+                        e1.printStackTrace(); // broken SAXException chaining
+                        throw new SAXException(e1);
+                }
                         if (segmentParser.from == 0 || segmentParser.to == 0)
                                 throw new SAXException("Invalid segment response.");

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)

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);

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

@@ -14 +14 @@
 import java.util.Stack;
 
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
@@ -19 +22 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerProducers;
 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;
 
 /**
@@ -46 +49 @@
         public Collection<Marker> markerData = new ArrayList<Marker>();
 
-        private class Parser extends MinML2 {
+        private class Parser extends DefaultHandler {
                 /**
                  * Current track to be read. The last entry is the current trkpt.
@@ -127 +130 @@
                 this.relativeMarkerPath = relativeMarkerPath;
                 Parser parser = new Parser();
-                parser.parse(new InputStreamReader(source, "UTF-8"));
+                InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
+                try {
+                        SAXParserFactory.newInstance().newSAXParser().parse(inputSource, parser);
+        } catch (ParserConfigurationException e) {
+                e.printStackTrace(); // broken SAXException chaining
+                throw new SAXException(e);
+        }
         }
 }