--- android/TrainInfoServiceGoogle/src/dk/thoerup/traininfoservice/StationDAO.java	2010/09/21 16:45:24	1092
+++ android/TrainInfoServiceGoogle/src/dk/thoerup/traininfoservice/StationDAO.java	2010/09/21 20:10:46	1093
@@ -7,8 +7,12 @@
 import java.sql.Statement;
 import java.util.logging.Logger;
 
+import javax.jdo.PersistenceManager;
+
 import dk.thoerup.android.traininfo.common.StationBean;
 import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
+import dk.thoerup.traininfoservice.jdo.JdoStationBean;
+import dk.thoerup.traininfoservice.jdo.PMF;
 
 public class StationDAO {
 	final static int LOCATION_LIMIT = 8;
@@ -45,32 +49,16 @@
 	}
 
 
-	public StationEntry getById(int id) throws SQLException {
-		String SQL = "SELECT id,name,latitude,longitude,stationcode_fjrn,stationcode_stog,stationcode_metro,address,0.0 " +
-		"FROM trainstations WHERE id=" + id + " AND enabled=true";
-
-		Connection conn = null;
-		Statement stmt = null;
-		ResultSet res = null;
-		StationEntry result;
+	public JdoStationBean getById(int id) throws SQLException {
 
+		PersistenceManager pm = null;
+		
 		try {
-			conn = DBConnection.getConnection();
-
-			stmt = conn.createStatement();
-			res = stmt.executeQuery(SQL);		
-			res.next();
-			result = convertSingleRow(res);
+			pm = PMF.get().getPersistenceManager();
+			return pm.getObjectById(JdoStationBean.class, new Integer(id) );
 		} finally {
-			if (res != null)
-				res.close();
-			if (stmt != null)
-				stmt.close();
-			if (conn != null)
-				conn.close();
+			pm.close();
 		}
-
-		return result;
 	}
 
 	/*