--- android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java	2009/09/30 09:14:27	365
+++ android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java	2010/01/28 08:55:19	561
@@ -4,21 +4,22 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import android.app.Activity;
 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.os.AsyncTask;
 import android.os.Bundle;
-import android.util.Log;
+import android.widget.ListView;
 import android.widget.TextView;
 import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.provider.TimetableProvider;
 import dk.thoerup.traininfo.util.MessageBox;
+import static dk.thoerup.traininfo.R.string.*;
 
-public class TimetableList extends ListActivity {
+public class TimetableList extends Activity {
 	
 	private static final int DLG_PROGRESS = 8000;
 	DepartureBean departure;
@@ -37,16 +38,20 @@
 		provider = ProviderFactory.getTimetableProvider();
 		
 		adapter = new TimetableListAdapter(this);
-		setListAdapter(adapter);
+		
+		ListView lv = (ListView) findViewById(R.id.List);
+		lv.setAdapter(adapter);
+
 		
 		Intent launchedBy = getIntent();
 		departure = (DepartureBean) launchedBy.getSerializableExtra("departure");
 		
 		((TextView)findViewById(R.id.Train)).setText(departure.getTrainNumber());
 		((TextView)findViewById(R.id.Status)).setText(departure.getStatus());
+		((TextView)findViewById(R.id.Location)).setText(departure.getLocation());
 		((TextView)findViewById(R.id.Note)).setText(departure.getNote());
 		((TextView)findViewById(R.id.Updated)).setText(departure.getLastUpdateString());
-		
+						
 		
 		if (savedInstanceState == null) {
 			startTimetableFetcher();
@@ -93,8 +98,8 @@
 	protected Dialog onCreateDialog(int id) {
 		switch (id) {
 		case DLG_PROGRESS:
-			ProgressDialog dlg = new ProgressDialog(this);
-			dlg.setMessage("Fetch timetable data");
+			ProgressDialog dlg = new ProgressDialog(this);			
+			dlg.setMessage( getString(timetablelist_fetchdata) );
 			dlg.setCancelable(true);
 			return dlg;			
 		default:
@@ -121,20 +126,20 @@
 			if (success) {
 				adapter.setTimetable(timetables);
 				if (timetables.size() == 0) {
-					MessageBox.showMessage(TimetableList.this, "No timetable found");
+					MessageBox.showMessage(TimetableList.this, getString(timetablelist_nodata));
 				}
 			} else { // communication or parse error
 				AlertDialog.Builder builder = new AlertDialog.Builder(TimetableList.this);						
-				builder.setMessage("Error finding departures");
+				builder.setMessage(getString(timetablelist_fetcherror));
 				builder.setCancelable(true);
-				builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						dialog.dismiss();
 						startTimetableFetcher();
 						
 					}
 				});
-				builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+				builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						dialog.dismiss();
 					}							
@@ -148,7 +153,7 @@
 		protected Void doInBackground(String... arg0) {
 			String trainID = arg0[0];
 			success = provider.lookupTimetable(trainID);
-			timetables = provider.getTimetable();
+			timetables = provider.getTimetable(trainID);
 			
 			return null;
 		}