From d11561f797e05bdeb67b257d4db030ec4d1085b2 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Tue, 3 Sep 2013 15:40:03 -0700 Subject: [PATCH] Code cleanup: move export classes to its own package --- MyTracks/AndroidManifest.xml | 2 +- .../apps/mytracks/AbstractSendToGoogleActivity.java | 2 +- .../android/apps/mytracks/TrackDetailActivity.java | 2 +- .../android/apps/mytracks/TrackListActivity.java | 2 +- .../apps/mytracks/io/file/TrackFileFormat.java | 12 +++++++++--- .../io/file/{ => export}/AbstractTrackExporter.java | 2 +- .../io/file/{ => export}/CsvTrackWriter.java | 3 ++- .../io/file/{ => export}/FileTrackExporter.java | 3 ++- .../io/file/{ => export}/GpxTrackWriter.java | 3 ++- .../io/file/{ => export}/KmlTrackWriter.java | 3 ++- .../io/file/{ => export}/KmzTrackExporter.java | 2 +- .../mytracks/io/file/{ => export}/SaveActivity.java | 3 ++- .../mytracks/io/file/{ => export}/SaveAsyncTask.java | 3 ++- .../io/file/{ => export}/TcxTrackWriter.java | 3 ++- .../mytracks/io/file/{ => export}/TrackExporter.java | 2 +- .../io/file/{ => export}/TrackExporterListener.java | 2 +- .../mytracks/io/file/{ => export}/TrackWriter.java | 2 +- .../android/apps/mytracks/io/sync/SyncUtils.java | 2 +- .../io/file/{ => export}/CsvTrackWriterTest.java | 4 +++- .../io/file/{ => export}/FileTrackExporterTest.java | 5 ++++- .../io/file/{ => export}/GpxTrackWriterTest.java | 4 +++- .../io/file/{ => export}/KmlTrackWriterTest.java | 3 ++- .../io/file/{ => export}/TcxTrackWriterTest.java | 3 ++- .../io/file/{ => export}/TrackWriterTest.java | 3 ++- 24 files changed, 49 insertions(+), 26 deletions(-) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/AbstractTrackExporter.java (96%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/CsvTrackWriter.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/FileTrackExporter.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/GpxTrackWriter.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/KmlTrackWriter.java (99%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/KmzTrackExporter.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/SaveActivity.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/SaveAsyncTask.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/TcxTrackWriter.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/TrackExporter.java (94%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/TrackExporterListener.java (94%) rename MyTracks/src/com/google/android/apps/mytracks/io/file/{ => export}/TrackWriter.java (98%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/file/{ => export}/CsvTrackWriterTest.java (96%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/file/{ => export}/FileTrackExporterTest.java (97%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/file/{ => export}/GpxTrackWriterTest.java (96%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/file/{ => export}/KmlTrackWriterTest.java (97%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/file/{ => export}/TcxTrackWriterTest.java (96%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/file/{ => export}/TrackWriterTest.java (98%) diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index 902073628..92f70d73f 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -214,7 +214,7 @@ limitations under the License. - + diff --git a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java index d75c93e59..3ba648619 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java @@ -30,8 +30,8 @@ import com.google.android.apps.mytracks.fragments.InstallEarthDialogFragment; import com.google.android.apps.mytracks.fragments.ShareTrackDialogFragment; import com.google.android.apps.mytracks.fragments.ShareTrackDialogFragment.ShareTrackCaller; import com.google.android.apps.mytracks.io.drive.SendDriveActivity; -import com.google.android.apps.mytracks.io.file.SaveActivity; import com.google.android.apps.mytracks.io.file.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.export.SaveActivity; import com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity; import com.google.android.apps.mytracks.io.gdata.maps.MapsConstants; import com.google.android.apps.mytracks.io.maps.SendMapsActivity; diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java index 0218afa42..680f087e3 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -30,8 +30,8 @@ import com.google.android.apps.mytracks.fragments.ExportDialogFragment.ExportTyp import com.google.android.apps.mytracks.fragments.FrequencyDialogFragment; import com.google.android.apps.mytracks.fragments.MyTracksMapFragment; import com.google.android.apps.mytracks.fragments.StatsFragment; -import com.google.android.apps.mytracks.io.file.SaveActivity; import com.google.android.apps.mytracks.io.file.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.export.SaveActivity; import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest; import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection; import com.google.android.apps.mytracks.settings.SettingsActivity; diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java index b0aba0b1a..177969fc7 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java @@ -27,8 +27,8 @@ import com.google.android.apps.mytracks.fragments.EulaDialogFragment.EulaCaller; import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment; import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment.FileTypeCaller; import com.google.android.apps.mytracks.io.file.ImportActivity; -import com.google.android.apps.mytracks.io.file.SaveActivity; import com.google.android.apps.mytracks.io.file.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.export.SaveActivity; import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest; import com.google.android.apps.mytracks.io.sync.SyncUtils; import com.google.android.apps.mytracks.services.ITrackRecordingService; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java index 6b5c2c311..74ac72955 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java @@ -1,5 +1,11 @@ package com.google.android.apps.mytracks.io.file; +import com.google.android.apps.mytracks.io.file.export.CsvTrackWriter; +import com.google.android.apps.mytracks.io.file.export.GpxTrackWriter; +import com.google.android.apps.mytracks.io.file.export.KmlTrackWriter; +import com.google.android.apps.mytracks.io.file.export.TcxTrackWriter; +import com.google.android.apps.mytracks.io.file.export.TrackWriter; + import android.content.Context; import android.os.Parcel; import android.os.Parcelable; @@ -12,13 +18,13 @@ import java.util.Locale; public enum TrackFileFormat implements Parcelable { KML { @Override - TrackWriter newTrackWriter(Context context, boolean inZip) { + public TrackWriter newTrackWriter(Context context, boolean inZip) { return new KmlTrackWriter(context, inZip); } }, GPX { @Override - TrackWriter newTrackWriter(Context context, boolean inZip) { + public TrackWriter newTrackWriter(Context context, boolean inZip) { return new GpxTrackWriter(context); } }, @@ -60,7 +66,7 @@ public enum TrackFileFormat implements Parcelable { /** * Creates a new track writer for the format. */ - abstract TrackWriter newTrackWriter(Context context, boolean inZip); + public abstract TrackWriter newTrackWriter(Context context, boolean inZip); /** * Returns the mime type for each format. diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractTrackExporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/AbstractTrackExporter.java similarity index 96% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractTrackExporter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/AbstractTrackExporter.java index 47c2c1129..6cd9692c7 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractTrackExporter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/AbstractTrackExporter.java @@ -14,7 +14,7 @@ * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import android.util.Log; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriter.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriter.java index 6e158c66a..860ee9a86 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.MyTracksLocation; import com.google.android.apps.mytracks.content.Sensor; @@ -21,6 +21,7 @@ import com.google.android.apps.mytracks.content.Sensor.SensorData; import com.google.android.apps.mytracks.content.Sensor.SensorDataSet; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; +import com.google.android.apps.mytracks.io.file.TrackFileFormat; import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.maps.mytracks.R; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/FileTrackExporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporter.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/FileTrackExporter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporter.java index 0349d0797..d6e577714 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/FileTrackExporter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporter.java @@ -14,7 +14,7 @@ * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.content.MyTracksLocation; @@ -22,6 +22,7 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; +import com.google.android.apps.mytracks.io.file.TrackFileFormat; import com.google.android.apps.mytracks.util.LocationUtils; import com.google.common.annotations.VisibleForTesting; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriter.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/GpxTrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriter.java index cfbcc4ef9..40fc5c0f8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriter.java @@ -14,10 +14,11 @@ * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; +import com.google.android.apps.mytracks.io.file.TrackFileFormat; import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.maps.mytracks.R; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriter.java similarity index 99% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriter.java index 37aaaa965..c9086a4a4 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.DescriptionGenerator; import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl; @@ -25,6 +25,7 @@ import com.google.android.apps.mytracks.content.Sensor.SensorDataSet; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; import com.google.android.apps.mytracks.content.Waypoint.WaypointType; +import com.google.android.apps.mytracks.io.file.TrackFileFormat; import com.google.android.apps.mytracks.util.GoogleEarthUtils; import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.maps.mytracks.R; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmzTrackExporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmzTrackExporter.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/KmzTrackExporter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmzTrackExporter.java index f597e64d0..99bdf6f17 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmzTrackExporter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmzTrackExporter.java @@ -14,7 +14,7 @@ * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.Track; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveActivity.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveActivity.java index 497a61b4c..a8658951d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveActivity.java @@ -14,8 +14,9 @@ * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; +import com.google.android.apps.mytracks.io.file.TrackFileFormat; import com.google.android.apps.mytracks.util.DialogUtils; import com.google.android.apps.mytracks.util.FileUtils; import com.google.android.apps.mytracks.util.GoogleEarthUtils; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveAsyncTask.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/SaveAsyncTask.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveAsyncTask.java index 0907300aa..708b18ac2 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveAsyncTask.java @@ -14,11 +14,12 @@ * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.TracksColumns; +import com.google.android.apps.mytracks.io.file.TrackFileFormat; import com.google.android.apps.mytracks.util.FileUtils; import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.apps.mytracks.util.SystemUtils; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TcxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriter.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/TcxTrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriter.java index fea0f06cf..6f6a7b74d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TcxTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriter.java @@ -13,13 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.MyTracksLocation; import com.google.android.apps.mytracks.content.Sensor; import com.google.android.apps.mytracks.content.Sensor.SensorDataSet; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; +import com.google.android.apps.mytracks.io.file.TrackFileFormat; import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.apps.mytracks.util.SystemUtils; import com.google.android.maps.mytracks.R; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporter.java similarity index 94% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporter.java index 48bd0b93d..6b6c6156f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporter.java @@ -14,7 +14,7 @@ * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import java.io.OutputStream; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporterListener.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporterListener.java similarity index 94% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporterListener.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporterListener.java index 8346590b2..984ad4aeb 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporterListener.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporterListener.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; /** * Listener for {@link TrackExporter} progress. diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackWriter.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackWriter.java index 15043cb8a..cf98cb761 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackWriter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java b/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java index 1c64a857d..d7dd5e82f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java @@ -20,8 +20,8 @@ import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.TracksColumns; -import com.google.android.apps.mytracks.io.file.FileTrackExporter; import com.google.android.apps.mytracks.io.file.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.export.FileTrackExporter; import com.google.android.apps.mytracks.util.FileUtils; import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.maps.mytracks.R; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriterTest.java similarity index 96% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriterTest.java index 71da28700..6e675068a 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriterTest.java @@ -13,7 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; + +import com.google.android.apps.mytracks.io.file.export.CsvTrackWriter; /** diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/FileTrackExporterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporterTest.java similarity index 97% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/FileTrackExporterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporterTest.java index 7b349d09c..54cf6e378 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/FileTrackExporterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporterTest.java @@ -1,12 +1,15 @@ // Copyright 2010 Google Inc. All Rights Reserved. -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.MyTracksProvider; import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; +import com.google.android.apps.mytracks.io.file.export.FileTrackExporter; +import com.google.android.apps.mytracks.io.file.export.TrackExporterListener; +import com.google.android.apps.mytracks.io.file.export.TrackWriter; import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext; import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriterTest.java similarity index 96% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriterTest.java index 90cff9bef..8b85ca5d9 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriterTest.java @@ -13,7 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; + +import com.google.android.apps.mytracks.io.file.export.GpxTrackWriter; import java.util.List; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriterTest.java similarity index 97% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriterTest.java index 71ddf8eae..bfe2019a6 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriterTest.java @@ -13,10 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.DescriptionGenerator; import com.google.android.apps.mytracks.content.Track; +import com.google.android.apps.mytracks.io.file.export.KmlTrackWriter; import com.google.android.apps.mytracks.stats.TripStatistics; import android.location.Location; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TcxTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriterTest.java similarity index 96% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/TcxTrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriterTest.java index 6b68de7e9..df306e8c4 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TcxTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriterTest.java @@ -13,10 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.MyTracksLocation; import com.google.android.apps.mytracks.content.Sensor; +import com.google.android.apps.mytracks.io.file.export.TcxTrackWriter; import com.google.android.apps.mytracks.util.StringUtils; import java.util.List; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TrackWriterTest.java similarity index 98% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TrackWriterTest.java index a9b4be12f..eb3b53ce0 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TrackWriterTest.java @@ -1,10 +1,11 @@ // Copyright 2010 Google Inc. All Rights Reserved. -package com.google.android.apps.mytracks.io.file; +package com.google.android.apps.mytracks.io.file.export; import com.google.android.apps.mytracks.content.MyTracksLocation; import com.google.android.apps.mytracks.content.Sensor; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; +import com.google.android.apps.mytracks.io.file.export.TrackWriter; import android.test.AndroidTestCase;