--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/03/31 17:13:19	1248
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/04 10:56:44	1255
@@ -16,8 +16,8 @@
 import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
+import dk.thoerup.traininfoservice.db.StationDAO;
 
 public class DepartureFetcher {
 	
@@ -75,7 +75,7 @@
 		StationEntry station = stationDao.getById(stationID);
 		
 		departureBean.stationName = station.getName();
-		
+
 		if (station.getRegional() != null && (type == FetchTrainType.REGIONAL||type == FetchTrainType.BOTH) ) {
 			DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival);
 			departureBean.entries.addAll( tempBean.entries );
@@ -92,7 +92,9 @@
 			logger.info("No departures found for station " + stationID);
 		}
 		
-		Collections.sort( departureBean.entries );
+		if (type == FetchTrainType.BOTH) { //if we have both S-tog and regional order by departure/arrival time 
+			Collections.sort( departureBean.entries );
+		}
 
 		
 		return departureBean;