--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/09/16 15:31:31	1065
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/09/16 15:32:42	1066
@@ -27,11 +27,14 @@
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
+import dk.thoerup.android.traininfo.common.DepartureBean;
+import dk.thoerup.android.traininfo.common.DepartureEntry;
+import dk.thoerup.android.traininfo.common.MetroBean;
+import dk.thoerup.android.traininfo.common.MetroBean.MetroEntry;
+import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.traininfo.provider.DepartureProvider;
 import dk.thoerup.traininfo.provider.MetroProvider;
 import dk.thoerup.traininfo.provider.ProviderFactory;
-import dk.thoerup.traininfo.provider.MetroProvider.MetroBean;
-import dk.thoerup.traininfo.provider.MetroProvider.MetroEntry;
 import dk.thoerup.traininfo.util.MessageBox;
 
 public class DepartureList extends ListActivity {
@@ -57,7 +60,7 @@
 	DepartureFetcher fetcher;
 	MetroFetcher metroFetcher;
 
-	StationBean station;
+	StationEntry station;
 	
 	boolean arrival = false;
 
@@ -73,7 +76,7 @@
 		
 		Intent launchedBy = getIntent();
 	
-		station = (StationBean) launchedBy.getSerializableExtra("stationbean");
+		station = (StationEntry) launchedBy.getSerializableExtra("stationbean");
 		
 		((TextView) findViewById(R.id.stationName)).setText( station.getName() );
 
@@ -131,7 +134,7 @@
 		
 		// findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
-		int distance = station.getDistance();
+		int distance = station.getCalcdist();
 		if (distance != 0) {
 			NumberFormat format = NumberFormat.getNumberInstance();
 			format.setMaximumFractionDigits(1);
@@ -152,7 +155,7 @@
 	
 		metro = ProviderFactory.getMetroProvider();
 		
-		if (station.isRegional() == false && station.isSTrain() == false) {
+		if (station.isRegional() == false && station.isStrain() == false) {
 			getListView().setVisibility( View.GONE );		
 			metroView.setVisibility( View.VISIBLE );