Canvas size wird gespeichert

src/tests/PraktikumHolonsTestLoadAndStoreController.java

@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
 
 import ui.controller.CanvasController;
 import ui.controller.CategoryController;
+import ui.controller.GlobalController;
 import ui.controller.LoadController;
 import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
@@ -40,9 +41,10 @@ public class PraktikumHolonsTestLoadAndStoreController {
 	protected PraktikumHolonsAdapter adapter;
 	protected Model model;
 	protected MultiPurposeController mp;
-	protected CategoryController cg; 
+	protected CategoryController cg;
 	protected CanvasController cvs;
 	protected ObjectController obj;
+	protected GlobalController global;
 	protected StoreController storeController;
 	protected LoadController loadController;
 	protected IdCounter id;
@@ -60,7 +62,7 @@ public class PraktikumHolonsTestLoadAndStoreController {
 		cvs = new CanvasController(model, mp);
 		obj = new ObjectController(model, mp);
 		storeController = new StoreController(model);
-		loadController = new LoadController(model, cg, cvs, obj, mp);
+		loadController = new LoadController(model, cg, cvs, obj, global, mp);
 		// cg.initCategories();
 		// obj.initHolonElements();
 		File file = new File(path);

src/ui/controller/Control.java

@@ -56,7 +56,7 @@ public class Control {
 		this.globalController = new GlobalController(model);
 		this.storeController = new StoreController(model);
 		this.loadController = new LoadController(model, categoryController, canvasController, objectController,
-				multiPurposeController);
+				globalController, multiPurposeController);
 		this.simulationManager = new SimulationManager(model);
 		this.autoSaveController = new AutoSaveController(model);
 		this.consoleController = new ConsoleController(model);

src/ui/controller/LoadController.java

@@ -41,6 +41,7 @@ public class LoadController {
 	private CategoryController cgC;
 	private CanvasController cvsC;
 	private ObjectController objC;
+	private GlobalController global;
 	private MultiPurposeController mpC;
 
 	/**
@@ -58,11 +59,12 @@ public class LoadController {
 	 *            MultiPurposeController
 	 */
 	public LoadController(Model model, CategoryController cg, CanvasController cvs, ObjectController obj,
-			MultiPurposeController mp) {
+			GlobalController global, MultiPurposeController mp) {
 		this.model = model;
 		this.cgC = cg;
 		this.cvsC = cvs;
 		this.objC = obj;
+		this.global = global;
 		this.mpC = mp;
 
 	}
@@ -107,6 +109,10 @@ public class LoadController {
 				readCategory((JSONArray) json.get(key));
 			else if (key.equals("ID"))
 				IdCounter.setCounter(Integer.parseInt(json.get(key.toString()).toString()));
+			else if	(key.equals("SIZEX"))
+				global.setCanvasX(Integer.parseInt(json.get(key.toString()).toString()));
+			else if (key.equals("SIZEY"))
+				global.setCanvasY(Integer.parseInt(json.get(key.toString()).toString()));
 			else if (key.toString().contains("CGO") || key.toString().contains("CVSO"))
 				obj.add(key.toString());
 			else if (key.toString().contains("CGE") || key.toString().contains("CVSE"))
@@ -287,7 +293,8 @@ public class LoadController {
 	/**
 	 * Get the Next Element from an Iterator.
 	 * 
-	 * @param i Iterator
+	 * @param i
+	 *            Iterator
 	 * @return next Element from the Iterator
 	 */
 	public String next(Iterator<Object> i) {
@@ -297,7 +304,8 @@ public class LoadController {
 	/**
 	 * converting saved Integers into Booleans.
 	 * 
-	 * @param x integer
+	 * @param x
+	 *            integer
 	 * @return boolean
 	 */
 	public boolean convert(int x) {