Changeset 28021 in osm for applications/editors/josm/plugins/opendata/src

Timestamp:

2012-03-09T13:57:20+01:00 (13 years ago)

Author:

donvip

Message:

opendata: more work on Neptune file support

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io

Files:

• NeptuneReader.java (added)
• XmlImporter.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/XmlImporter.java

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.opendata.core.io;
 
+import java.io.InputStream;
+
+import javax.xml.bind.JAXBException;
+
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.IllegalDataException;
+
 public class XmlImporter extends AbstractImporter {
 
@@ -21 +29 @@
                 super(XML_FILE_FILTER);
         }
-
+        
+        @Override
+        protected DataSet parseDataSet(InputStream in, ProgressMonitor instance)
+                        throws IllegalDataException {
+                try {
+                        // TODO: check it is a neptune file
+                        return NeptuneReader.parseDataSet(in, handler, instance);
+                } catch (JAXBException e) {
+                        throw new IllegalDataException(e);
+                }
+        }
 }