From 12023d51aec540cc724e6cb68e286fe746a720a3 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 21 Dec 2019 18:27:03 +0100 Subject: [PATCH] Move data classes into separate package. --- .../dennisguse/opentracks/TrackStubUtils.java | 2 +- .../content/CustomContentProviderTest.java | 3 +++ .../content/CustomContentProviderUtilsTest.java | 5 +++++ .../content/DescriptionGeneratorImplTest.java | 2 ++ .../opentracks/content/SearchEngineTest.java | 2 ++ .../importer/AbstractTestFileTrackImporter.java | 8 ++++---- .../file/importer/GpxFileTrackImporterTest.java | 2 +- .../file/importer/KmlFileTrackImporterTest.java | 2 +- .../services/TrackRecordingServiceTest.java | 4 ++-- .../TrackRecordingServiceTestLooper.java | 2 +- .../opentracks/MarkerDetailActivity.java | 2 +- .../opentracks/MarkerEditActivity.java | 2 +- .../opentracks/MarkerListActivity.java | 4 ++-- .../opentracks/SearchListActivity.java | 4 ++-- .../opentracks/TrackDetailActivity.java | 4 ++-- .../opentracks/TrackEditActivity.java | 2 +- .../opentracks/TrackListActivity.java | 2 +- .../dennisguse/opentracks/chart/ChartView.java | 2 +- .../content/ContentProviderUtils.java | 17 +++++++++++------ .../content/CustomContentProvider.java | 4 ++++ .../opentracks/content/DataSourceManager.java | 4 ++++ .../content/DescriptionGenerator.java | 1 + .../content/DescriptionGeneratorImpl.java | 1 + .../opentracks/content/SearchEngine.java | 4 ++++ .../content/ShareContentProvider.java | 2 ++ .../opentracks/content/TrackDataHub.java | 2 ++ .../opentracks/content/TrackDataListener.java | 3 +++ .../opentracks/content/{ => data}/Track.java | 2 +- .../content/{ => data}/TrackPointsColumns.java | 4 +++- .../content/{ => data}/TracksColumns.java | 4 +++- .../opentracks/content/{ => data}/Waypoint.java | 2 +- .../content/{ => data}/WaypointsColumns.java | 4 +++- .../opentracks/fragments/ChartFragment.java | 4 ++-- .../fragments/MarkerDetailFragment.java | 2 +- .../opentracks/fragments/StatsFragment.java | 4 ++-- .../opentracks/io/file/TrackFileFormat.java | 2 +- .../io/file/exporter/ExportAsyncTask.java | 4 ++-- .../io/file/exporter/FileTrackExporter.java | 4 ++-- .../io/file/exporter/GpxTrackWriter.java | 4 ++-- .../io/file/exporter/KmlTrackWriter.java | 4 ++-- .../io/file/exporter/KmzTrackExporter.java | 4 ++-- .../io/file/exporter/TrackWriter.java | 4 ++-- .../importer/AbstractFileTrackImporter.java | 4 ++-- .../io/file/importer/ImportAsyncTask.java | 2 +- .../services/TrackRecordingService.java | 4 ++-- .../dennisguse/opentracks/util/IntentUtils.java | 4 ++-- .../opentracks/util/LocationUtils.java | 2 +- .../dennisguse/opentracks/util/TrackUtils.java | 4 ++-- 48 files changed, 104 insertions(+), 60 deletions(-) rename src/main/java/de/dennisguse/opentracks/content/{ => data}/Track.java (98%) rename src/main/java/de/dennisguse/opentracks/content/{ => data}/TrackPointsColumns.java (94%) rename src/main/java/de/dennisguse/opentracks/content/{ => data}/TracksColumns.java (97%) rename src/main/java/de/dennisguse/opentracks/content/{ => data}/Waypoint.java (98%) rename src/main/java/de/dennisguse/opentracks/content/{ => data}/WaypointsColumns.java (97%) diff --git a/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java b/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java index 79c34f9c8..3bccd8869 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java +++ b/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java @@ -19,7 +19,7 @@ package de.dennisguse.opentracks; import android.location.Location; import de.dennisguse.opentracks.content.SensorDataSetLocation; -import de.dennisguse.opentracks.content.Track; +import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.sensor.SensorDataSet; /** diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderTest.java index 289d704f2..4876ce86d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderTest.java @@ -27,6 +27,9 @@ import org.junit.Before; import org.junit.Test; import de.dennisguse.opentracks.content.CustomContentProvider.DatabaseHelper; +import de.dennisguse.opentracks.content.data.TrackPointsColumns; +import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.content.data.WaypointsColumns; /** * Tests {@link CustomContentProvider}. diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsTest.java index 885967283..546662d79 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsTest.java @@ -35,6 +35,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.TrackPointsColumns; +import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.content.data.Waypoint; +import de.dennisguse.opentracks.content.data.WaypointsColumns; import de.dennisguse.opentracks.stats.TripStatistics; import static org.mockito.Mockito.when; diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java index 86f3c5964..a2bc332cc 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java @@ -27,6 +27,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import de.dennisguse.opentracks.R; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.StringUtils; diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java index 6a7cf4212..3ef78252e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java @@ -36,6 +36,8 @@ import java.util.List; import de.dennisguse.opentracks.content.SearchEngine.ScoredResult; import de.dennisguse.opentracks.content.SearchEngine.SearchQuery; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.stats.TripStatistics; /** diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java index 2eb1878f2..e0d85daf9 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java @@ -33,10 +33,10 @@ import java.util.Locale; import java.util.SimpleTimeZone; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.TracksColumns; -import de.dennisguse.opentracks.content.Waypoint; -import de.dennisguse.opentracks.content.WaypointsColumns; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.content.data.Waypoint; +import de.dennisguse.opentracks.content.data.WaypointsColumns; import static org.mockito.Mockito.any; import static org.mockito.Mockito.eq; diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java index af0218de0..ec78c92ee 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java @@ -27,7 +27,7 @@ import org.mockito.junit.MockitoJUnitRunner; import java.io.ByteArrayInputStream; import java.io.InputStream; -import de.dennisguse.opentracks.content.Track; +import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.util.PreferencesUtils; import static org.mockito.Mockito.any; diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java index d6409e93e..1acd522ac 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java @@ -27,7 +27,7 @@ import org.mockito.junit.MockitoJUnitRunner; import java.io.ByteArrayInputStream; import java.io.InputStream; -import de.dennisguse.opentracks.content.Track; +import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.util.PreferencesUtils; import static org.mockito.Mockito.any; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java index 929f87a8e..12c8615a9 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java @@ -44,9 +44,9 @@ import java.util.concurrent.TimeoutException; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.CustomContentProvider; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; import de.dennisguse.opentracks.content.WaypointCreationRequest; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.PreferencesUtils; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java index fb19955f1..30153d435 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java @@ -27,8 +27,8 @@ import java.util.concurrent.TimeoutException; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.CustomContentProvider; -import de.dennisguse.opentracks.content.Track; import de.dennisguse.opentracks.content.WaypointCreationRequest; +import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.PreferencesUtils; diff --git a/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java index f4874700e..599146128 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller; import de.dennisguse.opentracks.fragments.MarkerDetailFragment; diff --git a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java index f44687685..49dfec3ba 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java @@ -26,8 +26,8 @@ import android.widget.Button; import android.widget.EditText; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Waypoint; import de.dennisguse.opentracks.content.WaypointCreationRequest; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; /** diff --git a/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java index ee0d6bd74..b39a82852 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java @@ -38,8 +38,8 @@ import androidx.loader.content.CursorLoader; import androidx.loader.content.Loader; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.WaypointsColumns; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.WaypointsColumns; import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment; import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller; import de.dennisguse.opentracks.util.ActivityUtils; diff --git a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java index 486071430..9ea8f6354 100644 --- a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java @@ -44,8 +44,8 @@ import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.SearchEngine; import de.dennisguse.opentracks.content.SearchEngine.ScoredResult; import de.dennisguse.opentracks.content.SearchEngine.SearchQuery; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment; import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment; import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller; diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java index bf519d8bb..002e08264 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java @@ -43,10 +43,10 @@ import androidx.viewpager.widget.ViewPager; import com.google.android.material.tabs.TabLayout; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; import de.dennisguse.opentracks.content.TrackDataHub; -import de.dennisguse.opentracks.content.Waypoint; import de.dennisguse.opentracks.content.WaypointCreationRequest; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.fragments.ChartDistanceFragment; import de.dennisguse.opentracks.fragments.ChartTimeFragment; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment; diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index 311f87935..a9eb77251 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -31,7 +31,7 @@ import android.widget.Spinner; import androidx.annotation.NonNull; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; +import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; import de.dennisguse.opentracks.util.TrackIconUtils; diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index a25453e46..c9ec6bb13 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -51,7 +51,7 @@ import androidx.loader.content.Loader; import java.util.Locale; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.TracksColumns; +import de.dennisguse.opentracks.content.data.TracksColumns; import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment; import de.dennisguse.opentracks.services.ITrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index f098dcda4..ecbbef10f 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -41,7 +41,7 @@ import java.util.List; import de.dennisguse.opentracks.MarkerDetailActivity; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.stats.ExtremityMonitor; import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.MarkerUtils; diff --git a/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java index 7b615e539..94b252723 100644 --- a/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java @@ -35,6 +35,11 @@ import java.util.NoSuchElementException; import de.dennisguse.opentracks.BuildConfig; import de.dennisguse.opentracks.android.ContentResolverWrapper; import de.dennisguse.opentracks.android.IContentResolver; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.TrackPointsColumns; +import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.content.data.Waypoint; +import de.dennisguse.opentracks.content.data.WaypointsColumns; import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.FileUtils; @@ -50,11 +55,6 @@ public class ContentProviderUtils { private static final String TAG = ContentProviderUtils.class.getSimpleName(); private static final int MAX_LATITUDE = 90000000; - /** - * Maximum number of waypoints that will be loaded at one time. - */ - public static int MAX_LOADED_WAYPOINTS_POINTS = 10000; - /** * The authority (the first part of the URI) for the app's content provider. */ @@ -63,7 +63,12 @@ public class ContentProviderUtils { /** * The base URI for the app's content provider. */ - static String CONTENT_BASE_URI = "content://" + AUTHORITY_PACKAGE; + public static String CONTENT_BASE_URI = "content://" + AUTHORITY_PACKAGE; + + /** + * Maximum number of waypoints that will be loaded at one time. + */ + public static int MAX_LOADED_WAYPOINTS_POINTS = 10000; private final IContentResolver contentResolver; private int defaultCursorBatchSize = 2000; diff --git a/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java b/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java index e670b990d..298b8e21d 100644 --- a/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java @@ -34,6 +34,10 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; +import de.dennisguse.opentracks.content.data.TrackPointsColumns; +import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.content.data.WaypointsColumns; + /** * A {@link ContentProvider} that handles access to track points, tracks, and waypoints tables. * diff --git a/src/main/java/de/dennisguse/opentracks/content/DataSourceManager.java b/src/main/java/de/dennisguse/opentracks/content/DataSourceManager.java index d6ef40a6b..ea1f1f4ca 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DataSourceManager.java +++ b/src/main/java/de/dennisguse/opentracks/content/DataSourceManager.java @@ -25,6 +25,10 @@ import android.util.Log; import java.util.EnumSet; import java.util.Set; +import de.dennisguse.opentracks.content.data.TrackPointsColumns; +import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.content.data.WaypointsColumns; + /** * Creates observers/listeners and manages their registration with {@link DataSource}. * The observers/listeners calls {@link DataSourceListener} when data changes. diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java index 14b673375..deaf02711 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java @@ -15,6 +15,7 @@ */ package de.dennisguse.opentracks.content; +import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.stats.TripStatistics; /** diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java index 24d88cae4..d57468f75 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java +++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java @@ -22,6 +22,7 @@ import android.util.Pair; import androidx.annotation.VisibleForTesting; import de.dennisguse.opentracks.R; +import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.StringUtils; import de.dennisguse.opentracks.util.UnitConversions; diff --git a/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java b/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java index a8ab01c03..422cce7c3 100644 --- a/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java +++ b/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java @@ -28,6 +28,10 @@ import java.util.Locale; import java.util.SortedSet; import java.util.TreeSet; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.content.data.Waypoint; +import de.dennisguse.opentracks.content.data.WaypointsColumns; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.LocationUtils; import de.dennisguse.opentracks.util.UnitConversions; diff --git a/src/main/java/de/dennisguse/opentracks/content/ShareContentProvider.java b/src/main/java/de/dennisguse/opentracks/content/ShareContentProvider.java index cc86b7a4f..7dbbf71d4 100644 --- a/src/main/java/de/dennisguse/opentracks/content/ShareContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/content/ShareContentProvider.java @@ -21,6 +21,8 @@ import java.io.IOException; import java.util.Arrays; import de.dennisguse.opentracks.android.IContentResolver; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.TracksColumns; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.io.file.exporter.TrackExporter; diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java index 661f9b964..2ffeaaeec 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java @@ -30,6 +30,8 @@ import java.util.EnumSet; import java.util.Set; import de.dennisguse.opentracks.R; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.util.LocationUtils; import de.dennisguse.opentracks.util.PreferencesUtils; diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java index 72a147599..0cb6358cc 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java +++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java @@ -18,6 +18,9 @@ package de.dennisguse.opentracks.content; import android.location.Location; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; + /** * Listener for track data changes. * diff --git a/src/main/java/de/dennisguse/opentracks/content/Track.java b/src/main/java/de/dennisguse/opentracks/content/data/Track.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/Track.java rename to src/main/java/de/dennisguse/opentracks/content/data/Track.java index 75d77f2af..c2fb000c0 100644 --- a/src/main/java/de/dennisguse/opentracks/content/Track.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/Track.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.content; +package de.dennisguse.opentracks.content.data; import android.location.Location; diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackPointsColumns.java b/src/main/java/de/dennisguse/opentracks/content/data/TrackPointsColumns.java similarity index 94% rename from src/main/java/de/dennisguse/opentracks/content/TrackPointsColumns.java rename to src/main/java/de/dennisguse/opentracks/content/data/TrackPointsColumns.java index 38b26a11c..9c16ce02f 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TrackPointsColumns.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/TrackPointsColumns.java @@ -14,11 +14,13 @@ * the License. */ -package de.dennisguse.opentracks.content; +package de.dennisguse.opentracks.content.data; import android.net.Uri; import android.provider.BaseColumns; +import de.dennisguse.opentracks.content.ContentProviderUtils; + /** * Constants for the track points table. * diff --git a/src/main/java/de/dennisguse/opentracks/content/TracksColumns.java b/src/main/java/de/dennisguse/opentracks/content/data/TracksColumns.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/content/TracksColumns.java rename to src/main/java/de/dennisguse/opentracks/content/data/TracksColumns.java index 7542aaf1a..173d795ac 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TracksColumns.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/TracksColumns.java @@ -14,11 +14,13 @@ * the License. */ -package de.dennisguse.opentracks.content; +package de.dennisguse.opentracks.content.data; import android.net.Uri; import android.provider.BaseColumns; +import de.dennisguse.opentracks.content.ContentProviderUtils; + /** * Constants for the tracks table. * diff --git a/src/main/java/de/dennisguse/opentracks/content/Waypoint.java b/src/main/java/de/dennisguse/opentracks/content/data/Waypoint.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/Waypoint.java rename to src/main/java/de/dennisguse/opentracks/content/data/Waypoint.java index b1384f3a3..199c94360 100644 --- a/src/main/java/de/dennisguse/opentracks/content/Waypoint.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/Waypoint.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.content; +package de.dennisguse.opentracks.content.data; import android.location.Location; import android.net.Uri; diff --git a/src/main/java/de/dennisguse/opentracks/content/WaypointsColumns.java b/src/main/java/de/dennisguse/opentracks/content/data/WaypointsColumns.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/content/WaypointsColumns.java rename to src/main/java/de/dennisguse/opentracks/content/data/WaypointsColumns.java index 54d5aa694..0e90987e3 100644 --- a/src/main/java/de/dennisguse/opentracks/content/WaypointsColumns.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/WaypointsColumns.java @@ -14,11 +14,13 @@ * the License. */ -package de.dennisguse.opentracks.content; +package de.dennisguse.opentracks.content.data; import android.net.Uri; import android.provider.BaseColumns; +import de.dennisguse.opentracks.content.ContentProviderUtils; + /** * Constants for waypoints table. * diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java index e71659ef1..4f0b631b6 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java @@ -37,11 +37,11 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackDetailActivity; import de.dennisguse.opentracks.chart.ChartView; import de.dennisguse.opentracks.content.SensorDataSetLocation; -import de.dennisguse.opentracks.content.Track; import de.dennisguse.opentracks.content.TrackDataHub; import de.dennisguse.opentracks.content.TrackDataListener; import de.dennisguse.opentracks.content.TrackDataType; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.stats.TripStatisticsUpdater; diff --git a/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java index 70d826423..5a9b7bb3d 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java @@ -41,7 +41,7 @@ import androidx.fragment.app.FragmentActivity; import de.dennisguse.opentracks.MarkerEditActivity; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.ListItemUtils; import de.dennisguse.opentracks.util.MarkerUtils; diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java index d546b9d04..cc4d61b7f 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java @@ -37,11 +37,11 @@ import java.util.EnumSet; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackDetailActivity; -import de.dennisguse.opentracks.content.Track; import de.dennisguse.opentracks.content.TrackDataHub; import de.dennisguse.opentracks.content.TrackDataListener; import de.dennisguse.opentracks.content.TrackDataType; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.services.ITrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java index 37def4417..da48a9001 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java @@ -6,7 +6,7 @@ import java.util.Locale; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; +import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.io.file.exporter.FileTrackExporter; import de.dennisguse.opentracks.io.file.exporter.GpxTrackWriter; import de.dennisguse.opentracks.io.file.exporter.KmlTrackWriter; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java index 97f302eac..3645ae0b9 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java @@ -28,8 +28,8 @@ import java.io.FileOutputStream; import java.io.IOException; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.TracksColumns; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.TracksColumns; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.util.FileUtils; import de.dennisguse.opentracks.util.PreferencesUtils; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java index 9ac91b231..c17731bf1 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java @@ -29,8 +29,8 @@ import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.LocationFactory; import de.dennisguse.opentracks.content.LocationIterator; import de.dennisguse.opentracks.content.SensorDataSetLocation; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.util.LocationUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GpxTrackWriter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GpxTrackWriter.java index f6761bc18..2f5cb6409 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GpxTrackWriter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GpxTrackWriter.java @@ -23,8 +23,8 @@ import java.io.PrintWriter; import java.text.NumberFormat; import java.util.Locale; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.util.StringUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java index 0120863b6..2d3479b84 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java @@ -30,8 +30,8 @@ import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.DescriptionGenerator; import de.dennisguse.opentracks.content.DescriptionGeneratorImpl; import de.dennisguse.opentracks.content.SensorDataSetLocation; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.util.StringUtils; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java index 2c5afde9d..6c92c3198 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java @@ -32,8 +32,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.util.FileUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackWriter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackWriter.java index c48cdbfe1..616e2dff2 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackWriter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackWriter.java @@ -19,8 +19,8 @@ import android.location.Location; import java.io.OutputStream; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; /** * Interface for writing tracks to a file. The expected sequence of calls is: diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java index 59d671b6f..7c20f00b7 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java @@ -41,8 +41,8 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.LocationFactory; import de.dennisguse.opentracks.content.LocationIterator; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.stats.TripStatisticsUpdater; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportAsyncTask.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportAsyncTask.java index f6fc1ace1..1b20a195f 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportAsyncTask.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportAsyncTask.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.List; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; +import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.util.FileUtils; import de.dennisguse.opentracks.util.PreferencesUtils; diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index e6f8dc06a..022df3c81 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -47,9 +47,9 @@ import de.dennisguse.opentracks.content.CustomContentProvider; import de.dennisguse.opentracks.content.LocationFactory; import de.dennisguse.opentracks.content.LocationIterator; import de.dennisguse.opentracks.content.SensorDataSetLocation; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; import de.dennisguse.opentracks.content.WaypointCreationRequest; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager; import de.dennisguse.opentracks.services.tasks.AnnouncementPeriodicTaskFactory; diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java index 24333e6ea..b4f339b2e 100644 --- a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java @@ -36,8 +36,8 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.DescriptionGeneratorImpl; import de.dennisguse.opentracks.content.ShareContentProvider; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.io.file.TrackFileFormat; /** diff --git a/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java b/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java index b94883ba7..72540c01a 100644 --- a/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Stack; -import de.dennisguse.opentracks.content.Track; +import de.dennisguse.opentracks.content.data.Track; /** * Utility class for decimating tracks at a given level of precision. diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java index 0ef43f099..5cb7a6535 100644 --- a/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java @@ -19,8 +19,8 @@ package de.dennisguse.opentracks.util; import android.content.Context; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.TracksColumns; +import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.TracksColumns; /** * Utilities for updating track.