karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: renaming Importer classes.

Browse Source
This commit is contained in:
Dennis Guse
2021-05-27 17:55:42 +02:00
parent 288fe27a57
commit eada954299
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
+5 -5
View File
@@ -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
src/androidTest/java/de/dennisguse/opentracks/io/file/importer/LegacyImportTest.java
+3 -3
View File
@@ -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
src/main/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporter.java → src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java
+4 -4
View File
@@ -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
src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java
+2 -2
View File
@@ -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 {
src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java → src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java
+3 -3
View File
@@ -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
src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java
+1 -1
View File
@@ -205,7 +205,7 @@ public class KmzTrackImporter {
}
private List<Track.Id> 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