--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/10/10 11:34:35	435
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/10/28 12:52:52	480
@@ -55,11 +55,18 @@
 	public static final int DLG_PROGRESS = 3001;
 	public static final int DLG_STATIONNAME = 3002;
 	
-	/** Called when the activity is first created. */
+	static enum LookupMethod {
+		ByLocation,
+		ByName,
+		ByList,
+		MethodNone
+	}
+	
+	
 	String dialogMessage = "";
 	ProgressDialog dialog;
 	LocationLookup locator = null;
-	LocatorTask locatorTask;
+	FindStationsTask findStationsTask;
 	StationsFetchedHandler stationsFetched = new StationsFetchedHandler();
 	
 	GeoPair location = new GeoPair();
@@ -74,13 +81,8 @@
 	FavoritesMenu contextMenu = new FavoritesMenu();
 	IntSet favorites = new IntSet();
 	
-	static enum LookupMethod {
-		ByLocation,
-		ByName,
-		ByList,
-		MethodNone
-	}
-	
+	boolean showingFavorites = false;
+	String dialogTitle;
 	SharedPreferences prefs;
 	
 	///////////////////////////////////////////////////////////////////////////////////////////
@@ -114,6 +116,8 @@
 			stations = (ArrayList<StationBean>) savedInstanceState.getSerializable("stations");
 			adapter.setStations(stations);
 			location = (GeoPair) savedInstanceState.getSerializable("location");
+			dialogTitle = savedInstanceState.getString("title");
+			setTitle(dialogTitle);
 		}
 	}
 
@@ -125,6 +129,7 @@
     		dialog.dismiss();
     	outState.putSerializable("stations", (ArrayList<StationBean>) stations);
     	outState.putSerializable("location", location);
+    	outState.putString("title", dialogTitle);
     }
 	
 	
@@ -133,7 +138,7 @@
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuItem item;
 		
-		item = menu.add(0, OPTIONS_RESCAN, 0, "Find nearest stations");
+		item = menu.add(0, OPTIONS_RESCAN, 0, "Nearest stations");
 		item.setIcon(android.R.drawable.ic_menu_mylocation);
 		
 		item = menu.add(0, OPTIONS_NAMESEARCH, 0, "Search for station");
@@ -142,7 +147,7 @@
 		item = menu.add(0, OPTIONS_FAVORITES, 0, "Favorites");
 		item.setIcon(android.R.drawable.ic_menu_agenda);
 		
-		item = menu.add(0, OPTIONS_MAP, 0, "Show station map");
+		item = menu.add(0, OPTIONS_MAP, 0, "Station map");
 		item.setIcon(android.R.drawable.ic_menu_mapmode);
 		
 		item = menu.add(0, OPTIONS_ABOUT, 0, "About");
@@ -307,21 +312,21 @@
 		dialogMessage = "Finding stations by name";
 		showDialog(DLG_PROGRESS);
 
-		locatorTask = new LocatorTask();
-		locatorTask.searchByName(name, locator.getLocation());
-		locatorTask.execute();
+		findStationsTask = new FindStationsTask();
+		findStationsTask.searchByName(name, locator.getLocation());
+		findStationsTask.execute();
 		
 	}
 	
 	public void startFavoriteLookup() {
 		
-		if (favorites.toString().length() > 0) {
+		if (favorites.size() > 0) {
 			dialogMessage = "Loading favorites";
 			showDialog(DLG_PROGRESS);
 
-			locatorTask = new LocatorTask();
-			locatorTask.searchByIds(favorites.toString(), locator.getLocation());
-			locatorTask.execute();
+			findStationsTask = new FindStationsTask();
+			findStationsTask.searchByIds(favorites.toString(), locator.getLocation());
+			findStationsTask.execute();
 		} else {
 			MessageBox.showMessage(this, "Favorite list is empty");
 		}
@@ -334,9 +339,9 @@
 		dialogMessage = "Finding nearby stations"; 
 		showDialog(DLG_PROGRESS);
 		
-		locatorTask = new LocatorTask();
-		locatorTask.searchByLocation( locator.getLocation() );
-		locatorTask.execute();	
+		findStationsTask = new FindStationsTask();
+		findStationsTask.searchByLocation( locator.getLocation() );
+		findStationsTask.execute();	
 	}
 	
 
@@ -421,7 +426,7 @@
 	};
 
 	
