--- android/TrainInfo/src/dk/thoerup/traininfo/TimetableListAdapter.java	2010/06/11 18:46:46	840
+++ android/TrainInfo/src/dk/thoerup/traininfo/TimetableListAdapter.java	2011/07/07 20:45:17	1551
@@ -1,23 +1,23 @@
 package dk.thoerup.traininfo;
 
-import java.util.List;
-
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
+import dk.thoerup.android.traininfo.common.TimetableBean;
+import dk.thoerup.android.traininfo.common.TimetableEntry;
 
 public class TimetableListAdapter extends BaseAdapter {
 
-	private List<TimetableBean> timetable;
+	private TimetableBean timetable;
 	LayoutInflater inflater;
 	Context context;
 	
 	@Override
 	public boolean isEnabled(int position) {
-		return ( timetable.get(position).getStationId() != -1 );
+		return ( timetable.entries.get(position).getStationEntry() != null );
 	}
 
 	public TimetableListAdapter(Context context) {
@@ -27,7 +27,7 @@
 		inflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 	}
 	
-	public void setTimetable(List<TimetableBean> timetable) {
+	public void setTimetable(TimetableBean timetable) {
 		this.timetable = timetable;
 		notifyDataSetChanged();
 	}
@@ -35,7 +35,7 @@
 	@Override
 	public int getCount() {
 		if (timetable != null)
-			return timetable.size();
+			return timetable.entries.size();
 		else
 			return 0;
 	}
@@ -50,23 +50,31 @@
 		return position;
 	}
 
+	String getTranslated(String str) {
+		if (str == null)
+			return str;		
+		
+		str = str.replace("Aflyst", context.getString(R.string.timetablelist_cancel) );
+		return str;
+	}
+	
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
-		TimetableBean timetableBean = timetable.get(position);
+		TimetableEntry entry = timetable.entries.get(position);
 
 		View root = inflater.inflate(R.layout.timetablerow , parent, false);
 		
 		TextView station = (TextView) root.findViewById(R.id.Station); 
-		station.setText(timetableBean.getStation());
+		station.setText( entry.getStation() );
 		
 		TextView arrival = (TextView) root.findViewById(R.id.Arrival);		
-		arrival.setText(timetableBean.getArrival());
+		arrival.setText( getTranslated(entry.getArrival()) );
 		
 		TextView departure = (TextView) root.findViewById(R.id.Departure);		
-		departure.setText(timetableBean.getDeparture());
+		departure.setText( getTranslated(entry.getDeparture()) );
 		
 		
-		if (timetableBean.isCurrent()) {
+		if (entry.isCurrent()) {
 			final int bgcolor = 0xFFFFFFFF;
 			final int fgcolor = 0xFF000000;