--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/09/28 15:30:13	1143
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/12/25 20:51:29	1207
@@ -48,7 +48,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -150,7 +149,7 @@
 			
 			switch (listType) {
 			case ListNearest:
-				startLookup();
+				startNearestLookup();
 				break;
 			case ListSearch:				
 				showDialog(DLG_STATIONNAME); 
@@ -325,7 +324,7 @@
 					dialog.dismiss();
 					String search = et.getText().toString().trim();
 					if (search.length() >= 2) {
-						startNameSearch(search);
+						startNameLookup(search);
 					} else {
 						showMessageAndClose( getString(stationlist_twocharmin) );
 					}
@@ -381,7 +380,7 @@
 	/////////////////////////////////////////////////////////////
 	//
 
-	public void startLookup() {
+	public void startNearestLookup() {
 		dialogMessage = getString( stationlist_waitforlocation );
 		showDialog(DLG_PROGRESS);
 		
@@ -389,7 +388,7 @@
 		stationsFetched.sendEmptyMessageDelayed(0, 500);
 	}
 	
-	void startNameSearch(String name) {
+	void startNameLookup(String name) {
 		dialogMessage = getString( stationlist_findbyname );
 		showDialog(DLG_PROGRESS);
 
@@ -432,7 +431,6 @@
 	class StationsFetchedHandler extends Handler {
 		@Override
 		public void handleMessage(Message msg) {
-			Log.e("Handler", "WHAT:" + msg.what);
 
 			LocationLookup.LookupStates state = locationLookup.getState();
 
@@ -468,13 +466,14 @@
 					builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() {
 						public void onClick(DialogInterface dialog, int id) {
 							dialog.dismiss();
-							startLookup();
+							startNearestLookup();
 
 						}
 					});
 					builder.setNegativeButton( getString(generic_cancel), new DialogInterface.OnClickListener() {
 						public void onClick(DialogInterface dialog, int id) {
 							dialog.dismiss();
+							StationList.this.finish(); // Close this Activity
 						}							
 					});
 					builder.show(); 
@@ -532,7 +531,7 @@
 
 			switch (method) {
 			case ByLocation:
-				stations = stationProvider.lookupStations(loc);
+				stations = stationProvider.lookupStationsByLocation(loc);
 				break;
 			case ByName:
 				stations = stationProvider.lookupStationsByName(name);
@@ -585,7 +584,7 @@
 							runner = new Runnable() {
 								@Override
 								public void run() {
-									startNameSearch( FindStationsTask.this.name );
+									startNameLookup( FindStationsTask.this.name );
 								}
 							};
 							break;