From 0347877290c195ea7b0d0560a21c5f4996ddb778 Mon Sep 17 00:00:00 2001 From: FNelson Date: Thu, 5 Aug 2010 12:51:46 +0100 Subject: [PATCH] Tidy up to adhere to style guidlines --- MyTracks/AndroidManifest.xml | 10 +- .../mytracks/AggregatedStatsActivity.java | 137 +++++++++--------- .../android/apps/mytracks/MyTracks.java | 8 +- .../content/MyTracksProviderUtils.java | 20 +-- .../content/MyTracksProviderUtilsImpl.java | 22 +-- 5 files changed, 98 insertions(+), 99 deletions(-) diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index 12df9ae37..241ac239d 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -56,17 +56,17 @@ - + - + + android:label="@string/welcome"/> tracks = retrieveTracks(); - TripStatistics rollingStats = null; - if (!tracks.isEmpty()) { - rollingStats = new TripStatistics(tracks.iterator().next() - .getStatistics()); - for (int i = 1; i < tracks.size(); i++) { - rollingStats.merge(tracks.get(i).getStatistics()); - } - } - updateView(rollingStats); - } - - private List retrieveTracks() { - return tracksProvider.retrieveAllTracks(); - } - - private void updateView(TripStatistics aggStats) { - if (aggStats != null) { - utils.setAllStats(aggStats); - } - } + } + + /** + * 1. Reads tracks from the db 2. Merges the trip stats from the tracks 3. + * Updates the view + */ + private void loadAggregatedStats() { + List tracks = retrieveTracks(); + TripStatistics rollingStats = null; + if (!tracks.isEmpty()) { + rollingStats = new TripStatistics(tracks.iterator().next() + .getStatistics()); + for (int i = 1; i < tracks.size(); i++) { + rollingStats.merge(tracks.get(i).getStatistics()); + } + } + updateView(rollingStats); + } + + private List retrieveTracks() { + return tracksProvider.retrieveAllTracks(); + } + + private void updateView(TripStatistics aggStats) { + if (aggStats != null) { + utils.setAllStats(aggStats); + } + } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java index 9c973e97d..21ee9c6ec 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java @@ -70,8 +70,6 @@ import android.widget.RelativeLayout; import android.widget.TabHost; import android.widget.Toast; -import org.xml.sax.SAXException; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -80,6 +78,8 @@ import java.util.Random; import javax.xml.parsers.ParserConfigurationException; +import org.xml.sax.SAXException; + /** * The super activity that embeds our sub activities. * @@ -434,7 +434,7 @@ public class MyTracks extends TabActivity implements OnTouchListener, help = menu.add(0, MyTracksConstants.MENU_HELP, 10002, R.string.help); help.setIcon(android.R.drawable.ic_menu_info_details); aggregatedStats = menu.add(0, MyTracksConstants.MENU_AGGREGATED_STATS, - 10003, R.string.aggregated_stats); + 10003, R.string.aggregated_stats); return true; } @@ -492,7 +492,7 @@ public class MyTracks extends TabActivity implements OnTouchListener, return true; } case MyTracksConstants.MENU_AGGREGATED_STATS: { - Intent startIntent = new Intent(this, AggregatedStatsActivity.class); + Intent startIntent = new Intent(this, AggregatedStatsActivity.class); startActivity(startIntent); return true; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java index 34943c636..9d86ed21c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java @@ -15,13 +15,13 @@ */ package com.google.android.apps.mytracks.content; -import java.util.List; - import android.content.Context; import android.database.Cursor; import android.location.Location; import android.net.Uri; +import java.util.List; + /** * Utility to access data from the mytracks content provider. * @@ -186,14 +186,14 @@ public interface MyTracksProviderUtils { */ Track getTrack(long id); - /** - * Retrieves all tracks without track points. If no tracks exist an empty - * list will be returned. Use {@link #getTrackPoints(Track, int)} to load - * the track points. - * - * @return a list of all the recorded tracks - */ - List retrieveAllTracks(); + /** + * Retrieves all tracks without track points. If no tracks exist an empty + * list will be returned. Use {@link #getTrackPoints(Track, int)} to load + * the track points. + * + * @return a list of all the recorded tracks + */ + List retrieveAllTracks(); /** * Loads the track points for a given track. diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java index 525d0e018..8a8123b05 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java @@ -15,8 +15,7 @@ */ package com.google.android.apps.mytracks.content; -import java.util.LinkedList; -import java.util.List; +import com.google.android.apps.mytracks.stats.TripStatistics; import android.content.ContentValues; import android.content.Context; @@ -25,7 +24,8 @@ import android.location.Location; import android.net.Uri; import android.util.Log; -import com.google.android.apps.mytracks.stats.TripStatistics; +import java.util.LinkedList; +import java.util.List; /** * Helper class providing easy access to locations and tracks in the @@ -808,14 +808,14 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils { @Override public List retrieveAllTracks() { - List tracks = new LinkedList(); - Cursor cursor = getTracksCursor(null); - if (cursor != null && cursor.moveToFirst()) { - do { - tracks.add(createTrack(cursor)); - } while(cursor.moveToNext()); - } - return tracks; + List tracks = new LinkedList(); + Cursor cursor = getTracksCursor(null); + if (cursor != null && cursor.moveToFirst()) { + do { + tracks.add(createTrack(cursor)); + } while(cursor.moveToNext()); + } + return tracks; } @Override