--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/18 16:26:42	1302
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/19 11:52:39	1303
@@ -17,6 +17,7 @@
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
 import dk.thoerup.traininfoservice.Statistics;
+import dk.thoerup.traininfoservice.TraininfoSettings;;
 import dk.thoerup.traininfoservice.db.StationDAO;
 
 public class DepartureFetcher {
@@ -38,13 +39,12 @@
 	
 	StationDAO stationDao = new StationDAO();
 	
-	private boolean useAzureSite;
-	private int replyTimeout;
+
+	private TraininfoSettings settings;
 	
-	public DepartureFetcher(boolean azureSite, int cacheTimeout, int replyTimeout) {
-		this.replyTimeout = replyTimeout;
-		useAzureSite = azureSite;
-		cache = new TimeoutMap<String,DepartureBean>(cacheTimeout);
+	public DepartureFetcher(TraininfoSettings settings) {
+		this.settings = settings;
+		cache = new TimeoutMap<String,DepartureBean>( settings.getCacheTimeout() );
 	}
 	
 	
@@ -101,7 +101,7 @@
 	}
 	
 	public DepartureBean lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception {
-		if (useAzureSite == true) {
+		if ( settings.getUseAzureSite() == true) {
 			return lookupDeparturesAzureSite(stationcode, type, arrival);
 		} else { 
 			return lookupDeparturesWwwSite(stationcode, type, arrival);
@@ -143,7 +143,7 @@
 	    String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning";	    
 	    
 	    logger.fine("URI: " + uri);	    
-	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout);
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() );
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    Document page = (Document) breaker.invoke(wrapper);
@@ -249,7 +249,7 @@
 	    logger.fine("URI:" + uri);
 	    
 
-	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); 
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() ); 
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    Element page = (Element) breaker.invoke(wrapper);