bla

src/api/CpsAPI.java

@@ -1,4 +1,4 @@
-package api;
+package API;
 
 import java.awt.Color;
 import java.util.ArrayList;

src/api/CpsAlgorithm.java

@@ -1,4 +1,4 @@
-package api;
+package API;
 /**
  * API Class for the CpsAlgorithm.
  * 

src/interfaces/CategoryListener.java

@@ -1,4 +1,4 @@
-package interfaces;
+package Interfaces;
 
 import java.util.ArrayList;
 

src/interfaces/ObjectListener.java

@@ -1,4 +1,4 @@
-package interfaces;
+package Interfaces;
 
 import java.util.ArrayList;
 

src/tests/PraktikumHolonsTestGlobalController.java

@@ -19,7 +19,6 @@ public class PraktikumHolonsTestGlobalController {
 	protected Model model;
 	protected GlobalController controller;
 
-
 	/**
 	 * Setup.
 	 */

src/ui/controller/CanvasController.java

@@ -9,8 +9,8 @@ import classes.AbstractCpsObject;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.Position;
-import interfaces.CategoryListener;
-import interfaces.ObjectListener;
+import Interfaces.CategoryListener;
+import Interfaces.ObjectListener;
 import ui.model.Model;
 
 /**

src/ui/controller/CategoryController.java

@@ -8,7 +8,7 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
-import interfaces.CategoryListener;
+import Interfaces.CategoryListener;
 import ui.model.Model;
 
 /**

src/ui/controller/Control.java

@@ -12,7 +12,7 @@ import classes.CpsNode;
 import classes.AbstractCpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
-import interfaces.CategoryListener;
+import Interfaces.CategoryListener;
 import ui.model.Model;
 import ui.view.MyCanvas;
 

src/ui/controller/GlobalController.java

@@ -98,4 +98,31 @@ public class GlobalController {
 		model.setIsSimulation(b);
 	}
 
+	/**
+	 * @return the cANVAS_X
+	 */
+	public int getCANVAS_X() {
+		return model.getCANVAS_X();
+	}
+
+	/**
+	 * @param cANVAS_X the cANVAS_X to set
+	 */
+	public void setCANVAS_X(int cANVAS_X) {
+		model.setCANVAS_X(cANVAS_X);
+	}
+
+	/**
+	 * @return the cANVAS_Y
+	 */
+	public int getCANVAS_Y() {
+		return model.getCANVAS_Y();
+	}
+
+	/**
+	 * @param cANVAS_Y the cANVAS_Y to set
+	 */
+	public void setCANVAS_Y(int cANVAS_Y) {
+		model.setCANVAS_Y(cANVAS_Y);
+	}
 }

src/ui/controller/StoreController.java

@@ -54,6 +54,8 @@ public class StoreController {
 
 		json.put("MODE", "ALL");
 		json.put("ID", IdCounter.getCounter());
+		json.put("SIZEX", model.getCANVAS_X());
+		json.put("SIZEY", model.getCANVAS_Y());
 		writeCategory(json);
 		writeCategoryObjects(json);
 		writeCanvasObjects(json);

src/ui/model/Model.java

@@ -9,8 +9,8 @@ import classes.Category;
 import classes.CpsEdge;
 import classes.AbstractCpsObject;
 import classes.HolonElement;
-import interfaces.CategoryListener;
-import interfaces.ObjectListener;
+import Interfaces.CategoryListener;
+import Interfaces.ObjectListener;
 import ui.view.Console;
 
 /**
@@ -23,6 +23,8 @@ import ui.view.Console;
 public class Model {
 
 	// Global Variables
+	private int CANVAS_X;
+	private int CANVAS_Y;
 	private static int sCALE = 50; // Picture Scale
 	private static int sCALEdIV2 = sCALE / 2;
 	private static final int ITERATIONS = 100;
@@ -517,4 +519,32 @@ public class Model {
 	public boolean getIsSimulation() {
 		return this.isSimulation;
 	}
+
+	/**
+	 * @return the cANVAS_X
+	 */
+	public int getCANVAS_X() {
+		return CANVAS_X;
+	}
+
+	/**
+	 * @param cANVAS_X the cANVAS_X to set
+	 */
+	public void setCANVAS_X(int cANVAS_X) {
+		CANVAS_X = cANVAS_X;
+	}
+
+	/**
+	 * @return the cANVAS_Y
+	 */
+	public int getCANVAS_Y() {
+		return CANVAS_Y;
+	}
+
+	/**
+	 * @param cANVAS_Y the cANVAS_Y to set
+	 */
+	public void setCANVAS_Y(int cANVAS_Y) {
+		CANVAS_Y = cANVAS_Y;
+	}
 }

src/ui/view/GUI.java

@@ -69,7 +69,7 @@ import classes.HolonSwitch;
 import classes.HolonTransformer;
 import classes.IdCounter;
 import classes.IdCounterElem;
-import interfaces.CategoryListener;
+import Interfaces.CategoryListener;
 import ui.controller.Control;
 import ui.model.Model;;