--- android/TrainInfo/src/dk/thoerup/traininfo/provider/DebugProvider.java	2010/09/16 15:31:31	1065
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/DebugProvider.java	2010/09/16 15:32:42	1066
@@ -1,13 +1,14 @@
 package dk.thoerup.traininfo.provider;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.location.Location;
-import dk.thoerup.traininfo.DepartureBean;
-import dk.thoerup.traininfo.DepartureEntry;
-import dk.thoerup.traininfo.StationBean;
-import dk.thoerup.traininfo.TimetableBean;
+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.StationBean;
+import dk.thoerup.android.traininfo.common.TimetableBean;
+import dk.thoerup.android.traininfo.common.TimetableEntry;
+import dk.thoerup.android.traininfo.common.MetroBean.MetroEntry;
+import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 
 public class DebugProvider implements DepartureProvider, StationProvider, TimetableProvider, MetroProvider {
 
@@ -21,7 +22,7 @@
 		departure.setDestination("Dar-es Salaam");
 		departure.setOrigin("Sao Paulo");
 		departure.setLocation("Beijing");
-		departure.setLastUpdate("1");
+		departure.setUpdated(1);
 		departure.setTrainNumber("RA-123");
 		bean.entries.add(departure);
 		
@@ -30,7 +31,7 @@
 		departure.setDestination("Timbuktu");
 		departure.setOrigin("Anchorage");
 		departure.setLocation("Helsinki");
-		departure.setLastUpdate("2");
+		departure.setUpdated(2);
 		departure.setTrainNumber("IC-7");
 		departure.setStatus("2 days delayed");
 		bean.entries.add(departure);
@@ -40,7 +41,7 @@
 		departure.setDestination("Skive");
 		departure.setOrigin("Virksund");
 		departure.setLocation("Hald");
-		departure.setLastUpdate("2");
+		departure.setUpdated(2);
 		departure.setTrainNumber("IC-7");
 		departure.setNote("Kun st�pladser");
 		bean.entries.add(departure);
@@ -51,88 +52,88 @@
 	}
 
 	
-	public List<StationBean> getStations() {
-		List<StationBean> stations = new ArrayList<StationBean>();
+	public StationBean getStations() {
+		StationBean stations = new StationBean();
 		
-		StationBean station = new StationBean();
+		StationEntry station = new StationEntry();
 		station.setName("Andeby");		
-		station.setDistance(1700);		
+		station.setCalcdist(1700);		
 		station.setId(1);
 		station.setLatitude(56.0);
 		station.setLongitude(10.0);		
-		station.setRegional(true);
-		stations.add(station);
+		station.setIsRegional(true);
+		stations.entries.add(station);
 		
-		station = new StationBean();
+		station = new StationEntry();
 		station.setName("Gåserød");		
-		station.setDistance(5300);		
+		station.setCalcdist(5300);		
 		station.setId(2);
 		station.setLatitude(58.0);
 		station.setLongitude(10.0);
-		station.setRegional(true);
-		stations.add(station);
+		station.setIsRegional(true);
+		stations.entries.add(station);
 		
-		station = new StationBean();
+		station = new StationEntry();
 		station.setName("Pladerballe");		
-		station.setDistance(15600);		
+		station.setCalcdist(15600);		
 		station.setId(3);
 		station.setLatitude(52.0);
 		station.setLongitude(11.0);
-		station.setRegional(true);
-		station.setMetro(true);
-		stations.add(station);
+		station.setIsRegional(true);
+		station.setIsMetro(true);
+		stations.entries.add(station);
 		
 		return stations;
 	}
 
 	@Override
-	public List<StationBean> lookupStations(Location location) {
+	public StationBean lookupStations(Location location) {
 		return getStations();
 	}
 	
 	@Override
-	public List<StationBean> lookupStationsByName(String name) {
+	public StationBean lookupStationsByName(String name) {
 		return getStations();
 	}
 	
 	
 
 	@Override
-	public List<StationBean> lookupStationsByIds(String ids) {
+	public StationBean lookupStationsByIds(String ids) {
 		return getStations();
 	}
 
 	@Override
-	public List<TimetableBean> lookupTimetable(String type, String trainID) {
-		List<TimetableBean> timetables = new ArrayList<TimetableBean>();
+	public TimetableBean lookupTimetable(String type, String trainID) {
+		TimetableBean timetables = new TimetableBean();
 		
-		TimetableBean timetable = new TimetableBean();
+		TimetableEntry timetable = new TimetableEntry();
 		timetable.setStation("Andeby");
 		timetable.setArrival("");
 		timetable.setDeparture("05:17");
 		timetable.setCurrent(false);
-		timetables.add(timetable);
+		timetables.entries.add(timetable);
 		
-		timetable = new TimetableBean();
+		timetable = new TimetableEntry();
 		timetable.setStation("Gåserød");
 		timetable.setArrival("07:45");
 		timetable.setDeparture("07:46");
 		timetable.setCurrent(false);
-		timetables.add(timetable);
+		timetables.entries.add(timetable);
 
-		timetable = new TimetableBean();
+		timetable = new TimetableEntry();
 		timetable.setStation("Smallville");
 		timetable.setArrival("08:32");
 		timetable.setDeparture("08:32");
 		timetable.setCurrent(true);
-		timetables.add(timetable);
+		timetables.entries.add(timetable);
 
-		timetable = new TimetableBean();
+		timetable = new TimetableEntry();
 		timetable.setStation("Pløresødal lejren");
 		timetable.setArrival("09:02");
 		timetable.setDeparture("");
 		timetable.setCurrent(false);
-		timetables.add(timetable);
+		timetables.entries.add(timetable);
 		
 		return timetables;
 	}