--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/10/08 12:19:42	421
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/10/22 06:04:45	468
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -13,19 +14,19 @@
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
-import dk.thoerup.curcuitbreaker.CircuitBreaker;
-import dk.thoerup.curcuitbreaker.CircuitBreakerManager;
+import dk.thoerup.circuitbreaker.CircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreakerManager;
 import dk.thoerup.traininfoservice.DBConnection;
 
 public class DepartureFetcher {
 	
 	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
 	
-	TimeoutCache<Integer, List<DepartureBean>> cache = new TimeoutCache<Integer,List<DepartureBean>>(120 * 1000);
+	Map<Integer, List<DepartureBean>> cache = new TimeoutMap<Integer,List<DepartureBean>>(120 * 1000);
 	
 		
 	
-	public List<DepartureBean> cachedLookupDepartures(int stationID) throws Throwable {
+	public List<DepartureBean> cachedLookupDepartures(int stationID) throws Exception {
 
 		List<DepartureBean> list = cache.get(stationID);
 		
@@ -39,7 +40,7 @@
 	}
 		
 
-	public List<DepartureBean> lookupDepartures(int stationID) throws Throwable {
+	public List<DepartureBean> lookupDepartures(int stationID) throws Exception {
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
 		Connection conn = null;
@@ -76,7 +77,7 @@
 		return departureList;
 	}
 	
-	public List<DepartureBean> lookupDepartures(String stationcode, String type) throws Throwable {
+	public List<DepartureBean> lookupDepartures(String stationcode, String type) throws Exception {
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
@@ -188,7 +189,7 @@
 	}
 	
 	//test
-	public static void main(String args[]) throws Throwable {
+	public static void main(String args[]) throws Exception {
 		DepartureFetcher f = new DepartureFetcher();
 		List<DepartureBean> deps = f.lookupDepartures("AR", "FJRN");
 		for(DepartureBean d : deps) {