--- android/TrainInfoService/src/dk/thoerup/traininfoservice/StationBean.java	2010/09/16 09:11:23	1059
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/StationBean.java	2010/09/16 13:32:10	1060
@@ -1,73 +1,124 @@
 package dk.thoerup.traininfoservice;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.ElementList;
+import org.simpleframework.xml.Root;
+
+@Root(name="stations")
 public class StationBean {
 	
-	private int id;
-	private String name;
-	private double latitude;
-	private double longitude;
-	
-	private String regional = null;
-	private String strain = null;
-	private String metro = null;
 	
-	private String address;
-	private int calcdist;
+	@ElementList(inline=true)
+	List<StationEntry> entries = new ArrayList();
 	
-	public int getId() {
-		return id;
-	}
-	public void setId(int id) {
-		this.id = id;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public double getLatitude() {
-		return latitude;
-	}
-	public void setLatitude(double latitude) {
-		this.latitude = latitude;
-	}
-	public double getLongitude() {
-		return longitude;
-	}
-	public void setLongitude(double longitude) {
-		this.longitude = longitude;
-	}
-	public String getRegional() {
-		return regional;
-	}
-	public void setRegional(String regional) {
-		this.regional = regional;
-	}
-	public String getStrain() {
-		return strain;
-	}
-	public void setStrain(String strain) {
-		this.strain = strain;
-	}
-	public String getMetro() {
-		return metro;
-	}
-	public void setMetro(String metro) {
-		this.metro = metro;
-	}
-	public String getAddress() {
-		return address;
-	}
-	public void setAddress(String address) {
-		this.address = address;
-	}
-	public int getCalcdist() {
-		return calcdist;
-	}
-	public void setCalcdist(int calcdist) {
-		this.calcdist = calcdist;
+	@Root(name="station")
+	public static class StationEntry {
+		
+		@Element
+		private int id;
+		
+		@Element
+		private String name;
+		
+		@Element
+		private double latitude;
+		
+		@Element
+		private double longitude;
+		
+		@Element(name="regional")
+		private boolean isRegional = false;		
+		private String regional = null;
+		
+		@Element(name="strain")
+		private boolean isStrain = false;
+		private String strain = null;
+		
+		@Element(name="metro")
+		private boolean isMetro = false;
+		private String metro = null;
+		
+		@Element
+		private String address;
+		
+		@Element
+		private int calcdist;
+		
+		
+		public int getId() {
+			return id;
+		}
+		public void setId(int id) {
+			this.id = id;
+		}
+		public String getName() {
+			return name;
+		}
+		public void setName(String name) {
+			this.name = name;
+		}
+		public double getLatitude() {
+			return latitude;
+		}
+		public void setLatitude(double latitude) {
+			this.latitude = latitude;
+		}
+		public double getLongitude() {
+			return longitude;
+		}
+		public void setLongitude(double longitude) {
+			this.longitude = longitude;
+		}
+		public String getRegional() {
+			return regional;
+		}
+		public void setRegional(String regional) {
+			this.regional = regional;
+		}
+		
+		public void setIsRegional(boolean isRegional) {
+			this.isRegional = isRegional;
+		}
+		
+		public String getStrain() {
+			return strain;
+		}
+		public void setStrain(String strain) {
+			this.strain = strain;
+		}
+
+		public void setIsStrain(boolean isStrain) {
+			this.isStrain = isStrain;
+		}
+		
+		
+		public String getMetro() {
+			return metro;
+		}
+		public void setMetro(String metro) {
+			this.metro = metro;
+		}
+		
+		public void setIsMetro(boolean isMetro) {
+			this.isMetro = isMetro;
+		}
+		
+		
+		public String getAddress() {
+			return address;
+		}
+		public void setAddress(String address) {
+			this.address = address;
+		}
+		public int getCalcdist() {
+			return calcdist;
+		}
+		public void setCalcdist(int calcdist) {
+			this.calcdist = calcdist;
+		}
 	}
 	
-	
 }