--- android/TrainInfoService/src/dk/thoerup/traininfoservice/LocateStations.java	2010/09/16 09:11:23	1059
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/LocateStations.java	2010/09/16 13:32:10	1060
@@ -1,8 +1,8 @@
 package dk.thoerup.traininfoservice;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.sql.SQLException;
-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -12,6 +12,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.simpleframework.xml.Serializer;
+import org.simpleframework.xml.core.Persister;
+
 /**
  * Servlet implementation class LocateStations
  */
@@ -40,8 +43,8 @@
 	}
 
 
-	protected List<StationBean> getStations(HttpServletRequest req) throws SQLException {
-		List<StationBean> stations = null;
+	protected StationBean getStations(HttpServletRequest req) throws SQLException {
+		StationBean stations = null;
 		if (req.getParameter("latitude") != null && req.getParameter("latitude") != null) {
 			
 			Statistics.getInstance().incrementStationLookupsLocation();
@@ -64,33 +67,19 @@
 	}
 
 
-	protected String formatStations(List<StationBean> stations)  {
-
-		StringBuffer buff = new StringBuffer();
-
-		//buff.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n");
-		buff.append("<stations>\n");	
-
+	protected String formatStations(StationBean stations) throws ServletException {
 
-		for (int i=0; i<stations.size(); i++) {			
-			StationBean station = stations.get(i);
+		Serializer serializer = new Persister();
 
-			buff.append("<station>\n");
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
 
-			buff.append("<id>").append( station.getId() ).append("</id>\n");
-			buff.append("<name>").append( station.getName() ) .append("</name>\n");
-			buff.append("<latitude>").append( station.getLatitude() ) .append("</latitude>\n");
-			buff.append("<longitude>").append( station.getLongitude() ) .append("</longitude>\n");			
-			buff.append("<regional>").append( station.getRegional() != null ) .append("</regional>\n");
-			buff.append("<strain>").append( station.getStrain() != null ) .append("</strain>\n");
-			buff.append("<metro>").append( station.getMetro() != null ).append("</metro>\n");
-			buff.append("<address>").append( station.getAddress() != null ?  station.getAddress() : "").append("</address>");				
-			buff.append("<calcdist>").append( station.getCalcdist() ) .append("</calcdist>\n");
-
-			buff.append("</station>\n");				
-		} 
-		buff.append("</stations>\n");
-		return buff.toString();
+		try {
+			serializer.write(stations, out);
+		} catch (Exception e) {
+			throw new ServletException(e);
+		}
+		
+		return out.toString();
 	}
 
 	@Override
@@ -98,7 +87,7 @@
 
 
 		try {
-			List<StationBean> stations = getStations(request);
+			StationBean stations = getStations(request);
 
 
 			if (stations != null){