--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/07/08 15:39:44	1561
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/07/08 16:26:09	1562
@@ -4,6 +4,7 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Map;
 import java.util.logging.Logger;
 
@@ -44,6 +45,40 @@
 
 	private TraininfoSettings settings;
 	
+	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;
+
+				}
+				
+		}
+		
+	};
+	
 	public DepartureFetcher(TraininfoSettings settings) {
 		this.settings = settings;
 		cache = new TimeoutMap<String,DepartureBean>( settings.getCacheTimeout() );
@@ -97,7 +132,7 @@
 		
 		//TODO: FetchTraintype.Both should be removed some time after 0.9.5 release
 		if (type == FetchTrainType.BOTH) { //if we have both S-tog and regional order by departure/arrival time 
-			Collections.sort( departureBean.entries );
+			Collections.sort( departureBean.entries, departureTimeComparator);
 		}