Changeset 28021 in osm for applications/editors

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

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java (added)
• src/org/openstreetmap/josm/plugins/opendata/core/io/XmlImporter.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/build.xml

@@ -107 +107 @@
     <!--
     **********************************************************
+    ** compile_naptune - compiles Neptune classes
+    **********************************************************
+    -->
+    <target name="compile_neptune" depends="init">
+        <echo message="compiling Neptune ... "/>
+        <javac srcdir="includes/neptune" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8" />
+    </target>
+    <!--
+    **********************************************************
     ** compile - compiles the source tree
     **********************************************************
     -->
-    <target name="compile" depends="init, compile_lang3, compile_poi, compile_jopendoc, compile_geotools">
+    <target name="compile" depends="init, compile_lang3, compile_poi, compile_jopendoc, compile_geotools, compile_neptune">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
         <javac srcdir="src/org/openstreetmap" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false">

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