From 5a14ef080cc7160d38a60e491f67bf867f284657 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Wed, 29 May 2013 14:08:14 -0700 Subject: [PATCH] Remove SELECTED_TRACK type from TrackDataHub. --- .../mytracks/content/DataSourceManager.java | 6 ------ .../apps/mytracks/content/TrackDataHub.java | 20 ------------------- .../mytracks/content/TrackDataListener.java | 11 ---------- .../apps/mytracks/content/TrackDataType.java | 1 - .../mytracks/fragments/ChartFragment.java | 5 ----- .../fragments/MyTracksMapFragment.java | 7 +------ .../mytracks/fragments/StatsFragment.java | 5 ----- .../mytracks/content/TrackDataHubTest.java | 17 ---------------- 8 files changed, 1 insertion(+), 71 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/DataSourceManager.java b/MyTracks/src/com/google/android/apps/mytracks/content/DataSourceManager.java index 01e929569..3c5c7018c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/DataSourceManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/DataSourceManager.java @@ -172,9 +172,6 @@ public class DataSourceManager { */ private void registerListener(TrackDataType trackDataType) { switch (trackDataType) { - case SELECTED_TRACK: - // Do nothing - break; case TRACKS_TABLE: dataSource.registerContentObserver(TracksColumns.CONTENT_URI, tracksTableObserver); break; @@ -203,9 +200,6 @@ public class DataSourceManager { */ private void unregisterListener(TrackDataType trackDataType) { switch (trackDataType) { - case SELECTED_TRACK: - // Do nothing - break; case TRACKS_TABLE: dataSource.unregisterContentObserver(tracksTableObserver); break; diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java index 344b09e19..8ba075d6a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java @@ -342,7 +342,6 @@ public class TrackDataHub implements DataSourceListener { trackDataListener.onMinRecordingDistanceChanged(minRecordingDistance); } - notifySelectedTrackChanged(trackDataManager.getListeners(TrackDataType.SELECTED_TRACK)); notifyTracksTableUpdate(trackDataManager.getListeners(TrackDataType.TRACKS_TABLE)); for (TrackDataListener listener : @@ -371,10 +370,6 @@ public class TrackDataHub implements DataSourceListener { trackDataListener.onMinRecordingDistanceChanged(minRecordingDistance); } - if (trackDataTypes.contains(TrackDataType.SELECTED_TRACK)) { - notifySelectedTrackChanged(trackDataListeners); - } - if (trackDataTypes.contains(TrackDataType.TRACKS_TABLE)) { notifyTracksTableUpdate(trackDataListeners); } @@ -398,21 +393,6 @@ public class TrackDataHub implements DataSourceListener { } } - /** - * Notifies selected track changed. To be run in the {@link #handler} thread. - * - * @param trackDataListeners the track data listeners to notify - */ - private void notifySelectedTrackChanged(Set trackDataListeners) { - if (trackDataListeners.isEmpty()) { - return; - } - Track track = myTracksProviderUtils.getTrack(selectedTrackId); - for (TrackDataListener trackDataListener : trackDataListeners) { - trackDataListener.onSelectedTrackChanged(track); - } - } - /** * Notifies track table update. To be run in the {@link #handler} thread. * diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataListener.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataListener.java index 247960f2c..5f78c5087 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataListener.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataListener.java @@ -34,17 +34,6 @@ public interface TrackDataListener { DISABLED, NO_FIX, BAD_FIX, GOOD_FIX; } - /** - * Called when the selected track changes. This will be followed by calls to - * data methods such as {@link #onTrackUpdated(Track)}, - * {@link #clearTrackPoints()}, {@link #onSampledInTrackPoint(Location)}, - * etc., even if no track is currently selected (in which case you'll only get - * calls to clear the current data). - * - * @param track the selected track or null if no track is selected - */ - public void onSelectedTrackChanged(Track track); - /** * Called when the track or its statistics has been updated. * diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataType.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataType.java index d26fb358e..0ae05337d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataType.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataType.java @@ -22,7 +22,6 @@ package com.google.android.apps.mytracks.content; * @author Jimmy Shih */ public enum TrackDataType { - SELECTED_TRACK, // selected track changes TRACKS_TABLE, // tracks table changes WAYPOINTS_TABLE, // waypoints table changes SAMPLED_IN_TRACK_POINTS_TABLE, // sampled-in track points table changes diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java index 05ed62803..527f505a3 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java @@ -155,11 +155,6 @@ public class ChartFragment extends Fragment implements TrackDataListener { layout.removeView(chartView); } - @Override - public void onSelectedTrackChanged(Track track) { - // We don't care. - } - @Override public void onTrackUpdated(Track track) { if (isResumed()) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MyTracksMapFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MyTracksMapFragment.java index 60c557911..0f6109429 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MyTracksMapFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MyTracksMapFragment.java @@ -375,12 +375,7 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData } return true; } - - @Override - public void onSelectedTrackChanged(final Track track) { - // We don't care. - } - + @Override public void onTrackUpdated(Track track) { currentTrack = track; diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java index 17d36d014..86e2dc720 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java @@ -100,11 +100,6 @@ public class StatsFragment extends Fragment implements TrackDataListener { handler.removeCallbacks(updateTotalTime); } - @Override - public void onSelectedTrackChanged(Track track) { - // We don't care. - } - @Override public void onTrackUpdated(final Track track) { if (isResumed()) { diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java index f65bf7453..7965b6ffb 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java @@ -712,23 +712,6 @@ public class TrackDataHubTest extends AndroidTestCase { } } - /** - * Tests the method {@link TrackDataHub#start()}. - */ - public void testRegisterSelectedTrackListener() { - dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); - Track track = TrackStubUtils.createTrack(1); - expect(myTracksProviderUtils.getTrack(capture(new Capture()))).andReturn(track); - // Make the track id is unique. - PreferencesUtils.setLong(context, R.string.recording_track_id_key, System.currentTimeMillis()); - trackDataListener1.onSelectedTrackChanged(track); - replay(); - trackDataHub.start(); - trackDataHub.registerTrackDataListener( - trackDataListener1, EnumSet.of(TrackDataType.SELECTED_TRACK)); - verifyAndReset(); - } - /** * Tests the method {@link TrackDataHub#start()}. */