-	class LocatorTask extends AsyncTask<Void,Void,Void> {
+	class FindStationsTask extends AsyncTask<Void,Void,Void> {
 		
 		LookupMethod method = LookupMethod.MethodNone;
 		boolean success;
@@ -458,15 +463,21 @@
 		
 		@Override
 		protected Void doInBackground(Void... params) {
-		
-			if (method.equals(LookupMethod.ByLocation))
+
+			switch (method) {
+			case ByLocation:
 				success = stationProvider.lookupStations(loc);
-			
-			if (method.equals(LookupMethod.ByName))
+				break;
+			case ByName:
 				success = stationProvider.lookupStationsByName(name);
-			
-			if (method.equals(LookupMethod.ByList))
+				break;
+			case ByList:
 				success = stationProvider.lookupStationsByIds(ids);
+				break;
+			default:
+				success = false; // not possible	
+			}
+			
 			
 			Location dummy = new Location("gps");
 			List<StationBean> stations = stationProvider.getStations();
@@ -475,11 +486,17 @@
 				String addr = lookupAddress(station.getLatitude(), station.getLongitude());
 				station.setAddress(addr);
 				
+				
 				if (method.equals(LookupMethod.ByName) || method.equals(LookupMethod.ByList)) {
-					dummy.setLatitude(station.getLatitude());
-					dummy.setLongitude(station.getLongitude());
-					station.setDistance( (int)loc.distanceTo(dummy) );
+					if (loc != null) { //only do the distance calc if we have a location
+						dummy.setLatitude(station.getLatitude());
+						dummy.setLongitude(station.getLongitude());
+						station.setDistance( (int)loc.distanceTo(dummy) );
+					} else {
+						station.setDistance(0);
+					}
 				}
+
 			}						
 			
 			return null;
@@ -490,11 +507,31 @@
 			super.onPostExecute(result);
 			dialog.dismiss();
 			
+			//set title
+			switch (method) {
+			case ByLocation:
+				dialogTitle = "Traininfo DK - Nearby stations";
+				break;
+			case ByName:
+				dialogTitle = "Traininfo DK - Search";
+				break;
+			case ByList:
+				dialogTitle = "Traininfo DK - Favorites";
+				break;
+			default:
+				dialogTitle = "";//not possible					
+			}				
+			
+			StationList.this.setTitle(dialogTitle);
+			//set title end
+			
 			if (success) {				
 				if (stationProvider.getStations().size() == 0)
 					MessageBox.showMessage(StationList.this, "No stations found!"); // this should not be possible !?!
 				stations = stationProvider.getStations();
-				adapter.setStations( stations );				
+				adapter.setStations( stations );
+				
+				showingFavorites = method.equals(LookupMethod.ByList);				
 				
 			} else { //communication or parse errors
 				AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this);						
@@ -537,7 +574,7 @@
 			selectedPosition = info.position;
 			int stationID = stations.get(selectedPosition).getId();
 
-			if (!favorites.hasInt(stationID)) {
+			if (!favorites.contains(stationID)) {
 				menu.add(0, FAVORITES_ADD, 0, "Add to favorites");
 			} else {
 				menu.add(0, FAVORITES_REMOVE, 0, "Remove from favorites");
@@ -553,8 +590,14 @@
 				favorites.add(stationID);
 				Toast.makeText(StationList.this, "Station added", Toast.LENGTH_SHORT).show();
 			} else {
+				
 				favorites.remove(stationID);
 				Toast.makeText(StationList.this, "Station removed", Toast.LENGTH_SHORT).show();
+				
+				if (showingFavorites) {
+					stations.remove(selectedPosition);
+					adapter.notifyDataSetChanged();
+				}
 			}
 			Editor ed = prefs.edit();
 			ed.putString("favorites", favorites.toString());