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

Codecleanup: move importers to its own package

Browse Source
This commit is contained in:
Jimmy Shih
2013-09-05 13:55:30 -07:00
parent 9ced32f2df
commit d9bb4fa024
14 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/AndroidManifest.xml
+1 -1
View File
@@ -160,7 +160,7 @@ limitations under the License.
<activity
android:label="@string/menu_help"
android:name="com.google.android.apps.mytracks.HelpActivity" />
<activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity" >
<activity android:name="com.google.android.apps.mytracks.io.file.importer.ImportActivity" >
<intent-filter>
<action android:name="android.intent.action.ATTACH_DATA" />
<action android:name="android.intent.action.VIEW" />
MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+1 -1
View File
@@ -26,9 +26,9 @@ import com.google.android.apps.mytracks.fragments.EulaDialogFragment;
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.TrackFileFormat;
import com.google.android.apps.mytracks.io.file.export.SaveActivity;
import com.google.android.apps.mytracks.io.file.importer.ImportActivity;
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/AbstractFileTrackImporter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.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.importer;
import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
MyTracks/src/com/google/android/apps/mytracks/io/file/GpxFileTrackImporter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.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.importer;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java → MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
+2 -1
View File
@@ -14,9 +14,10 @@
* the License.
*/
package com.google.android.apps.mytracks.io.file;
package com.google.android.apps.mytracks.io.file.importer;
import com.google.android.apps.mytracks.TrackDetailActivity;
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.IntentUtils;
MyTracks/src/com/google/android/apps/mytracks/io/file/ImportAsyncTask.java → MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.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.importer;
import com.google.android.apps.mytracks.io.file.TrackFileFormat;
import com.google.android.apps.mytracks.io.file.export.KmzTrackExporter;
import com.google.android.apps.mytracks.util.FileUtils;
import com.google.android.apps.mytracks.util.PreferencesUtils;
MyTracks/src/com/google/android/apps/mytracks/io/file/KmlFileTrackImporter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.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.importer;
import com.google.android.apps.mytracks.content.MyTracksLocation;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
MyTracks/src/com/google/android/apps/mytracks/io/file/KmzTrackImporter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.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.importer;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.io.file.export.KmzTrackExporter;
MyTracks/src/com/google/android/apps/mytracks/io/file/TrackImporter.java → MyTracks/src/com/google/android/apps/mytracks/io/file/importer/TrackImporter.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.importer;
import java.io.InputStream;
MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncAdapter.java
+1 -1
View File
@@ -18,7 +18,7 @@ package com.google.android.apps.mytracks.io.sync;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.io.file.KmlFileTrackImporter;
import com.google.android.apps.mytracks.io.file.importer.KmlFileTrackImporter;
import com.google.android.apps.mytracks.io.sendtogoogle.SendToGoogleUtils;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.gms.auth.GoogleAuthException;
MyTracksTest/src/com/google/android/apps/mytracks/io/file/AbstractTestFileTrackImporter.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.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.importer;
import static com.google.android.testing.mocking.AndroidMock.eq;
import static com.google.android.testing.mocking.AndroidMock.expect;
MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxFileTrackImporterTest.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java
+2 -1
View File
@@ -14,12 +14,13 @@
* the License.
*/
package com.google.android.apps.mytracks.io.file;
package com.google.android.apps.mytracks.io.file.importer;
import static com.google.android.testing.mocking.AndroidMock.eq;
import static com.google.android.testing.mocking.AndroidMock.expect;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.io.file.importer.GpxFileTrackImporter;
import com.google.android.testing.mocking.AndroidMock;
import android.location.Location;
MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlFileTrackImporterTest.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java
+2 -1
View File
@@ -14,12 +14,13 @@
* the License.
*/
package com.google.android.apps.mytracks.io.file;
package com.google.android.apps.mytracks.io.file.importer;
import static com.google.android.testing.mocking.AndroidMock.eq;
import static com.google.android.testing.mocking.AndroidMock.expect;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.io.file.importer.KmlFileTrackImporter;
import com.google.android.testing.mocking.AndroidMock;
import android.location.Location;
MyTracksTest/src/com/google/android/apps/mytracks/io/file/LocationsMatcher.java → MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.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.importer;
import com.google.android.testing.mocking.AndroidMock;