Cleanup.

src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java

@@ -18,8 +18,8 @@ package de.dennisguse.opentracks;
 
 import android.location.Location;
 
-import de.dennisguse.opentracks.content.TrackPoint;
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 
 /**

src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java

@@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.TrackStubUtils;
 import de.dennisguse.opentracks.chart.ChartView;
-import de.dennisguse.opentracks.content.TrackPoint;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.util.UnitConversions;
 

src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java

@@ -36,6 +36,7 @@ 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.TrackPoint;
 import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.content.data.Waypoint;

src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java

@@ -60,11 +60,11 @@ public abstract class CustomContentProvider extends ContentProvider {
     public CustomContentProvider() {
         uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.TABLE_NAME, UrlType.TRACKPOINTS.ordinal());
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.TABLE_NAME + "/#", UrlType.TRACKPOINTS_ID.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TrackPointsColumns.TABLE_NAME + "/#", UrlType.TRACKPOINTS_BY_ID.ordinal());
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME, UrlType.TRACKS.ordinal());
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/#", UrlType.TRACKS_ID.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/#", UrlType.TRACKS_BY_ID.ordinal());
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.TABLE_NAME, UrlType.WAYPOINTS.ordinal());
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.TABLE_NAME + "/#", UrlType.WAYPOINTS_ID.ordinal());
+        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, WaypointsColumns.TABLE_NAME + "/#", UrlType.WAYPOINTS_BY_ID.ordinal());
     }
 
     @Override
@@ -132,15 +132,15 @@ public abstract class CustomContentProvider extends ContentProvider {
         switch (getUrlType(url)) {
             case TRACKPOINTS:
                 return TrackPointsColumns.CONTENT_TYPE;
-            case TRACKPOINTS_ID:
+            case TRACKPOINTS_BY_ID:
                 return TrackPointsColumns.CONTENT_ITEMTYPE;
             case TRACKS:
                 return TracksColumns.CONTENT_TYPE;
-            case TRACKS_ID:
+            case TRACKS_BY_ID:
                 return TracksColumns.CONTENT_ITEMTYPE;
             case WAYPOINTS:
                 return WaypointsColumns.CONTENT_TYPE;
-            case WAYPOINTS_ID:
+            case WAYPOINTS_BY_ID:
                 return WaypointsColumns.CONTENT_ITEMTYPE;
             default:
                 throw new IllegalArgumentException("Unknown URL " + url);
@@ -196,7 +196,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
                 sortOrder = sort != null ? sort : TrackPointsColumns.DEFAULT_SORT_ORDER;
                 break;
-            case TRACKPOINTS_ID:
+            case TRACKPOINTS_BY_ID:
                 queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
                 queryBuilder.appendWhere("_id=" + url.getPathSegments().get(1));
                 break;
@@ -204,7 +204,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 queryBuilder.setTables(TracksColumns.TABLE_NAME);
                 sortOrder = sort != null ? sort : TracksColumns.DEFAULT_SORT_ORDER;
                 break;
-            case TRACKS_ID:
+            case TRACKS_BY_ID:
                 queryBuilder.setTables(TracksColumns.TABLE_NAME);
                 queryBuilder.appendWhere("_id=" + url.getPathSegments().get(1));
                 break;
@@ -212,7 +212,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 queryBuilder.setTables(WaypointsColumns.TABLE_NAME);
                 sortOrder = sort != null ? sort : WaypointsColumns.DEFAULT_SORT_ORDER;
                 break;
-            case WAYPOINTS_ID:
+            case WAYPOINTS_BY_ID:
                 queryBuilder.setTables(WaypointsColumns.TABLE_NAME);
                 queryBuilder.appendWhere("_id=" + url.getPathSegments().get(1));
                 break;
@@ -233,7 +233,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 table = TrackPointsColumns.TABLE_NAME;
                 whereClause = where;
                 break;
-            case TRACKPOINTS_ID:
+            case TRACKPOINTS_BY_ID:
                 table = TrackPointsColumns.TABLE_NAME;
                 whereClause = TrackPointsColumns._ID + "=" + url.getPathSegments().get(1);
                 if (!TextUtils.isEmpty(where)) {
@@ -244,7 +244,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 table = TracksColumns.TABLE_NAME;
                 whereClause = where;
                 break;
-            case TRACKS_ID:
+            case TRACKS_BY_ID:
                 table = TracksColumns.TABLE_NAME;
                 whereClause = TracksColumns._ID + "=" + url.getPathSegments().get(1);
                 if (!TextUtils.isEmpty(where)) {
@@ -255,7 +255,7 @@ public abstract class CustomContentProvider extends ContentProvider {
                 table = WaypointsColumns.TABLE_NAME;
                 whereClause = where;
                 break;
-            case WAYPOINTS_ID:
+            case WAYPOINTS_BY_ID:
                 table = WaypointsColumns.TABLE_NAME;
                 whereClause = WaypointsColumns._ID + "=" + url.getPathSegments().get(1);
                 if (!TextUtils.isEmpty(where)) {
@@ -365,7 +365,11 @@ public abstract class CustomContentProvider extends ContentProvider {
      */
     @VisibleForTesting
     enum UrlType {
-        TRACKPOINTS, TRACKPOINTS_ID, TRACKS, TRACKS_ID, WAYPOINTS, WAYPOINTS_ID
+        TRACKPOINTS,
+        TRACKPOINTS_BY_ID,
+        TRACKS, TRACKS_BY_ID,
+        WAYPOINTS,
+        WAYPOINTS_BY_ID
     }
 
     /**

src/main/java/de/dennisguse/opentracks/content/LocationFactory.java

@@ -3,6 +3,8 @@ package de.dennisguse.opentracks.content;
 import android.location.Location;
 import android.location.LocationManager;
 
+import de.dennisguse.opentracks.content.data.TrackPoint;
+
 /**
  * Creates a new {@link TrackPoint}.
  * An implementation can create new instances or reuse existing instances for optimization.

src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package de.dennisguse.opentracks.content;
+package de.dennisguse.opentracks.content.data;
 
 import android.location.Location;
 

src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java

@@ -39,8 +39,8 @@ import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.TrackDataListener;
 import de.dennisguse.opentracks.content.TrackDataType;
-import de.dennisguse.opentracks.content.TrackPoint;
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.stats.TripStatistics;

src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java

@@ -28,8 +28,8 @@ import java.io.OutputStream;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.LocationFactory;
 import de.dennisguse.opentracks.content.LocationIterator;
-import de.dennisguse.opentracks.content.TrackPoint;
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.LocationUtils;
 

src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java

@@ -28,8 +28,8 @@ import java.util.List;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.DescriptionGenerator;
-import de.dennisguse.opentracks.content.TrackPoint;
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.util.StringUtils;

src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java

@@ -29,7 +29,7 @@ import org.xml.sax.SAXException;
 import java.util.ArrayList;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.TrackPoint;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.io.file.exporter.KmlTrackWriter;
 

src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java

@@ -46,8 +46,8 @@ import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.CustomContentProvider;
 import de.dennisguse.opentracks.content.LocationFactory;
 import de.dennisguse.opentracks.content.LocationIterator;
-import de.dennisguse.opentracks.content.TrackPoint;
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;