--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/14 05:33:30	1046
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/16 15:30:27	1063
@@ -11,9 +11,11 @@
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+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.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.traininfoservice.StationBean;
 import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
 
@@ -63,27 +65,27 @@
 		
 		DepartureBean departureBean = new DepartureBean();
 		
-		StationBean station = stationDao.getById(stationID);
+		StationEntry station = stationDao.getById(stationID);
 		
 		departureBean.stationName = station.getName();
 		
 		if (station.getRegional() != null) {
 			DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival);
-			departureBean.departureEntries.addAll( tempBean.departureEntries );
+			departureBean.entries.addAll( tempBean.entries );
 			departureBean.notifications.addAll(tempBean.notifications);
 		}
 		
 		if (station.getStrain() != null) {
 			DepartureBean tempBean = lookupDepartures(station.getStrain(), TrainType.STOG, arrival);
-			departureBean.departureEntries.addAll( tempBean.departureEntries );
+			departureBean.entries.addAll( tempBean.entries );
 			departureBean.notifications.addAll(tempBean.notifications);
 		}		
 		
-		if (departureBean.departureEntries.size() == 0) {
+		if (departureBean.entries.size() == 0) {
 			logger.info("No departures found for station " + stationID);
 		}
 		
-		Collections.sort( departureBean.departureEntries );
+		Collections.sort( departureBean.entries );
 
 		
 		return departureBean;
@@ -131,7 +133,7 @@
 
 	    String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning";	    
 	    
-	    //logger.info("URI: " + uri);	    
+	    logger.fine("URI: " + uri);	    
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
@@ -193,7 +195,7 @@
 		    		
 		    		departure.setType(typeString);
 		    		
-		    		departureBean.departureEntries.add( departure );
+		    		departureBean.entries.add( departure );
 		    	}
 		    }
 	    } else {
@@ -235,7 +237,9 @@
 		
 			 	    	    
 	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
-	    logger.info("URI:" + uri);
+	    logger.fine("URI:" + uri);
+	    
+
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); 
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
@@ -301,7 +305,7 @@
 		    		
 		    		departure.setType(type);
 		    		
-		    		departureBean.departureEntries.add(departure);
+		    		departureBean.entries.add(departure);
 		    		
 		    		
 		    	}