Changeset 9 in josm for src/org/openstreetmap/josm/actions/OpenGpxAction.java

Timestamp:

2005-10-04T00:09:32+02:00 (21 years ago)

Author:

imi

Message:

• added support for DataReaders
• added a nice status line and a tooltip when holding middle mouse button

File:

• src/org/openstreetmap/josm/actions/OpenGpxAction.java (modified) (2 diffs)

src/org/openstreetmap/josm/actions/OpenGpxAction.java

@@ -13 +13 @@
 import javax.swing.filechooser.FileFilter;
 
-import org.jdom.JDOMException;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.Main;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.io.GpxReader;
+import org.openstreetmap.josm.io.DataReader.ConnectionException;
+import org.openstreetmap.josm.io.DataReader.ParseException;
 
 /**
@@ -53 +54 @@
                 
                 try {
-                        DataSet dataSet = new GpxReader().parse(new FileReader(gpxFile));
+                        DataSet dataSet = new GpxReader(new FileReader(gpxFile)).parse();
                         MapFrame map = new MapFrame(dataSet);
                         Main.main.setMapFrame(gpxFile.getName(), map);
-                } catch (JDOMException x) {
+                } catch (ParseException x) {
                         x.printStackTrace();
-                        JOptionPane.showMessageDialog(Main.main, "Illegal GPX document:\n"+x.getMessage());
+                        JOptionPane.showMessageDialog(Main.main, x.getMessage());
                 } catch (IOException x) {
                         x.printStackTrace();
-                        JOptionPane.showMessageDialog(Main.main, "Could not read '"+gpxFile.getName()+"':\n"+x.getMessage());
+                        JOptionPane.showMessageDialog(Main.main, "Could not read '"+gpxFile.getName()+"'\n"+x.getMessage());
+                } catch (ConnectionException x) {
+                        x.printStackTrace();
+                        JOptionPane.showMessageDialog(Main.main, x.getMessage());
                 }
         }