Changeset 19503 in osm

Timestamp:

2010-01-13T20:24:04+01:00 (14 years ago)

Author:

jttt

Message:

Adapt to josm r2851

Location:

applications/editors/josm/plugins/dataimport

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java (modified) (2 diffs)

applications/editors/josm/plugins/dataimport/.classpath

@@ -6 +6 @@
         <classpathentry exported="true" kind="lib" path="lib/jaxb-impl.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jaxb-api.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/activation.jar"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry kind="output" path="bin"/>

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

@@ -32 +32 @@
         <property name="commit.message" value="Changed constructor signature, updated build.xml" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-        <property name="plugin.main.version" value="2830" />
+        <property name="plugin.main.version" value="2851" />
 
         <!--

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.FileImporter;
 
@@ -43 +44 @@
          */
         @Override
-        public void importData(File file) throws IOException {
+        public void importData(File file, ProgressMonitor progressMonitor) throws IOException {
                 // create the data tree
                 GpxData data = new GpxData();
@@ -92 +93 @@
                         showInfobox(imported,failure);
                 } finally {
-                        if (rd != null)
+                        if (rd != null) {
                                 rd.close();
+                        }
                 }
         }

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.FileImporter;
 import org.openstreetmap.josm.plugins.dataimport.io.tcx.ActivityLapT;
@@ -71 +72 @@
      */
     @Override
-    public void importData(File tcxFile) throws IOException {
+    public void importData(File tcxFile, ProgressMonitor progressMonitor) throws IOException {
         //this.tcxFile = tcxFile;
         parseFile(tcxFile);