Index: /applications/editors/josm/plugins/dataimport/.classpath
===================================================================
--- /applications/editors/josm/plugins/dataimport/.classpath	(revision 19502)
+++ /applications/editors/josm/plugins/dataimport/.classpath	(revision 19503)
@@ -6,5 +6,4 @@
 	<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"/>
Index: /applications/editors/josm/plugins/dataimport/build.xml
===================================================================
--- /applications/editors/josm/plugins/dataimport/build.xml	(revision 19502)
+++ /applications/editors/josm/plugins/dataimport/build.xml	(revision 19503)
@@ -32,5 +32,5 @@
 	<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" />
 
 	<!--
Index: /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 19502)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 19503)
@@ -24,4 +24,5 @@
 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,5 +44,5 @@
 	 */
 	@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,6 +93,7 @@
 			showInfobox(imported,failure);
 		} finally {
-			if (rd != null)
+			if (rd != null) {
 				rd.close();
+			}
 		}
 	}
Index: /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 19502)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 19503)
@@ -23,4 +23,5 @@
 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,5 +72,5 @@
      */
     @Override
-    public void importData(File tcxFile) throws IOException {
+    public void importData(File tcxFile, ProgressMonitor progressMonitor) throws IOException {
         //this.tcxFile = tcxFile;
         parseFile(tcxFile);