--- 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/11 07:23:35	441
@@ -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,12 +81,7 @@
 	FavoritesMenu contextMenu = new FavoritesMenu();
 	IntSet favorites = new IntSet();
 	
-	static enum LookupMethod {
-		ByLocation,
-		ByName,
-		ByList,
-		MethodNone
-	}
+
 	
 	SharedPreferences prefs;
 	
@@ -133,7 +135,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 +144,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 +309,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 +336,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 +423,7 @@
 	};
 
 	
-	class LocatorTask extends AsyncTask<Void,Void,Void> {
+	class FindStationsTask extends AsyncTask<Void,Void,Void> {
 		
 		LookupMethod method = LookupMethod.MethodNone;
 		boolean success;
@@ -537,7 +539,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");