--- android/TrainInfoServiceGoogle/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/07/08 17:18:50	1563
+++ android/TrainInfoServiceGoogle/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/07/08 17:22:42	1564
@@ -4,6 +4,7 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -42,6 +43,38 @@
 	private boolean useAzureSite;
 	private int replyTimeout;
 	
+	Comparator<DepartureEntry> departureTimeComparator = new Comparator<DepartureEntry>() {
+
+		@Override
+		public int compare(DepartureEntry arg0, DepartureEntry arg1) {		
+				String timeStr1 = arg0.getTime().replace(":","").trim();
+				String timeStr2 = arg1.getTime().replace(":","").trim();
+				
+				int time1 = 0;
+				int time2 = 0;
+				
+				if (timeStr1.length() > 0)
+					time1 = Integer.parseInt(timeStr1);
+				
+				if (timeStr2.length() > 0)
+					time2 = Integer.parseInt(timeStr2);
+				
+				//work correctly when clock wraps around at midnight
+				if (Math.abs(time1-time2) < 1200) {
+					if (time1 > time2)
+						return 1;
+					else
+						return -1;
+				} else {
+					if (time1 < time2)
+						return 1;
+					else
+						return -1;
+
+				}		
+		}
+	};
+	
 	@SuppressWarnings("unchecked")
 	public DepartureFetcher(boolean azureSite, int cacheTimeout, int replyTimeout) {
 		this.replyTimeout = replyTimeout;
@@ -104,7 +137,7 @@
 			logger.info("No departures found for station " + stationID);
 		}
 		
-		Collections.sort( departureBean.entries );
+		Collections.sort( departureBean.entries, departureTimeComparator );
 
 		
 		return departureBean;