overhauling save and load routines

src/main/java/de/srsoftware/web4rail/moving/Car.java

@@ -1,6 +1,8 @@
 package de.srsoftware.web4rail.moving;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
+import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Date;
@@ -13,7 +15,7 @@ public class Car {
 	private static final String ID = "id";
 	private static final String NAME = "name";
 	private static final String LENGTH = "length";
-	private static HashMap<String,Car> cars = new HashMap<String, Car>();
+	static HashMap<String,Car> cars = new HashMap<String, Car>();
 	public int length;
 	private String name;
 	private String id;
@@ -24,10 +26,28 @@ public class Car {
 	
 	public Car(String name, String id) {
 		this.name = name;
-		this.id = id == null ? ""+new Date().getTime() : id;
-		cars.put(this.id, this);
+		if (id == null) {
+			try { // make sure multiple consecutive creations get different ids
+				Thread.sleep(1);
+			} catch (InterruptedException e) {}
+			id = ""+new Date().getTime();
+		}
+		this.id = id;
+		cars.put(id, this);
 	}
 	
+	public static Car get(String nameOrId) {
+		HashMap<String, Car> cs = cars;
+		Car car = cars.get(nameOrId);
+		if (car == null) {
+			for (Car c : cars.values()) {
+				if (c.name.equals(nameOrId)) car = c;
+			}
+		}
+		return car;
+	}
+
+	
 	public String id() {
 		return id;
 	}
@@ -44,10 +64,32 @@ public class Car {
 		return name;
 	}
 
+	public static void loadAll(String filename) throws IOException {
+		cars.clear();
+		BufferedReader file = new BufferedReader(new FileReader(filename));
+		String line = file.readLine();
+		while (line != null) {
+			JSONObject json = new JSONObject(line);
+			String name = json.getString(Car.NAME);
+			String id = json.getString(Car.ID);
+			Car car = json.has(Locomotive.LOCOMOTIVE) ? new Locomotive(name, id) : new Car(name,id);
+			car.load(json);
+			
+			line = file.readLine();
+		}
+		file.close();
+	}
+	
+	protected void load(JSONObject json) {
+		if (json.has(ID)) id = json.getString(ID);
+		if (json.has(LENGTH)) length = json.getInt(LENGTH);
+	}
+	
 	public static void saveAll(String filename) throws IOException {
 		BufferedWriter file = new BufferedWriter(new FileWriter(filename));
 		for (Entry<String, Car> entry: cars.entrySet()) {
-			file.write(entry.getValue().json()+"\n");
+			Car c = entry.getValue();
+			file.write(c.json()+"\n");
 		}
 		file.close();
 	}

src/main/java/de/srsoftware/web4rail/moving/Locomotive.java

@@ -5,13 +5,17 @@ import org.json.JSONObject;
 public class Locomotive extends Car {
 	
 	private static final String REVERSE = "reverse";
-	private static final String LOCOMOTIVE = "locomotive";
+	public static final String LOCOMOTIVE = "locomotive";
 	private boolean reverse = false;
 
 	public Locomotive(String name) {
 		super(name);
 	}
 	
+	public Locomotive(String name, String id) {
+		super(name,id);
+	}
+
 	@Override
 	public JSONObject json() {
 		JSONObject json = super.json();
@@ -20,7 +24,12 @@ public class Locomotive extends Car {
 		json.put(LOCOMOTIVE, loco);
 		return json;
 	}
-
+	
+	@Override
+	protected void load(JSONObject json) {
+		super.load(json);
+		if (json.has(REVERSE)) reverse = json.getBoolean(REVERSE);
+	}
 	public void setSpeed(int v) {
 		// TODO Auto-generated method stub
 		

src/main/java/de/srsoftware/web4rail/moving/Train.java

@@ -1,6 +1,8 @@
 package de.srsoftware.web4rail.moving;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
+import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Date;
@@ -38,8 +40,6 @@ public class Train {
 	private static final String NAME = "name";
 	private String name = null;
 	
-	private static final String BLOCK = "block";
-	private Block block = null;
 	
 	private static final String ROUTE = "route";
 	public Route route;	
@@ -56,7 +56,8 @@ public class Train {
 	private static final String LOCOS = "locomotives";	
 	private Vector<Locomotive> locos = new Vector<Locomotive>();
 
-
+	private Block block = null;
+		
 	private class Autopilot extends Thread{
 		@Override
 		public void run() {
@@ -90,16 +91,21 @@ public class Train {
 	private Autopilot autopilot = null;
 	
 	public Train(Locomotive loco) {
-		id = new Date().getTime();
+		this(loco,null);
+	}
+	
+	public Train(Locomotive loco, Long id) {
+		if (id == null) id = new Date().getTime();
+		this.id = id;
 		add(loco);
 		trains.put(id, this);
 	}
+
 	
 	private JSONObject json() {
 		JSONObject json = new JSONObject();
 		json.put(ID, id);
 		json.put(NAME,name);
-		if (block != null) json.put(BLOCK, block.id());
 		if (route != null) json.put(ROUTE, route.id());
 		if (direction != null) json.put(DIRECTION, direction);
 		json.put(PUSH_PULL, pushPull);
@@ -154,6 +160,11 @@ public class Train {
 		this.block = block;
 	}
 	
+	public static Train get(long id) {
+		return trains.get(id);
+	}
+
+	
 	public Train heading(Direction dir) {
 		direction = dir;
 		return this;
@@ -165,6 +176,28 @@ public class Train {
 		for (Car car : cars) result += car.length;
 		return result;
 	}
+	
+	public static void loadAll(String filename) throws IOException {
+		BufferedReader file = new BufferedReader(new FileReader(filename));
+		String line = file.readLine();
+		while (line != null) {
+			JSONObject json = new JSONObject(line);
+			
+			long id = json.getLong(ID);
+			
+			Train train = new Train(null,id);
+			train.load(json);			
+			
+			line = file.readLine();
+		}
+		file.close();
+	}
+
+	private void load(JSONObject json) {
+		pushPull = json.getBoolean(PUSH_PULL);
+		for (Object id : json.getJSONArray(LOCOS)) add((Locomotive) Car.get((String)id));
+		for (Object id : json.getJSONArray(CARS)) add(Car.get((String)id));
+	}
 
 	public String name() {
 		String result = (name != null ? name : locos.firstElement().name());