--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/10/29 08:56:17	481
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/10/29 09:38:13	482
@@ -63,7 +63,7 @@
 	
 	String dialogMessage = "";
 	ProgressDialog dialog;
-	LocationLookup locator = null;
+	LocationLookup locationLookup = null;
 	FindStationsTask findStationsTask;
 	StationsFetchedHandler stationsFetched = new StationsFetchedHandler();
 	
@@ -80,7 +80,6 @@
 	IntSet favorites = new IntSet();
 
 	WelcomeScreen.ListType listType;
-	String dialogTitle;
 	SharedPreferences prefs;
 	
 	///////////////////////////////////////////////////////////////////////////////////////////
@@ -99,7 +98,7 @@
 		ListView lv = getListView();
 		lv.setOnCreateContextMenuListener(contextMenu);
 		
-		locator = new LocationLookup(this, stationsFetched);
+		locationLookup = new LocationLookup(this, stationsFetched);
 		
 
 		prefs = getSharedPreferences("TrainStation", 0);
@@ -108,8 +107,12 @@
 			favorites.fromString(favoriteString);
 		}
 		
+		listType = (WelcomeScreen.ListType) getIntent().getSerializableExtra("type");
+		setTitle();
+		
 		if (savedInstanceState == null) {
-			listType = (WelcomeScreen.ListType) getIntent().getSerializableExtra("type");
+
+			
 			switch (listType) {
 			case ListNearest:
 				startLookup();
@@ -128,10 +131,29 @@
 			stations = (ArrayList<StationBean>) savedInstanceState.getSerializable("stations");
 			adapter.setStations(stations);
 			location = (GeoPair) savedInstanceState.getSerializable("location");
-			dialogTitle = savedInstanceState.getString("title");
-			setTitle(dialogTitle);
 		}
+		
+	}
+	protected void setTitle() {
+		String dialogTitle;
+		switch (listType) {
+		case ListNearest:
+			dialogTitle = "Traininfo DK - Nearby stations";
+			break;
+		case ListSearch:
+			dialogTitle = "Traininfo DK - Search";
+			break;
+		case ListFavorites:
+			dialogTitle = "Traininfo DK - Favorites";
+			break;
+		default:
+			dialogTitle = "";//not possible					
+		}
+	
+		setTitle(dialogTitle);
 	}
+	
+	
 
 
     @Override 
@@ -141,7 +163,7 @@
     		dialog.dismiss();
     	outState.putSerializable("stations", (ArrayList<StationBean>) stations);
     	outState.putSerializable("location", location);
-    	outState.putString("title", dialogTitle);
+    	
     }
 	
 	
@@ -180,7 +202,7 @@
 			startActivity(intent);
 			break;
 		case OPTIONS_GPSINFO:
-			Location loc = locator.getLocation();
+			Location loc = locationLookup.getLocation();
 			StringBuffer message = new StringBuffer();
 			message.append("Location info:\n");
 			message.append("-Obtained by: ").append(loc != null ? loc.getProvider() : "-").append("\n");
@@ -294,7 +316,7 @@
 		dialogMessage = "Wait for location fix";
 		showDialog(DLG_PROGRESS);
 		
-		locator.locateStations();
+		locationLookup.locateStations();
 		stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, 20000);
 	}
 	
@@ -303,7 +325,7 @@
 		showDialog(DLG_PROGRESS);
 
 		findStationsTask = new FindStationsTask();
-		findStationsTask.searchByName(name, locator.getLocation());
+		findStationsTask.searchByName(name, locationLookup.getLocation());
 		findStationsTask.execute();
 		
 	}
@@ -315,7 +337,7 @@
 			showDialog(DLG_PROGRESS);
 
 			findStationsTask = new FindStationsTask();
-			findStationsTask.searchByIds(favorites.toString(), locator.getLocation());
+			findStationsTask.searchByIds(favorites.toString(), locationLookup.getLocation());
 			findStationsTask.execute();
 		} else {
 			MessageBox.showMessage(this, "Favorite list is empty");
@@ -330,7 +352,7 @@
 		showDialog(DLG_PROGRESS);
 		
 		findStationsTask = new FindStationsTask();
-		findStationsTask.searchByLocation( locator.getLocation() );
+		findStationsTask.searchByLocation( locationLookup.getLocation() );
 		findStationsTask.execute();	
 	}
 	
@@ -374,7 +396,7 @@
 				dismissDialog(DLG_PROGRESS);
 				
 				startLocatorTask();
-				location = GeoPair.fromLocation( locator.getLocation() );
+				location = GeoPair.fromLocation( locationLookup.getLocation() );
 				
 				break;
 
@@ -384,8 +406,8 @@
 				break;
 			case LOCATIONFIXTIMEOUT:				
 				if (isRunning) {
-					locator.stopSearch();
-					if (locator.hasLocation()) {
+					locationLookup.stopSearch();
+					if (locationLookup.hasLocation()) {
 						stationsFetched.sendEmptyMessage( GOTLOCATION ); 
 					} else {						
 						dismissDialog(DLG_PROGRESS);
@@ -497,23 +519,6 @@
 			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)