diff --git a/build.xml b/build.xml index 8a0646c7a0..81ef37560b 100644 --- a/build.xml +++ b/build.xml @@ -32,7 +32,6 @@ - @@ -73,7 +72,6 @@ - diff --git a/dataimport/.classpath b/dataimport/.classpath index b5edc13435..10e53443e4 100644 --- a/dataimport/.classpath +++ b/dataimport/.classpath @@ -2,6 +2,10 @@ + + + + diff --git a/dataimport/README b/dataimport/README index e200b2cfac..20affa85e1 100644 --- a/dataimport/README +++ b/dataimport/README @@ -1,8 +1,9 @@ -README +README ====== This plugin adds additional file formats into file open dialog. -Following file formats are support: +Following file formats get support: -- TangoGPS \ No newline at end of file +- TangoGPS +- Garmin Trainings Center TCX \ No newline at end of file diff --git a/dataimport/build.xml b/dataimport/build.xml index 8229dd6e05..3ec9eb9e37 100644 --- a/dataimport/build.xml +++ b/dataimport/build.xml @@ -50,9 +50,15 @@ --> - + + + + + + + @@ -78,7 +84,13 @@ ** ************************************************ --> - + + + + + + + diff --git a/tcxplugin/lib/jaxb-api.jar b/dataimport/lib/jaxb-api.jar similarity index 100% rename from tcxplugin/lib/jaxb-api.jar rename to dataimport/lib/jaxb-api.jar diff --git a/tcxplugin/lib/jaxb-impl.jar b/dataimport/lib/jaxb-impl.jar similarity index 100% rename from tcxplugin/lib/jaxb-impl.jar rename to dataimport/lib/jaxb-impl.jar diff --git a/tcxplugin/lib/jsr173-1.0_api.jar b/dataimport/lib/jsr173-1.0_api.jar similarity index 100% rename from tcxplugin/lib/jsr173-1.0_api.jar rename to dataimport/lib/jsr173-1.0_api.jar diff --git a/tcxplugin/src/org/openstreetmap/josm/io/TcxReader.java b/dataimport/src/org/openstreetmap/josm/io/Tcx.java similarity index 85% rename from tcxplugin/src/org/openstreetmap/josm/io/TcxReader.java rename to dataimport/src/org/openstreetmap/josm/io/Tcx.java index d3767621a0..2993e6102d 100644 --- a/tcxplugin/src/org/openstreetmap/josm/io/TcxReader.java +++ b/dataimport/src/org/openstreetmap/josm/io/Tcx.java @@ -1,7 +1,10 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.io; +import static org.openstreetmap.josm.tools.I18n.tr; + import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -11,10 +14,14 @@ import javax.xml.bind.Unmarshaller; import javax.xml.datatype.XMLGregorianCalendar; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.ExtensionFileFilter; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.gpx.GpxData; import org.openstreetmap.josm.data.gpx.GpxTrack; import org.openstreetmap.josm.data.gpx.WayPoint; +import org.openstreetmap.josm.gui.layer.GpxLayer; +import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; import org.openstreetmap.josm.io.tcx.ActivityLapT; import org.openstreetmap.josm.io.tcx.ActivityT; import org.openstreetmap.josm.io.tcx.CourseT; @@ -23,6 +30,7 @@ import org.openstreetmap.josm.io.tcx.TrackpointT; import org.openstreetmap.josm.io.tcx.TrainingCenterDatabaseT; + /** * TCX Reader. This class is based on code genarated by the Java Architecture * for XML Binding (JAXB). For this class to work you will need the API und IMPL @@ -42,29 +50,48 @@ * Note: if you get an exception that JAXB 2.1 is not supported on your system, you will have to add the jaxb-api.jar * to the endorsed directory (create it if necessary) of your JRE. Usually it is something like this: * \\Java\jre\lib\endorsed - * + * * @author adrian - * + * */ -public class TcxReader { +public class Tcx extends FileImporter { - private File tcxFile; + //private File tcxFile; private GpxData gpxData; + + public Tcx() { + super(new ExtensionFileFilter("tcx", "tcx",tr("TCX Files (*.tcx)"))); + } + /** * @param tcxFile */ - public TcxReader(File tcxFile) { - super(); - this.tcxFile = tcxFile; - parseFile(); + @Override + public void importData(File tcxFile) throws IOException { + //this.tcxFile = tcxFile; + parseFile(tcxFile); + + GpxData gpxData = getGpxData(); + gpxData.storageFile = tcxFile; + GpxLayer gpxLayer = new GpxLayer(gpxData, tcxFile.getName()); + Main.main.addLayer(gpxLayer); + if (Main.pref.getBoolean("marker.makeautomarkers", true)) + { + MarkerLayer ml = new MarkerLayer(gpxData, tr("Markers from {0}", tcxFile.getName()), tcxFile, gpxLayer); + if (ml.data.size() > 0) + { + Main.main.addLayer(ml); + } + } + } /** - * + * */ - @SuppressWarnings("unchecked") private void parseFile() { + @SuppressWarnings("unchecked") private void parseFile(File tcxFile) { try { JAXBContext jc = JAXBContext .newInstance(TrainingCenterDatabaseT.class); @@ -95,10 +122,9 @@ private static WayPoint convertPoint(TrackpointT tp) { PositionT p = tp.getPosition(); - if (p == null) { + if (p == null) // If the TrackPointT lacks a position, return null. return null; - } WayPoint waypt = new WayPoint(new LatLon(p.getLatitudeDegrees(), p.getLongitudeDegrees())); @@ -188,7 +214,7 @@ private void parseDataFromCourses(TrainingCenterDatabaseT tcd) { } } - public GpxData getGpxData() { + private GpxData getGpxData() { return gpxData; } } diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/AbstractSourceT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/AbstractSourceT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/AbstractSourceT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/AbstractSourceT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/AbstractStepT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/AbstractStepT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/AbstractStepT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/AbstractStepT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/ActivityLapT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/ActivityLapT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/ActivityLapT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/ActivityLapT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/ActivityListT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/ActivityListT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/ActivityListT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/ActivityListT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/ActivityReferenceT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/ActivityReferenceT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/ActivityReferenceT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/ActivityReferenceT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/ActivityT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/ActivityT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/ActivityT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/ActivityT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/ApplicationT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/ApplicationT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/ApplicationT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/ApplicationT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/BuildT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/BuildT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/BuildT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/BuildT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/BuildTypeT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/BuildTypeT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/BuildTypeT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/BuildTypeT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CadenceT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CadenceT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CadenceT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CadenceT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CaloriesBurnedT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CaloriesBurnedT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CaloriesBurnedT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CaloriesBurnedT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CourseFolderT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CourseFolderT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CourseFolderT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CourseFolderT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CourseLapT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CourseLapT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CourseLapT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CourseLapT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CourseListT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CourseListT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CourseListT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CourseListT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CoursePointT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CoursePointT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CoursePointT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CoursePointT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CourseT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CourseT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CourseT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CourseT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CoursesT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CoursesT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CoursesT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CoursesT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CustomHeartRateZoneT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CustomHeartRateZoneT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CustomHeartRateZoneT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CustomHeartRateZoneT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/CustomSpeedZoneT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/CustomSpeedZoneT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/CustomSpeedZoneT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/CustomSpeedZoneT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/DeviceT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/DeviceT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/DeviceT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/DeviceT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/DistanceT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/DistanceT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/DistanceT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/DistanceT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/DurationT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/DurationT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/DurationT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/DurationT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/ExtensionsT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/ExtensionsT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/ExtensionsT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/ExtensionsT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/FirstSportT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/FirstSportT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/FirstSportT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/FirstSportT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/FoldersT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/FoldersT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/FoldersT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/FoldersT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/GenderT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/GenderT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/GenderT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/GenderT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateAboveT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateAboveT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateAboveT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateAboveT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateAsPercentOfMaxT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateAsPercentOfMaxT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateAsPercentOfMaxT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateAsPercentOfMaxT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateBelowT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateBelowT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateBelowT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateBelowT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateInBeatsPerMinuteT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateInBeatsPerMinuteT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateInBeatsPerMinuteT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateInBeatsPerMinuteT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateValueT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateValueT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/HeartRateValueT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/HeartRateValueT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/HistoryFolderT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/HistoryFolderT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/HistoryFolderT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/HistoryFolderT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/HistoryT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/HistoryT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/HistoryT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/HistoryT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/IntensityT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/IntensityT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/IntensityT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/IntensityT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/MultiSportFolderT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/MultiSportFolderT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/MultiSportFolderT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/MultiSportFolderT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/MultiSportSessionT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/MultiSportSessionT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/MultiSportSessionT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/MultiSportSessionT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/NameKeyReferenceT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/NameKeyReferenceT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/NameKeyReferenceT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/NameKeyReferenceT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/NextSportT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/NextSportT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/NextSportT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/NextSportT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/NoneT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/NoneT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/NoneT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/NoneT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/ObjectFactory.java b/dataimport/src/org/openstreetmap/josm/io/tcx/ObjectFactory.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/ObjectFactory.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/ObjectFactory.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/PlanT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/PlanT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/PlanT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/PlanT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/PositionT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/PositionT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/PositionT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/PositionT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/PredefinedHeartRateZoneT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/PredefinedHeartRateZoneT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/PredefinedHeartRateZoneT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/PredefinedHeartRateZoneT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/PredefinedSpeedZoneT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/PredefinedSpeedZoneT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/PredefinedSpeedZoneT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/PredefinedSpeedZoneT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/QuickWorkoutT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/QuickWorkoutT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/QuickWorkoutT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/QuickWorkoutT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/RepeatT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/RepeatT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/RepeatT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/RepeatT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/SensorStateT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/SensorStateT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/SensorStateT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/SensorStateT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/SpeedT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/SpeedT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/SpeedT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/SpeedT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/SpeedTypeT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/SpeedTypeT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/SpeedTypeT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/SpeedTypeT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/SportT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/SportT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/SportT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/SportT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/StepT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/StepT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/StepT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/StepT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/TargetT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/TargetT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/TargetT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/TargetT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/TimeT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/TimeT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/TimeT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/TimeT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/TrackT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/TrackT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/TrackT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/TrackT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/TrackpointT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/TrackpointT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/TrackpointT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/TrackpointT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/TrainingCenterDatabaseT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/TrainingCenterDatabaseT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/TrainingCenterDatabaseT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/TrainingCenterDatabaseT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/TrainingT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/TrainingT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/TrainingT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/TrainingT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/TrainingTypeT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/TrainingTypeT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/TrainingTypeT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/TrainingTypeT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/TriggerMethodT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/TriggerMethodT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/TriggerMethodT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/TriggerMethodT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/UserInitiatedT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/UserInitiatedT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/UserInitiatedT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/UserInitiatedT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/VersionT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/VersionT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/VersionT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/VersionT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/WeekT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/WeekT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/WeekT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/WeekT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/WorkoutFolderT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/WorkoutFolderT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/WorkoutFolderT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/WorkoutFolderT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/WorkoutListT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/WorkoutListT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/WorkoutListT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/WorkoutListT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/WorkoutT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/WorkoutT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/WorkoutT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/WorkoutT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/WorkoutsT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/WorkoutsT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/WorkoutsT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/WorkoutsT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/ZoneT.java b/dataimport/src/org/openstreetmap/josm/io/tcx/ZoneT.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/ZoneT.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/ZoneT.java diff --git a/tcxplugin/src/org/openstreetmap/josm/io/tcx/package-info.java b/dataimport/src/org/openstreetmap/josm/io/tcx/package-info.java similarity index 100% rename from tcxplugin/src/org/openstreetmap/josm/io/tcx/package-info.java rename to dataimport/src/org/openstreetmap/josm/io/tcx/package-info.java diff --git a/dataimport/src/org/openstreetmap/josm/plugins/DataImport.java b/dataimport/src/org/openstreetmap/josm/plugins/DataImport.java index 6e93003239..60e6df2805 100644 --- a/dataimport/src/org/openstreetmap/josm/plugins/DataImport.java +++ b/dataimport/src/org/openstreetmap/josm/plugins/DataImport.java @@ -3,17 +3,23 @@ */ package org.openstreetmap.josm.plugins; +import java.io.IOException; + import org.openstreetmap.josm.actions.ExtensionFileFilter; import org.openstreetmap.josm.io.TangoGPS; +import org.openstreetmap.josm.io.Tcx; public class DataImport extends Plugin { - /** - * Add new File import filter into open dialog - */ - public DataImport() { - super(); - ExtensionFileFilter.importers.add(new TangoGPS()); - } + /** + * Add new File import filter into open dialog + */ + public DataImport() throws IOException{ + super(); + + ExtensionFileFilter.importers.add(new TangoGPS()); + ExtensionFileFilter.importers.add(new Tcx()); + } + } diff --git a/tcxplugin/.classpath b/tcxplugin/.classpath deleted file mode 100644 index d166edce8e..0000000000 --- a/tcxplugin/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tcxplugin/.project b/tcxplugin/.project deleted file mode 100644 index 357a1849f1..0000000000 --- a/tcxplugin/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - josm.tcx.plugin - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/tcxplugin/build.xml b/tcxplugin/build.xml deleted file mode 100644 index e21135d664..0000000000 --- a/tcxplugin/build.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tcxplugin/images/tcxicon.png b/tcxplugin/images/tcxicon.png deleted file mode 100644 index 31219aa73c..0000000000 Binary files a/tcxplugin/images/tcxicon.png and /dev/null differ diff --git a/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java b/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java deleted file mode 100644 index f558c2bf14..0000000000 --- a/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * josm.tcx.plugin - * (c) Copyright by M.IT 2002-2008 - * www.emaitie.de - */ - -package org.openstreetmap.josm.plugins; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; -import java.io.File; -import java.io.IOException; - -import javax.swing.JFileChooser; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.gui.MainMenu; -import org.openstreetmap.josm.actions.DiskAccessAction; -import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.gpx.GpxData; -import org.openstreetmap.josm.gui.layer.GpxLayer; -import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; -import org.openstreetmap.josm.io.TcxReader; -import org.openstreetmap.josm.tools.Shortcut; -/** - * @author adrian - * @since 12.08.2008 - */ -public class TcxPlugin extends Plugin -{ - public class OpenAction extends DiskAccessAction - { - public OpenAction() - { - super(tr("Import TCX File..."), "tcxicon", tr("Import TCX file as GPS track"), - Shortcut.registerShortcut("menu:importtcx", tr("Menu: {0}", tr("Import TCX File...")), - KeyEvent.VK_T, Shortcut.GROUP_MENU)); - } - - private void addTcxFileFilter() - { - //TODO doesn't work! ExtensionFileFilter has private constructor -// new ExtensionFileFilter("tcx", "tcx", tr("TCX Files (.tcx)")); -// add to ExtensionFileFilter.filters; -// => check if filters contains a tcx entry, if not create a new array with tcx in it -// assign it to filters - - // TODO later we can remove the filter from the file filter list, so the extension does not appear - // when the user wants to open a normal file. - } - - - public void actionPerformed(ActionEvent e) - { - addTcxFileFilter(); - JFileChooser fc = createAndOpenFileChooser(true, true, null); -// removeTcxFileFiler(); - if (fc == null) - return; - File[] files = fc.getSelectedFiles(); - try - { - for (int i = files.length; i > 0; --i) - openFileAsTcx(files[i-1]); - } - catch (IOException e1) - { - throw new RuntimeException(e1); - } - } - - private void openFileAsTcx(File file) throws IOException - { - String fn = file.getName(); - if (fn.toLowerCase().endsWith(".tcx")) - { - TcxReader tcxReader = new TcxReader(file); - GpxData gpxData = tcxReader.getGpxData(); - gpxData.storageFile = file; - GpxLayer gpxLayer = new GpxLayer(gpxData, fn); - Main.main.addLayer(gpxLayer); - if (Main.pref.getBoolean("marker.makeautomarkers", true)) - { - MarkerLayer ml = new MarkerLayer(gpxData, tr("Markers from {0}", fn), file, gpxLayer); - if (ml.data.size() > 0) - { - Main.main.addLayer(ml); - } - } - } - else - { - throw new IllegalStateException(); - } - } - } - - public TcxPlugin() - { - MainMenu.add(Main.main.menu.fileMenu, new OpenAction()); - } -}