diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-07 23:19:05 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-07 23:19:05 +0000 |
| commit | 93c8cd480ea46d49dd7ad1ba9515443797a4a8c1 (patch) | |
| tree | 2dc78dc2135b9a1ee8ea81125c46182836f680e5 /src/net/cbaines/suma/BusStopActivity.java | |
| parent | 783024e364648171ae8848bb29b6dd71a84a2f40 (diff) | |
| parent | 26f11938b2467d6033ade06af57dc678dc3401cd (diff) | |
| download | southamptonuniversitymap-93c8cd480ea46d49dd7ad1ba9515443797a4a8c1.tar southamptonuniversitymap-93c8cd480ea46d49dd7ad1ba9515443797a4a8c1.tar.gz | |
Merge branch 'dev'
Diffstat (limited to 'src/net/cbaines/suma/BusStopActivity.java')
| -rw-r--r-- | src/net/cbaines/suma/BusStopActivity.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/net/cbaines/suma/BusStopActivity.java b/src/net/cbaines/suma/BusStopActivity.java index f432803..b80d5b4 100644 --- a/src/net/cbaines/suma/BusStopActivity.java +++ b/src/net/cbaines/suma/BusStopActivity.java @@ -59,8 +59,8 @@ import com.j256.ormlite.dao.Dao; import com.j256.ormlite.stmt.PreparedQuery; import com.j256.ormlite.stmt.QueryBuilder; -public class BusStopActivity extends ToastHelperActivity implements OnCheckedChangeListener, Preferences, OnItemClickListener, - OnLongClickListener { +public class BusStopActivity extends ToastHelperActivity implements OnCheckedChangeListener, Preferences, + OnItemClickListener, OnLongClickListener { final static String TAG = "BusTimeActivity"; @@ -320,10 +320,10 @@ public class BusStopActivity extends ToastHelperActivity implements OnCheckedCha try { final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(instance); - newTimetable = DataManager - .getTimetable(instance, busStop.id, sharedPrefs.getBoolean(MapActivity.UNI_LINK_BUS_TIMES, - MapActivity.UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT), sharedPrefs.getBoolean( - MapActivity.NON_UNI_LINK_BUS_TIMES, MapActivity.NON_UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT)); + newTimetable = DataManager.getTimetable(instance, busStop.id, sharedPrefs.getBoolean( + MapActivity.UNI_LINK_BUS_TIMES, MapActivity.UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT), sharedPrefs + .getBoolean(MapActivity.NON_UNI_LINK_BUS_TIMES, + MapActivity.NON_UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT)); } catch (SQLException e) { errorMessage = "Error message regarding SQL?"; e.printStackTrace(); @@ -363,7 +363,7 @@ public class BusStopActivity extends ToastHelperActivity implements OnCheckedCha @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.stop_menu, menu); + inflater.inflate(R.menu.bus_stop_menu, menu); return true; } |