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

Code cleanup: move export classes to its own package

Browse Source
This commit is contained in:
Jimmy Shih
2013-09-03 15:40:03 -07:00
parent 298d0ae75b
commit d11561f797
24 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/AndroidManifest.xml
+1 -1
View File
@@ -214,7 +214,7 @@ limitations under the License.
<activity android:name="com.google.android.apps.mytracks.io.backup.RestoreActivity" />
<activity android:name="com.google.android.apps.mytracks.io.backup.RestoreChooserActivity" />
<activity android:name="com.google.android.apps.mytracks.io.drive.SendDriveActivity" />
<activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity" />
<activity android:name="com.google.android.apps.mytracks.io.file.export.SaveActivity" />
<activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity" />
<activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity" />
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
+1 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+1 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+1 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java
+9 -3
View File
@@ -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.
MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractTrackExporter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/AbstractTrackExporter.java
+1 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriter.java
+2 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/FileTrackExporter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporter.java
+2 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/GpxTrackWriter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriter.java
+2 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriter.java
+2 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/KmzTrackExporter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmzTrackExporter.java
+1 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveActivity.java
+2 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/SaveAsyncTask.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveAsyncTask.java
+2 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/TcxTrackWriter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriter.java
+2 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporter.java
+1 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporterListener.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporterListener.java
+1 -1
View File
@@ -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.
MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackWriter.java
+1 -1
View File
@@ -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;
MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java
+1 -1
View File
@@ -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;
MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriterTest.java
+3 -1
View File
@@ -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;
/**
MyTracksTest/src/com/google/android/apps/mytracks/io/file/FileTrackExporterTest.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporterTest.java
+4 -1
View File
@@ -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;
MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxTrackWriterTest.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriterTest.java
+3 -1
View File
@@ -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;
MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriterTest.java
+2 -1
View File
@@ -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;
MyTracksTest/src/com/google/android/apps/mytracks/io/file/TcxTrackWriterTest.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriterTest.java
+2 -1
View File
@@ -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;
MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TrackWriterTest.java
+2 -1
View File
@@ -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;