--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/08/10 16:58:22	253
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/09/10 19:09:09	310
@@ -1,6 +1,7 @@
 package dk.thoerup.traininfo;
 
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 import android.app.Dialog;
@@ -13,9 +14,8 @@
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
-import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.provider.DepartureProvider;
+import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.util.MessageBox;
 
 public class DepartureList extends ListActivity {
@@ -27,15 +27,16 @@
 	DepartureProvider provider;
 	List<DepartureBean> departures;
 	
-	static int itemId;
-	static DepartureBean currentDeparture;
+	int selectedItemId;
+	//DepartureBean currentDeparture;
 	
 	ProgressDialog pgDialog;
-	
+	Dialog detailsDialog;
 	DepartureFetcher fetcher;
 	
 	double latitude,longitude;
 	
+	@SuppressWarnings("unchecked")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -55,6 +56,8 @@
 		String addr = launchedBy.getStringExtra("address");
 		((TextView) findViewById(R.id.stationAddr)).setText( addr );
 		
+		int stationId = launchedBy.getIntExtra("stationid", -1); 
+		
 		findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
 		NumberFormat format = NumberFormat.getNumberInstance();
@@ -64,25 +67,42 @@
 		((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." );
 	
 		
-		showDialog(DLG_PROGRESS);
 		provider = ProviderFactory.getDepartureProvider();
 		
 		fetcher = new DepartureFetcher();
-		fetcher.execute(name);
+		if (savedInstanceState == null) {
+			showDialog(DLG_PROGRESS);
+			fetcher.execute(stationId);
+		} else {
+			departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
+			adapter.setDepartures(departures);
+			selectedItemId = savedInstanceState.getInt("selectedItemId");	
+			boolean detailsShowing = savedInstanceState.getBoolean("detailsShowing");
+			if (detailsShowing)
+				showDialog(DLG_DETAILS);
+		}
 	}
 	
     @Override 
     public void onSaveInstanceState(Bundle outState) 
     {
-    	if (pgDialog.isShowing())
-    		pgDialog.dismiss();
+    	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);
     }
 	
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
 	
-		currentDeparture = departures.get(position);
+		selectedItemId = position;		
 		showDialog(DLG_DETAILS);		
 	}
 	
@@ -90,9 +110,10 @@
 	@Override
 	protected void onPrepareDialog(int id, Dialog dialog) {
 		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());
@@ -101,6 +122,7 @@
 			((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;
@@ -155,7 +177,7 @@
 	};
 	
 	
-	class DepartureFetcher extends AsyncTask<String, Void, Void> {
+	class DepartureFetcher extends AsyncTask<Integer, Void, Void> {
 
 		@Override
 		protected void onPostExecute(Void result) {
@@ -169,7 +191,7 @@
 		}
 
 		@Override
-		protected Void doInBackground(String... params) {
+		protected Void doInBackground(Integer... params) {
 			provider.lookupDepartures(params[0]);
 			departures = provider.getDepartures();
 			return null;