From eada954299660b0705285a30f0bcc73465df7c9b Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 27 May 2021 17:55:42 +0200 Subject: [PATCH] Cleanup: renaming Importer classes. --- .../opentracks/io/file/importer/ExportImportTest.java | 10 +++++----- .../opentracks/io/file/importer/LegacyImportTest.java | 6 +++--- ...GpxFileTrackImporter.java => GpxTrackImporter.java} | 8 ++++---- .../opentracks/io/file/importer/ImportService.java | 4 ++-- ...KmlFileTrackImporter.java => KmlTrackImporter.java} | 6 +++--- .../opentracks/io/file/importer/KmzTrackImporter.java | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) rename src/main/java/de/dennisguse/opentracks/io/file/importer/{GpxFileTrackImporter.java => GpxTrackImporter.java} (97%) rename src/main/java/de/dennisguse/opentracks/io/file/importer/{KmlFileTrackImporter.java => KmlTrackImporter.java} (98%) diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index f8c97f590..668be1611 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -169,7 +169,7 @@ public class ExportImportTest { // 2. import InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri); - XMLImporter trackImporter = new XMLImporter(new KmlFileTrackImporter(context)); + XMLImporter trackImporter = new XMLImporter(new KmlTrackImporter(context)); importTrackId = trackImporter.importFile(inputStream).get(0); // then @@ -209,7 +209,7 @@ public class ExportImportTest { // 2. import InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri); - XMLImporter trackImporter = new XMLImporter(new KmlFileTrackImporter(context)); + XMLImporter trackImporter = new XMLImporter(new KmlTrackImporter(context)); importTrackId = trackImporter.importFile(inputStream).get(0); // then @@ -288,7 +288,7 @@ public class ExportImportTest { // 2. import InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri); - XMLImporter trackImporter = new XMLImporter(new KmlFileTrackImporter(context)); + XMLImporter trackImporter = new XMLImporter(new KmlTrackImporter(context)); importTrackId = trackImporter.importFile(inputStream).get(0); // then @@ -313,7 +313,7 @@ public class ExportImportTest { // 2. import InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri); - XMLImporter trackImporter = new XMLImporter(new GpxFileTrackImporter(context, contentProviderUtils)); + XMLImporter trackImporter = new XMLImporter(new GpxTrackImporter(context, contentProviderUtils)); importTrackId = trackImporter.importFile(inputStream).get(0); // then @@ -362,7 +362,7 @@ public class ExportImportTest { // 2. import InputStream inputStream = context.getContentResolver().openInputStream(tmpFileUri); - XMLImporter trackImporter = new XMLImporter(new GpxFileTrackImporter(context, contentProviderUtils)); + XMLImporter trackImporter = new XMLImporter(new GpxTrackImporter(context, contentProviderUtils)); importTrackId = trackImporter.importFile(inputStream).get(0); // then diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/LegacyImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/LegacyImportTest.java index 5c83e1773..2190d2f0c 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/LegacyImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/LegacyImportTest.java @@ -51,7 +51,7 @@ public class LegacyImportTest { @Test public void kml_with_statistics_marker() throws IOException { // given - XMLImporter trackImporter = new XMLImporter(new KmlFileTrackImporter(context)); + XMLImporter trackImporter = new XMLImporter(new KmlTrackImporter(context)); InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.legacy_kml_statistics_marker); // when @@ -93,7 +93,7 @@ public class LegacyImportTest { @Test(expected = ImportParserException.class) public void kml_without_locations() throws IOException { // given - XMLImporter trackImporter = new XMLImporter(new KmlFileTrackImporter(context)); + XMLImporter trackImporter = new XMLImporter(new KmlTrackImporter(context)); InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.legacy_kml_empty); // when @@ -107,7 +107,7 @@ public class LegacyImportTest { @Test public void gpx_with_pause_resume() throws IOException { // given - XMLImporter trackImporter = new XMLImporter(new GpxFileTrackImporter(context)); + XMLImporter trackImporter = new XMLImporter(new GpxTrackImporter(context)); InputStream inputStream = InstrumentationRegistry.getInstrumentation().getContext().getResources().openRawResource(de.dennisguse.opentracks.debug.test.R.raw.legacy_gpx_pause_resume); // when diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporter.java rename to src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java index 46c22b1e6..61e4aa71f 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java @@ -54,9 +54,9 @@ import de.dennisguse.opentracks.util.StringUtils; * * @author Jimmy Shih */ -public class GpxFileTrackImporter extends DefaultHandler implements XMLImporter.TrackParser { +public class GpxTrackImporter extends DefaultHandler implements XMLImporter.TrackParser { - private static final String TAG = GpxFileTrackImporter.class.getSimpleName(); + private static final String TAG = GpxTrackImporter.class.getSimpleName(); private static final String TAG_DESCRIPTION = "desc"; private static final String TAG_COMMENT = "cmt"; @@ -115,12 +115,12 @@ public class GpxFileTrackImporter extends DefaultHandler implements XMLImporter. private final TrackImporter trackImporter; - public GpxFileTrackImporter(Context context) { + public GpxTrackImporter(Context context) { this(context, new ContentProviderUtils(context)); } @VisibleForTesting - GpxFileTrackImporter(Context context, ContentProviderUtils contentProviderUtils) { + GpxTrackImporter(Context context, ContentProviderUtils contentProviderUtils) { this.context = context; //TODO move this to instantiation of this class diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java index 661ed0779..d9931e9c3 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java @@ -52,9 +52,9 @@ public class ImportService extends JobIntentService { try { if (TrackFileFormat.GPX.getExtension().equals(fileExtension)) { - trackIds.addAll(new XMLImporter(new GpxFileTrackImporter(this)).importFile(this, file.getUri())); + trackIds.addAll(new XMLImporter(new GpxTrackImporter(this)).importFile(this, file.getUri())); } else if (TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.getExtension().equals(fileExtension)) { - trackIds.addAll(new XMLImporter(new KmlFileTrackImporter(this)).importFile(this, file.getUri())); + trackIds.addAll(new XMLImporter(new KmlTrackImporter(this)).importFile(this, file.getUri())); } else if (TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES.getExtension().equals(fileExtension)) { trackIds.addAll(new KmzTrackImporter().importFile(this, file.getUri())); } else { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java rename to src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java index a42be0536..79628af85 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java @@ -46,9 +46,9 @@ import de.dennisguse.opentracks.util.StringUtils; * * @author Jimmy Shih */ -public class KmlFileTrackImporter extends DefaultHandler implements XMLImporter.TrackParser { +public class KmlTrackImporter extends DefaultHandler implements XMLImporter.TrackParser { - private static final String TAG = KmlFileTrackImporter.class.getSimpleName(); + private static final String TAG = KmlTrackImporter.class.getSimpleName(); private static final String MARKER_STYLE = "#" + KMLTrackExporter.MARKER_STYLE; @@ -107,7 +107,7 @@ public class KmlFileTrackImporter extends DefaultHandler implements XMLImporter. private final TrackImporter trackImporter; - public KmlFileTrackImporter(Context context) { + public KmlTrackImporter(Context context) { this.context = context; //TODO move this to instantiation of this class diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java index 7f0063e2d..a91fd5d9d 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java @@ -205,7 +205,7 @@ public class KmzTrackImporter { } private List parseKml(ZipInputStream zipInputStream) throws IOException { - XMLImporter kmlFileTrackImporter = new XMLImporter(new KmlFileTrackImporter(context)); + XMLImporter kmlFileTrackImporter = new XMLImporter(new KmlTrackImporter(context)); InputStream nonClosableInputStream = new FilterInputStream(zipInputStream) { @Override