--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/08/09 09:09:16	239
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/10/27 13:40:15	474
@@ -1,11 +1,14 @@
 package dk.thoerup.traininfo;
 
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.List;
 
+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.net.Uri;
 import android.os.AsyncTask;
@@ -13,28 +16,30 @@
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
-import dk.thoerup.traininfo.provider.DepartureFactory;
 import dk.thoerup.traininfo.provider.DepartureProvider;
+import dk.thoerup.traininfo.provider.ProviderFactory;
+import dk.thoerup.traininfo.util.MessageBox;
 
 public class DepartureList extends ListActivity {
 
 	public static final int DLG_PROGRESS = 1;
-	public static final int DLG_DETAILS = 2;
+	
 	
 	DepartureListAdapter adapter;
 	DepartureProvider provider;
 	List<DepartureBean> departures;
 	
-	static int itemId;
-	static DepartureBean currentDeparture;
+	int selectedItemId;
+	//DepartureBean currentDeparture;
 	
 	ProgressDialog pgDialog;
 	
 	DepartureFetcher fetcher;
+	int stationId;
 	
 	double latitude,longitude;
 	
+	@SuppressWarnings("unchecked")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -50,9 +55,11 @@
 		
 		String name = launchedBy.getStringExtra("name");
 		((TextView) findViewById(R.id.stationName)).setText( name );
+
+		String address = launchedBy.getStringExtra("address");
+		((TextView) findViewById(R.id.stationAddr)).setText( address );
 		
-		String addr = launchedBy.getStringExtra("address");
-		((TextView) findViewById(R.id.stationAddr)).setText( addr );
+		stationId = launchedBy.getIntExtra("stationid", -1); 
 		
 		findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
@@ -63,36 +70,49 @@
 		((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." );
 	
 		
-		showDialog(DLG_PROGRESS);
-		provider = DepartureFactory.getProvider();
+		provider = ProviderFactory.getDepartureProvider();
 		
-		fetcher = new DepartureFetcher();
-		fetcher.execute(name);
+		if (savedInstanceState == null) {
+			startDepartureFetcher();
+		} else {
+			departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
+			adapter.setDepartures(departures);
+			selectedItemId = savedInstanceState.getInt("selectedItemId");	
+		}
 	}
 	
+    @Override 
+    public void onSaveInstanceState(Bundle outState) 
+    {
+    	if (pgDialog != null && pgDialog.isShowing())
+    		dismissDialog(DLG_PROGRESS);
+
+    	outState.putInt("selectedItemId", selectedItemId);
+    	
+    	outState.putSerializable("departures", (ArrayList<DepartureBean>) departures);
+    }
+	
 	@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);
 	
-		currentDeparture = departures.get(position);
-		showDialog(DLG_DETAILS);		
+		Intent intent = new Intent(this, TimetableList.class);
+		intent.putExtra("departure", dep);
+		
+		startActivity(intent);
+				
 	}
 	
 
 	@Override
 	protected void onPrepareDialog(int id, Dialog dialog) {
 		super.onPrepareDialog(id, dialog);
-	
+		
 		switch (id) {
-		case DLG_DETAILS:
-			((TextView)dialog.findViewById(R.id.Time)).setText(currentDeparture.getTime());
-			((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());
-			break;
 		case DLG_PROGRESS:
 			pgDialog = (ProgressDialog) dialog;
 			break;
@@ -106,23 +126,18 @@
 			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 {
 
 		Dialog dlg;
@@ -134,7 +149,7 @@
 		public void onClick(View v) {
 			if (dlg.isShowing())
 				dlg.dismiss();
-		}
+		}	
 	}
 	
 	View.OnClickListener mapLauncher = new View.OnClickListener() {
@@ -144,25 +159,49 @@
 			startActivity( new Intent(Intent.ACTION_VIEW, uri));
 		}
 	};
+
+
 	
-	
-	class DepartureFetcher extends AsyncTask<String, Void, Void> {
+	class DepartureFetcher extends AsyncTask<Integer, Void, Void> {
+
+		boolean success;
 
 		@Override
 		protected void onPostExecute(Void result) {
 			super.onPostExecute(result);
 			
-			adapter.setDepartures(departures);
+			
 			pgDialog.dismiss();
 			
-			if (departures.size() == 0)
-				Toast.makeText(DepartureList.this, "No departures found", Toast.LENGTH_LONG);
+			if (success) {
+				adapter.setDepartures(departures);
+				if (departures.size() == 0) {
+					MessageBox.showMessage(DepartureList.this, "No departures found");
+				}
+			} else { // communication or parse error
+				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();				
+			}
 		}
 
 		@Override
-		protected Void doInBackground(String... params) {
-			provider.lookupDepartures(params[0]);
-			departures = provider.getDepartures();
+		protected Void doInBackground(Integer... params) {
+			success = provider.lookupDepartures(params[0]);
+			departures = provider.getDepartures(params[0]);
 			return null;
 		}