Changeset 9949 in osm for applications

Timestamp:

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

Author:

stoecker

Message:

fixed build of two more modules

Location:

applications/editors/josm/plugins

Files:

• build.xml (modified) (2 diffs)
• waypoints/src/WaypointOpenAction.java (modified) (3 diffs)
• waypoints/src/WaypointReader.java (modified) (4 diffs)

applications/editors/josm/plugins/build.xml

@@ -26 +26 @@
     <ant        dir="pluginmanager"     antfile="build.xml"     target="dist"/> 
     <ant        dir="slippymap"         antfile="build.xml"     target="dist"/>
+    <ant        dir="surveyor"          antfile="build.xml"     target="dist"/>
     <ant        dir="tagging-preset-tester"     antfile="build.xml"     target="dist"/>
     <ant        dir="utilsplugin"       antfile="build.xml"     target="dist"/>
     <ant        dir="validator"         antfile="build.xml"     target="dist"/>
+    <ant        dir="waypoints"         antfile="build.xml"     target="dist"/>
     <ant        dir="wmsplugin"         antfile="build.xml"     target="dist"/>
     <ant        dir="ywms"              antfile="build.xml"     target="dist"/>
@@ -36 +38 @@
     <ant        dir="grid"              antfile="build.xml"     target="dist"/>
     <ant        dir="navigator"         antfile="build.xml"     target="dist"/>
-    <ant        dir="surveyor"          antfile="build.xml"     target="dist"/>
-    <ant        dir="waypoints"         antfile="build.xml"     target="dist"/>
   </target>
 

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

@@ -14 +14 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
+
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.openstreetmap.josm.Main;
@@ -36 +38 @@
 
         public void actionPerformed(ActionEvent e) {
-                JFileChooser fc = createAndOpenFileChooser(true, true);
+                JFileChooser fc = createAndOpenFileChooser(true, true, null);
                 if (fc == null)
                         return;
@@ -58 +60 @@
                         JOptionPane.showMessageDialog(Main.parent, 
                                         tr("Error while parsing {0}",fn)+": "+x.getMessage());
+                } catch (ParserConfigurationException x) {
+                        x.printStackTrace(); // broken SAXException chaining
+                        JOptionPane.showMessageDialog(Main.parent, 
+                                        tr("Error while parsing {0}",fn)+": "+x.getMessage());
                 } catch (IOException x) {
                         x.printStackTrace();

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