--- android/TrainInfo/src/dk/thoerup/traininfo/StationBean.java	2010/02/01 16:49:02	572
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationBean.java	2010/05/18 14:02:13	731
@@ -15,11 +15,10 @@
 	private double latitude;
 	private int distance;
 	private String address;
-	private String code;
 	
-	private boolean _isRegional = true;
-	private boolean _isSTrain = true;
-	private boolean _isMetro = true; 
+	private boolean isRegional;
+	private boolean isSTrain;
+	private boolean isMetro; 
 	
 	public StationBean() {		
 	}
@@ -49,14 +48,6 @@
 		return address;
 	}
 
-	public String getCode() {
-		return code;
-	}
-	
-
-	public void setCode(String code) {
-		this.code = code;
-	}
 
 	public void setName(String name) {
 		this.name = name;
@@ -87,27 +78,61 @@
 	}
 
 	public boolean isRegional() {
-		return _isRegional;
+		return isRegional;
 	}
 
 	public void setRegional(boolean isRegional) {
-		_isRegional = isRegional;
+		this.isRegional = isRegional;
 	}
 
 	public boolean isSTrain() {
-		return _isSTrain;
+		return isSTrain;
 	}
 
 	public void setSTrain(boolean isSTrain) {
-		_isSTrain = isSTrain;
+		this.isSTrain = isSTrain;
 	}
 
 	public boolean isMetro() {
-		return _isMetro;
+		return isMetro;
 	}
 
 	public void setMetro(boolean isMetro) {
-		_isMetro = isMetro;
-	}	
+		this.isMetro = isMetro;
+	}
 	
+	public String toCSV() {
+		StringBuilder sb = new StringBuilder();
+		
+		sb.append(id).append(";");
+		sb.append(name).append(";");
+		sb.append(latitude).append(";");
+		sb.append(longitude).append(";");
+		sb.append(distance).append(";");
+		sb.append(address).append(";");
+		sb.append(isRegional).append(";");
+		sb.append(isSTrain).append(";");
+		sb.append(isMetro).append(";");
+		
+		return sb.toString();
+	}
+	
+	public static StationBean fromCSV(String csv) {
+		String parts[] = csv.split(";");
+		
+		StationBean st = new StationBean();
+		
+		st.id = Integer.parseInt( parts[0] );
+		st.name = parts[1];
+		st.latitude = Double.parseDouble(parts[2]);
+		st.longitude = Double.parseDouble(parts[3]);
+		st.distance = Integer.parseInt(parts[4]);
+		st.address = parts[5];
+		st.isRegional = Boolean.parseBoolean(parts[6]);
+		st.isSTrain = Boolean.parseBoolean(parts[7]);
+		st.isMetro = Boolean.parseBoolean(parts[8]);
+		
+		return st;
+		
+	}
 }