--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/04/19 12:49:31	649
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/04/19 19:04:34	650
@@ -1,9 +1,6 @@
 package dk.thoerup.traininfoservice.banedk;
 
 import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -25,7 +22,7 @@
 import org.w3c.dom.Element;
 
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
-import dk.thoerup.traininfoservice.DBConnection;
+import dk.thoerup.traininfoservice.StationDAO;
 
 /**
  * Servlet implementation class DepartureServlet
@@ -62,7 +59,7 @@
 
 		List<DepartureBean> beans;
 
-		String stationName = getStationName(station);
+		String stationName = StationDAO.getStationName(station);
 
 		try {
 			beans = fetcher.cachedLookupDepartures(station);
@@ -173,27 +170,4 @@
 		return xml;
 	}
 
-	protected String getStationName(int stationID) {
-		String station = "";
-
-		Connection conn = null;
-		try {
-			conn = DBConnection.getConnection();
-			Statement stmt = conn.createStatement();
-			ResultSet rs = stmt.executeQuery("SELECT name FROM trainstations WHERE id=" + stationID);
-			if (rs.next()) {
-				station = rs.getString(1);
-			}
-
-		} catch (Exception e) {	
-		} finally {
-			try {
-				if (conn != null && !conn.isClosed())
-					conn.close();
-			} catch (Exception e) {}
-		}
-
-		return station;
-	}
-
 }