From 910068bcf5db0cb7c22e11fa6d4d816a3dd5b91b Mon Sep 17 00:00:00 2001 From: Matthew Simmons Date: Tue, 22 Mar 2011 19:43:15 -0400 Subject: [PATCH] Move file I/O classes into their own package --- .../google/android/apps/mytracks/ExportAllTracks.java | 6 +++--- .../google/android/apps/mytracks/ImportAllTracks.java | 2 +- .../src/com/google/android/apps/mytracks/MyTracks.java | 10 +++++----- .../apps/mytracks/io/{ => file}/CsvTrackWriter.java | 4 ++-- .../apps/mytracks/io/{ => file}/GpxImporter.java | 2 +- .../apps/mytracks/io/{ => file}/GpxTrackWriter.java | 4 ++-- .../apps/mytracks/io/{ => file}/KmlTrackWriter.java | 4 ++-- .../apps/mytracks/io/{ => file}/TcxTrackWriter.java | 6 +++--- .../apps/mytracks/io/{ => file}/TempFileCleaner.java | 2 +- .../apps/mytracks/io/{ => file}/TrackFormatWriter.java | 2 +- .../apps/mytracks/io/{ => file}/TrackWriter.java | 2 +- .../mytracks/io/{ => file}/TrackWriterFactory.java | 2 +- .../mytracks/io/{ => file}/CsvTrackWriterTest.java | 2 +- .../apps/mytracks/io/{ => file}/GpxImporterTest.java | 3 ++- .../mytracks/io/{ => file}/GpxTrackWriterTest.java | 5 ++++- .../mytracks/io/{ => file}/KmlTrackWriterTest.java | 3 ++- .../mytracks/io/{ => file}/TcxTrackWriterTest.java | 4 +++- .../mytracks/io/{ => file}/TempFileCleanerTest.java | 4 +++- .../mytracks/io/{ => file}/TrackFormatWriterTest.java | 3 ++- .../apps/mytracks/io/{ => file}/TrackWriterTest.java | 4 +++- 20 files changed, 43 insertions(+), 31 deletions(-) rename MyTracks/src/com/google/android/apps/mytracks/io/{ => file}/CsvTrackWriter.java (97%) rename MyTracks/src/com/google/android/apps/mytracks/io/{ => file}/GpxImporter.java (99%) rename MyTracks/src/com/google/android/apps/mytracks/io/{ => file}/GpxTrackWriter.java (97%) rename MyTracks/src/com/google/android/apps/mytracks/io/{ => file}/KmlTrackWriter.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/{ => file}/TcxTrackWriter.java (97%) rename MyTracks/src/com/google/android/apps/mytracks/io/{ => file}/TempFileCleaner.java (97%) rename MyTracks/src/com/google/android/apps/mytracks/io/{ => file}/TrackFormatWriter.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/{ => file}/TrackWriter.java (99%) rename MyTracks/src/com/google/android/apps/mytracks/io/{ => file}/TrackWriterFactory.java (98%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/{ => file}/CsvTrackWriterTest.java (79%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/{ => file}/GpxImporterTest.java (98%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/{ => file}/GpxTrackWriterTest.java (93%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/{ => file}/KmlTrackWriterTest.java (97%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/{ => file}/TcxTrackWriterTest.java (94%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/{ => file}/TempFileCleanerTest.java (96%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/{ => file}/TrackFormatWriterTest.java (98%) rename MyTracksTest/src/com/google/android/apps/mytracks/io/{ => file}/TrackWriterTest.java (98%) diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java index 8bad978c7..93f2e9aa5 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java @@ -17,9 +17,9 @@ package com.google.android.apps.mytracks; import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.TracksColumns; -import com.google.android.apps.mytracks.io.TrackWriter; -import com.google.android.apps.mytracks.io.TrackWriterFactory; -import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.TrackWriter; +import com.google.android.apps.mytracks.io.file.TrackWriterFactory; +import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat; 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/ImportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java index f64c372ab..8826e40c7 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java @@ -16,7 +16,7 @@ package com.google.android.apps.mytracks; import com.google.android.apps.mytracks.content.MyTracksProviderUtils; -import com.google.android.apps.mytracks.io.GpxImporter; +import com.google.android.apps.mytracks.io.file.GpxImporter; import com.google.android.apps.mytracks.util.FileUtils; 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/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java index 106e9429c..cfa4c85ef 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java @@ -27,15 +27,15 @@ import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.WaypointCreationRequest; import com.google.android.apps.mytracks.io.AuthManager; import com.google.android.apps.mytracks.io.AuthManagerFactory; -import com.google.android.apps.mytracks.io.GpxImporter; import com.google.android.apps.mytracks.io.SendToDocs; import com.google.android.apps.mytracks.io.SendToFusionTables; import com.google.android.apps.mytracks.io.SendToFusionTables.OnSendCompletedListener; import com.google.android.apps.mytracks.io.SendToMyMaps; -import com.google.android.apps.mytracks.io.TempFileCleaner; -import com.google.android.apps.mytracks.io.TrackWriter; -import com.google.android.apps.mytracks.io.TrackWriterFactory; -import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.GpxImporter; +import com.google.android.apps.mytracks.io.file.TempFileCleaner; +import com.google.android.apps.mytracks.io.file.TrackWriter; +import com.google.android.apps.mytracks.io.file.TrackWriterFactory; +import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat; import com.google.android.apps.mytracks.io.mymaps.MapsFacade; import com.google.android.apps.mytracks.io.mymaps.MyMapsConstants; import com.google.android.apps.mytracks.io.sendtogoogle.ResultDialogFactory; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/CsvTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java similarity index 97% rename from MyTracks/src/com/google/android/apps/mytracks/io/CsvTrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java index 4cfcdbe4f..0cf49dfe8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/CsvTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; -import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat; import android.location.Location; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxImporter.java similarity index 99% rename from MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/GpxImporter.java index 45586faa6..66afa09e1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxImporter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.content.MyTracksProviderUtils; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxTrackWriter.java similarity index 97% rename from MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/GpxTrackWriter.java index 86c27bf9e..88fde6c3c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxTrackWriter.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; -import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat; import com.google.android.apps.mytracks.util.StringUtils; import android.location.Location; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/KmlTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/KmlTrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java index 8ee29c1ee..2b6d980b6 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/KmlTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; -import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat; import com.google.android.apps.mytracks.util.StringUtils; import android.content.Context; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/TcxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TcxTrackWriter.java similarity index 97% rename from MyTracks/src/com/google/android/apps/mytracks/io/TcxTrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/TcxTrackWriter.java index 6cc76f68a..eaf45a7cc 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/TcxTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TcxTrackWriter.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; 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.TrackWriterFactory.TrackFileFormat; +import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat; import com.google.android.apps.mytracks.util.SystemUtils; import android.content.Context; @@ -246,7 +246,7 @@ public class TcxTrackWriter implements TrackFormatWriter { // signify that this build is newer than the one associated with the // version code given in VersionMajor. pw.println(""); - pw.format("%d\n", SystemUtils.getMyTracksVersion(context)); + pw.format("%s\n", SystemUtils.getMyTracksVersion(context)); pw.format("%d\n", SystemUtils.isRelease(context) ? 0 : 1); pw.println(""); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/TempFileCleaner.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TempFileCleaner.java similarity index 97% rename from MyTracks/src/com/google/android/apps/mytracks/io/TempFileCleaner.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/TempFileCleaner.java index 21621225d..6f590342b 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/TempFileCleaner.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TempFileCleaner.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import android.os.Environment; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/TrackFormatWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFormatWriter.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/TrackFormatWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFormatWriter.java index c5ac02514..11f93079c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/TrackFormatWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFormatWriter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; 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/TrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java similarity index 99% rename from MyTracks/src/com/google/android/apps/mytracks/io/TrackWriter.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java index 1d86498ed..e4ee0589c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/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; +package com.google.android.apps.mytracks.io.file; import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.content.MyTracksLocation; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriterFactory.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterFactory.java similarity index 98% rename from MyTracks/src/com/google/android/apps/mytracks/io/TrackWriterFactory.java rename to MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterFactory.java index 785454b0b..9a0692f88 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriterFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterFactory.java @@ -14,7 +14,7 @@ * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.Track; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/CsvTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java similarity index 79% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/CsvTrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java index fa0d70deb..9fd40ab05 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/CsvTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java @@ -1,6 +1,6 @@ // Copyright 2010 Google Inc. All Rights Reserved. -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; /** * Tests for the CSV track exporter. diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxImporterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxImporterTest.java similarity index 98% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/GpxImporterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxImporterTest.java index b819f5c2a..e676aae88 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxImporterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxImporterTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import static com.google.android.testing.mocking.AndroidMock.eq; import static com.google.android.testing.mocking.AndroidMock.expect; @@ -22,6 +22,7 @@ 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.content.MyTracksProviderUtils.Factory; +import com.google.android.apps.mytracks.io.file.GpxImporter; import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory; import com.google.android.testing.mocking.AndroidMock; import com.google.android.testing.mocking.UsesMocks; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java similarity index 93% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/GpxTrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java index 9601875cb..36c78a33c 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java @@ -1,5 +1,8 @@ // Copyright 2010 Google Inc. All Rights Reserved. -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; + +import com.google.android.apps.mytracks.io.file.GpxTrackWriter; +import com.google.android.apps.mytracks.io.file.TrackFormatWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/KmlTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java similarity index 97% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/KmlTrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java index e3e735f2d..1a3deee16 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/KmlTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java @@ -1,7 +1,8 @@ // Copyright 2010 Google Inc. All Rights Reserved. -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import com.google.android.apps.mytracks.content.Track; +import com.google.android.apps.mytracks.io.file.KmlTrackWriter; import com.google.android.apps.mytracks.util.StringUtils; import android.location.Location; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/TcxTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TcxTrackWriterTest.java similarity index 94% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/TcxTrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/TcxTrackWriterTest.java index e07f1ae55..380ca972f 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/TcxTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TcxTrackWriterTest.java @@ -1,8 +1,10 @@ // Copyright 2010 Google Inc. All Rights Reserved. -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import com.google.android.apps.mytracks.content.MyTracksLocation; import com.google.android.apps.mytracks.content.Sensor; +import com.google.android.apps.mytracks.io.file.TcxTrackWriter; +import com.google.android.apps.mytracks.io.file.TrackFormatWriter; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/TempFileCleanerTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TempFileCleanerTest.java similarity index 96% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/TempFileCleanerTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/TempFileCleanerTest.java index 25d600cbe..cea67b571 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/TempFileCleanerTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TempFileCleanerTest.java @@ -13,9 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import static com.google.android.testing.mocking.AndroidMock.expect; + +import com.google.android.apps.mytracks.io.file.TempFileCleaner; import com.google.android.testing.mocking.AndroidMock; import com.google.android.testing.mocking.UsesMocks; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/TrackFormatWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java similarity index 98% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/TrackFormatWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java index a4827fecd..8c265bc26 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/TrackFormatWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java @@ -1,10 +1,11 @@ // Copyright 2010 Google Inc. All Rights Reserved. -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; 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.TrackFormatWriter; import android.test.AndroidTestCase; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/TrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java similarity index 98% rename from MyTracksTest/src/com/google/android/apps/mytracks/io/TrackWriterTest.java rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java index c80013a68..c623d9a78 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/TrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java @@ -1,6 +1,6 @@ // Copyright 2010 Google Inc. All Rights Reserved. -package com.google.android.apps.mytracks.io; +package com.google.android.apps.mytracks.io.file; import static org.easymock.EasyMock.expect; @@ -9,6 +9,8 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory; +import com.google.android.apps.mytracks.io.file.TrackFormatWriter; +import com.google.android.apps.mytracks.io.file.TrackWriter; import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext; import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory;