--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureBean.java	2009/09/11 05:32:04	312
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureBean.java	2010/08/30 13:59:54	1021
@@ -1,98 +1,27 @@
-package dk.thoerup.traininfoservice.banedk;
-
-public class DepartureBean implements Comparable<DepartureBean> {
-	private String time;	
-	private int updated;	
-	private String trainNumber;
-	private String destination;
-	private String origin;	
-	private String location;	
-	private String status;	
-	private String note;
-	
-	
-	public String getTime() {
-		return time;
-	}
-	public void setTime(String time) {
-		this.time = time;
-	}
-	public int getUpdated() {
-		return updated;
-	}
-	public void setUpdated(int updated) {
-		this.updated = updated;
-	}
-	public String getTrainNumber() {
-		return trainNumber;
-	}
-	public void setTrainNumber(String trainNumber) {
-		this.trainNumber = trainNumber;
-	}
-	public String getDestination() {
-		return destination;
-	}
-	public void setDestination(String destination) {
-		this.destination = destination;
-	}
-	public String getOrigin() {
-		return origin;
-	}
-	public void setOrigin(String origin) {
-		this.origin = origin;
-	}
-	public String getLocation() {
-		return location;
-	}
-	public void setLocation(String location) {
-		this.location = location;
-	}
-	public String getStatus() {
-		return status;
-	}
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	public String getNote() {
-		return note;
-	}
-	public void setNote(String note) {
-		this.note = note;
-	}
-	
-	@Override
-	public int compareTo(DepartureBean otherBean) {
-		
-		int time1 = Integer.parseInt(time.replace(":", ""));
-		int time2 = Integer.parseInt(otherBean.time.replace(":", ""));
-		if (time1 > time2)
-			return 1;
-		else
-			return -1;
-		
-	}
-	
-	public String getUpdatedString() {
-		String updStr;
-		
-		switch (updated) {
-		case 1:
-			updStr = "&lt; 3 min";
-			break;
-		case 2:
-			updStr = "< 3 min";
-			break;
-		case 3:
-			updStr = "&gt; 10 min";
-			break;
-		case 4:
-			updStr = "No info";
-			break;
-		default:
-			updStr = "Unknown:" + updated;			
-		}
-		
-		return updStr;
-	}
-	
-}
+package dk.thoerup.traininfoservice.banedk;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class DepartureBean {
+	
+	String stationName;
+	
+	Set<String> notifications = new HashSet<String>();
+	List<DepartureEntry> departureEntries = new ArrayList<DepartureEntry>();
+	
+	public Set<String> getNotifications() {
+		return notifications;
+	}
+	
+	public List<DepartureEntry> getEntries() {
+		return departureEntries;
+	}
+	
+	public String getStationName() {
+		return stationName;
+	}
+	
+}