Changeset 9949 in osm for applications/editors/josm/plugins/waypoints/src/WaypointReader.java

Timestamp:

2008-08-18T16:47:03+02:00 (17 years ago)

Author:

stoecker

Message:

fixed build of two more modules

File:

• applications/editors/josm/plugins/waypoints/src/WaypointReader.java (modified) (4 diffs)

applications/editors/josm/plugins/waypoints/src/WaypointReader.java

@@ -7 +7 @@
 import java.io.InputStreamReader;
 
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet; // NW
@@ -12 +15 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-
-import uk.co.wilson.xml.MinML2;
-
+import org.xml.sax.InputSource;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
@@ -21 +23 @@
 public class WaypointReader {
 
-        private static class Parser extends MinML2 {
+        private static class Parser extends DefaultHandler {
                 /**
                  * Current track to be read. The last entry is the current trkpt.
@@ -99 +101 @@
          */
         public static DataSet parse(InputStream source) 
-                        throws SAXException, IOException{
+                        throws SAXException, IOException, ParserConfigurationException {
                 Parser parser = new Parser();
-                parser.parse(new InputStreamReader(source, "UTF-8"));
+                SAXParserFactory.newInstance().newSAXParser().parse(new InputSource(new InputStreamReader(source, "UTF-8")), parser);
                 return parser.dataSet;
         }