--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/20 20:04:05	1366
+++ 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;
 
@@ -13,7 +14,7 @@
 
 import dk.thoerup.android.traininfo.common.DepartureBean;
 import dk.thoerup.android.traininfo.common.DepartureEntry;
-import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
+import dk.thoerup.android.traininfo.common.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
 import dk.thoerup.genericjavautils.HttpUtil;
@@ -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() );
@@ -78,6 +113,7 @@
 		
 		departureBean.stationName = station.getName();
 
+		//TODO: FetchTraintype.Both should be removed some time after 0.9.5 release
 		if (station.getRegional() != null && (type == FetchTrainType.REGIONAL||type == FetchTrainType.BOTH) ) {
 			DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival);
 			departureBean.entries.addAll( tempBean.entries );
@@ -94,8 +130,9 @@
 			logger.info("No departures found for station " + stationID);
 		}
 		
+		//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);
 		}
 
 		
@@ -103,7 +140,7 @@
 	}
 	
 	public DepartureBean lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception {
-		if ( settings.getUseAzureSite() == true) {
+		if ( settings.getBackend() == TraininfoSettings.Backend.Azure) {
 			return lookupDeparturesAzureSite(stationcode, type, arrival);
 		} else { 
 			return lookupDeparturesMobileSite(stationcode, type, arrival);
@@ -241,7 +278,7 @@
 	    
 	    stationcode = URLEncoder.encode(stationcode,"ISO-8859-1");
 
-	    //String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning";	    
+	    
 	    String uri = "http://mobil.bane.dk/mobilStation.asp?artikelID=5332&stat_kode=" + stationcode + "&webprofil=" + typeString  +"&beskrivelse=&mode=ankomstafgang&ankomstafgang=" + arrivalDeparture + "&gemstation=&fuldvisning=1";
 	    logger.fine("URI: " + uri);	    
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() );