--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlTimetableProvider.java	2009/10/02 19:01:53	390
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlTimetableProvider.java	2009/10/03 10:55:43	391
@@ -4,31 +4,63 @@
 import java.util.List;
 
 import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
+
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import android.util.Log;
 import dk.thoerup.traininfo.TimetableBean;
+import dk.thoerup.traininfo.util.AndroidTimeoutCache;
 import dk.thoerup.traininfo.util.DownloadUtil;
 import dk.thoerup.traininfo.util.XmlUtil;
 
 public class XmlTimetableProvider implements TimetableProvider {
 	
-	List<TimetableBean> timetables = new ArrayList<TimetableBean>();
+	final static int CACHE_TIMEOUT = 60*1000;
+	
+	List<TimetableBean> timetables;
 
+	AndroidTimeoutCache<String,List<TimetableBean>> departureCache = new AndroidTimeoutCache<String,List<TimetableBean>>(CACHE_TIMEOUT);
+	
 	@Override
-	public List<TimetableBean> getTimetable() {
-		return timetables;
+	public List<TimetableBean> getTimetable(String trainID) {
+		List<TimetableBean> list = departureCache.get(trainID);
+		
+		if (list == null) {			
+			list = new ArrayList<TimetableBean>();
+		} 
+		
+		return list;
 	}
 
 	@Override
 	public boolean lookupTimetable(String trainID) {
+		boolean success;
+		
+		timetables = departureCache.get(trainID);
+	
+		if (timetables == null) {			
+			success = lookupTimetableWorker(trainID);
+			
+			if (success) {			
+				departureCache.put(trainID, timetables);
+			}
+			
+		} else {
+			Log.i("XmlTimetableProvider", "cache hit !!!");
+			success = true;
+		}		
+		
+		return success;
+	}
+	
+
+	public boolean lookupTimetableWorker(String trainID) {
 		boolean success = false;
 		String url = XmlUtil.SERVICE_BASE + "/TimetableServlet?train=" + trainID.replace(" ", "%20") ;
 		Log.i("url", url);
 		try {
-			timetables.clear();
+			timetables = new ArrayList<TimetableBean>();
 			
 			String xml = DownloadUtil.getContentString(url, 15000, "ISO-8859-1");