--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/09/11 12:24:53	319
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/09/30 09:14:27	365
@@ -3,14 +3,13 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ListActivity;
 import android.app.ProgressDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
-import android.location.Address;
-import android.location.Geocoder;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -25,7 +24,7 @@
 public class DepartureList extends ListActivity {
 
 	public static final int DLG_PROGRESS = 1;
-	public static final int DLG_DETAILS = 2;
+	
 	
 	DepartureListAdapter adapter;
 	DepartureProvider provider;
@@ -35,8 +34,9 @@
 	//DepartureBean currentDeparture;
 	
 	ProgressDialog pgDialog;
-	Dialog detailsDialog;
+	
 	DepartureFetcher fetcher;
+	int stationId;
 	
 	double latitude,longitude;
 	
@@ -60,7 +60,7 @@
 		String address = launchedBy.getStringExtra("address");
 		((TextView) findViewById(R.id.stationAddr)).setText( address );
 		
-		int stationId = launchedBy.getIntExtra("stationid", -1); 
+		stationId = launchedBy.getIntExtra("stationid", -1); 
 		
 		findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
@@ -73,17 +73,12 @@
 		
 		provider = ProviderFactory.getDepartureProvider();
 		
-		fetcher = new DepartureFetcher();
 		if (savedInstanceState == null) {
-			showDialog(DLG_PROGRESS);
-			fetcher.execute(stationId);
+			startDepartureFetcher();
 		} else {
 			departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
 			adapter.setDepartures(departures);
 			selectedItemId = savedInstanceState.getInt("selectedItemId");	
-			boolean detailsShowing = savedInstanceState.getBoolean("detailsShowing");
-			if (detailsShowing)
-				showDialog(DLG_DETAILS);
 		}
 	}
 	
@@ -92,11 +87,7 @@
     {
     	if (pgDialog != null && pgDialog.isShowing())
     		dismissDialog(DLG_PROGRESS);
-    	boolean detailsShowing = (detailsDialog != null && detailsDialog.isShowing()); 
-    	if (detailsShowing) {
-    		dismissDialog(DLG_DETAILS);
-    	}
-    	outState.putBoolean("detailsShowing", detailsShowing);
+
     	outState.putInt("selectedItemId", selectedItemId);
     	
     	outState.putSerializable("departures", (ArrayList<DepartureBean>) departures);
@@ -105,9 +96,16 @@
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
+		
+		selectedItemId = position;
+		
+		DepartureBean dep = departures.get(selectedItemId);
 	
-		selectedItemId = position;		
-		showDialog(DLG_DETAILS);		
+		Intent intent = new Intent(this, TimetableList.class);
+		intent.putExtra("departure", dep);
+		
+		startActivity(intent);
+				
 	}
 	
 
@@ -116,18 +114,6 @@
 		super.onPrepareDialog(id, dialog);
 		
 		switch (id) {
-		case DLG_DETAILS:
-			DepartureBean currentDeparture = departures.get(selectedItemId);
-			((TextView)dialog.findViewById(R.id.Time)).setText(currentDeparture.getTime());
-			((TextView)dialog.findViewById(R.id.Train)).setText(currentDeparture.getTrainNumber());
-			((TextView)dialog.findViewById(R.id.Destination)).setText( currentDeparture.getDestination());
-			((TextView)dialog.findViewById(R.id.Origin)).setText(currentDeparture.getOrigin());
-			((TextView)dialog.findViewById(R.id.Location)).setText(currentDeparture.getLocation());
-			((TextView)dialog.findViewById(R.id.Updated)).setText(currentDeparture.getLastUpdateString());
-			((TextView)dialog.findViewById(R.id.Status)).setText(currentDeparture.getStatus());
-			((TextView)dialog.findViewById(R.id.Note)).setText(currentDeparture.getNote());
-			detailsDialog = dialog;
-			break;
 		case DLG_PROGRESS:
 			pgDialog = (ProgressDialog) dialog;
 			break;
@@ -141,22 +127,17 @@
 			ProgressDialog dlg = new ProgressDialog(this);
 			dlg.setMessage("Fetch departure data");
 			dlg.setCancelable(true);
-			return dlg;
-		case DLG_DETAILS:
-			//Context mContext = getApplicationContext();
-			Dialog dialog = new Dialog(this);
-			dialog.setCancelable(true);
-
-			dialog.setContentView(R.layout.departuredetails);
-			dialog.setTitle("Departure details");
-
-			View root = dialog.findViewById(R.id.layout_root);
-			root.setOnClickListener( new DialogDismisser(dialog) );
-			return dialog;			
+			return dlg;			
 		default:
 			return super.onCreateDialog(id);		
 		}
 	}
+
+	void startDepartureFetcher() {
+		showDialog(DLG_PROGRESS);
+		fetcher = new DepartureFetcher(); 
+		fetcher.execute(stationId);
+	}
 	
 	class DialogDismisser implements View.OnClickListener {
 
@@ -169,7 +150,7 @@
 		public void onClick(View v) {
 			if (dlg.isShowing())
 				dlg.dismiss();
-		}
+		}	
 	}
 	
 	View.OnClickListener mapLauncher = new View.OnClickListener() {
@@ -179,25 +160,42 @@
 			startActivity( new Intent(Intent.ACTION_VIEW, uri));
 		}
 	};
-	
+
+
 	
 	class DepartureFetcher extends AsyncTask<Integer, Void, Void> {
 
 		boolean success;
-		String addr;
+
 		@Override
 		protected void onPostExecute(Void result) {
 			super.onPostExecute(result);
 			
-			adapter.setDepartures(departures);
+			
 			pgDialog.dismiss();
 			
 			if (success) {
+				adapter.setDepartures(departures);
 				if (departures.size() == 0) {
 					MessageBox.showMessage(DepartureList.this, "No departures found");
 				}
 			} else { // communication or parse error
-				MessageBox.showMessage(DepartureList.this, "Error finding departures");
+				AlertDialog.Builder builder = new AlertDialog.Builder(DepartureList.this);						
+				builder.setMessage("Error finding departures");
+				builder.setCancelable(true);
+				builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int id) {
+						dialog.dismiss();
+						startDepartureFetcher();
+						
+					}
+				});
+				builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int id) {
+						dialog.dismiss();
+					}							
+				});												
+				builder.show();				
 			}
 		}