Remove SELECTED_TRACK type from TrackDataHub.

This commit is contained in:
Jimmy Shih
2013-05-29 14:08:14 -07:00
parent 53bde78293
commit 5a14ef080c
8 changed files with 1 additions and 71 deletions
@@ -172,9 +172,6 @@ public class DataSourceManager {
*/ */
private void registerListener(TrackDataType trackDataType) { private void registerListener(TrackDataType trackDataType) {
switch (trackDataType) { switch (trackDataType) {
case SELECTED_TRACK:
// Do nothing
break;
case TRACKS_TABLE: case TRACKS_TABLE:
dataSource.registerContentObserver(TracksColumns.CONTENT_URI, tracksTableObserver); dataSource.registerContentObserver(TracksColumns.CONTENT_URI, tracksTableObserver);
break; break;
@@ -203,9 +200,6 @@ public class DataSourceManager {
*/ */
private void unregisterListener(TrackDataType trackDataType) { private void unregisterListener(TrackDataType trackDataType) {
switch (trackDataType) { switch (trackDataType) {
case SELECTED_TRACK:
// Do nothing
break;
case TRACKS_TABLE: case TRACKS_TABLE:
dataSource.unregisterContentObserver(tracksTableObserver); dataSource.unregisterContentObserver(tracksTableObserver);
break; break;
@@ -342,7 +342,6 @@ public class TrackDataHub implements DataSourceListener {
trackDataListener.onMinRecordingDistanceChanged(minRecordingDistance); trackDataListener.onMinRecordingDistanceChanged(minRecordingDistance);
} }
notifySelectedTrackChanged(trackDataManager.getListeners(TrackDataType.SELECTED_TRACK));
notifyTracksTableUpdate(trackDataManager.getListeners(TrackDataType.TRACKS_TABLE)); notifyTracksTableUpdate(trackDataManager.getListeners(TrackDataType.TRACKS_TABLE));
for (TrackDataListener listener : for (TrackDataListener listener :
@@ -371,10 +370,6 @@ public class TrackDataHub implements DataSourceListener {
trackDataListener.onMinRecordingDistanceChanged(minRecordingDistance); trackDataListener.onMinRecordingDistanceChanged(minRecordingDistance);
} }
if (trackDataTypes.contains(TrackDataType.SELECTED_TRACK)) {
notifySelectedTrackChanged(trackDataListeners);
}
if (trackDataTypes.contains(TrackDataType.TRACKS_TABLE)) { if (trackDataTypes.contains(TrackDataType.TRACKS_TABLE)) {
notifyTracksTableUpdate(trackDataListeners); 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<TrackDataListener> 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. * Notifies track table update. To be run in the {@link #handler} thread.
* *
@@ -34,17 +34,6 @@ public interface TrackDataListener {
DISABLED, NO_FIX, BAD_FIX, GOOD_FIX; 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. * Called when the track or its statistics has been updated.
* *
@@ -22,7 +22,6 @@ package com.google.android.apps.mytracks.content;
* @author Jimmy Shih * @author Jimmy Shih
*/ */
public enum TrackDataType { public enum TrackDataType {
SELECTED_TRACK, // selected track changes
TRACKS_TABLE, // tracks table changes TRACKS_TABLE, // tracks table changes
WAYPOINTS_TABLE, // waypoints table changes WAYPOINTS_TABLE, // waypoints table changes
SAMPLED_IN_TRACK_POINTS_TABLE, // sampled-in track points table changes SAMPLED_IN_TRACK_POINTS_TABLE, // sampled-in track points table changes
@@ -155,11 +155,6 @@ public class ChartFragment extends Fragment implements TrackDataListener {
layout.removeView(chartView); layout.removeView(chartView);
} }
@Override
public void onSelectedTrackChanged(Track track) {
// We don't care.
}
@Override @Override
public void onTrackUpdated(Track track) { public void onTrackUpdated(Track track) {
if (isResumed()) { if (isResumed()) {
@@ -376,11 +376,6 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData
return true; return true;
} }
@Override
public void onSelectedTrackChanged(final Track track) {
// We don't care.
}
@Override @Override
public void onTrackUpdated(Track track) { public void onTrackUpdated(Track track) {
currentTrack = track; currentTrack = track;
@@ -100,11 +100,6 @@ public class StatsFragment extends Fragment implements TrackDataListener {
handler.removeCallbacks(updateTotalTime); handler.removeCallbacks(updateTotalTime);
} }
@Override
public void onSelectedTrackChanged(Track track) {
// We don't care.
}
@Override @Override
public void onTrackUpdated(final Track track) { public void onTrackUpdated(final Track track) {
if (isResumed()) { if (isResumed()) {
@@ -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<Long>()))).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()}. * Tests the method {@link TrackDataHub#start()}.
*/ */