--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableBean.java	2010/09/16 09:11:23	1059
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableBean.java	2010/09/16 13:32:10	1060
@@ -1,53 +1,16 @@
 package dk.thoerup.traininfoservice.banedk;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.simpleframework.xml.ElementList;
+import org.simpleframework.xml.Root;
+
+@Root(name="timetable")
 public class TimetableBean {
-	private String station;
-	private String arrival;
-	private String departure;
-	private boolean current;
-	private int stationId;
-	boolean cancelled;
-	
-	public String getStation() {
-		return station;
-	}
-	public void setStation(String station) {
-		this.station = station;
-	}
-	
-	public String getArrival() {
-		return arrival;
-	}
-	public void setArrival(String arrival) {
-		this.arrival = arrival;
-	}
-	
-	public String getDeparture() {
-		return departure;
-	}
-	public void setDeparture(String departure) {
-		this.departure = departure;
-	}
-	
-	public boolean isCurrent() {
-		return current;
-	}
-	public void setCurrent(boolean current) {
-		this.current = current;
-	}
-	public int getStationId() {
-		return stationId;
-	}
-	public void setStationId(int stationId) {
-		this.stationId = stationId;
-	}
-	
-	public boolean isCancelled() {
-		return cancelled;
-	}
-	public void setCancelled(boolean cancelled) {
-		this.cancelled = cancelled;
-	}
+
+	@ElementList(inline=true)
+	List<TimetableEntry> entries = new ArrayList<TimetableEntry>();
 	
 	
 }