GlobalVariables in Model

src/classes/GlobalVariables.java

@@ -1,6 +0,0 @@
-package classes;
-
-public class GlobalVariables {
-	public static int SCALE = 50;
-	public static int SCALE_DIVIDED2 = SCALE/2;
-}

src/ui/controller/Control.java

@@ -25,13 +25,15 @@ public class Control {
 	private final CategoryController categoryController;
 	private final ObjectController objectController;
 	private final CanvasController canvasController;
-
+	private final GlobalController globalController;
+	
 	public Control(Model model) {
 		this.MODEL = model;
 		// this.ID = id;
 		this.categoryController = new CategoryController(model);
 		this.objectController = new ObjectController(model);
 		this.canvasController = new CanvasController(model);
+		this.globalController = new GlobalController(model);
 	}
 
 	/* Operations for Categories and Objects */
@@ -95,6 +97,13 @@ public class Control {
 
 	}
 
+	public int getScale(){
+		return globalController.getScale();
+	}
+	
+	public int getScaleDiv2(){
+		return globalController.getScaleDiv2();
+	}
 	////////// etc
 	/**
 	 * Getter for Model

src/ui/controller/GlobalController.java

@@ -0,0 +1,21 @@
+package ui.controller;
+
+import ui.model.Model;
+
+public class GlobalController {
+
+	private Model MODEL;
+
+	public GlobalController(Model model) {
+		this.MODEL = model;
+	}
+
+	public int getScale(){
+		return MODEL.getScale();
+	}
+	
+	public int getScaleDiv2(){
+		return MODEL.getScaleDiv2();
+	}
+
+}

src/ui/model/Model.java

@@ -13,6 +13,10 @@ import ui.controller.*;
 
 public class Model {
 
+	//Global Variables
+	public static int SCALE = 50;	//Picture Scale
+	public static int SCALE_DIV2 = SCALE/2;
+	
 	// ID of the Selected Object
 	private int selectedID = 0;
 	// eventuell wenn Canvasgröße gewählt werden kann
@@ -146,5 +150,23 @@ public class Model {
 	public int getSelectedObjectID(){
 		return selectedID;
 	}
+	
+	/**
+	 * Returns SCALE
+	 * 
+	 * @return SCALE
+	 */
+	public int getScale(){
+		return SCALE;
+	}
+	
+	/**
+	 * Returns SCALE_DIV2
+	 * 
+	 * @return SCALE_DIV2
+	 */
+	public int getScaleDiv2(){
+		return SCALE_DIV2;
+	}
 
 }

src/ui/view/GUI.java

@@ -42,7 +42,6 @@ import javax.swing.ImageIcon;
 
 import classes.Category;
 import classes.CpsObject;
-import classes.GlobalVariables;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
@@ -180,7 +179,7 @@ public class GUI implements CategoryListener {
 						for (CpsObject cps : cat.getObjects()) {
 							if (value.toString().compareTo(cps.getCompareName()) == 0) {
 								imgR = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
-										.getScaledInstance(GlobalVariables.SCALE, GlobalVariables.SCALE,
+										.getScaledInstance(controller.getScale(), controller.getScale(),
 												java.awt.Image.SCALE_SMOOTH);
 								if (imgR != null) {
 									label.setIcon(new ImageIcon(imgR));
@@ -190,7 +189,7 @@ public class GUI implements CategoryListener {
 						}
 					}
 				}
-				tree.setRowHeight(GlobalVariables.SCALE);
+				tree.setRowHeight(controller.getScale());
 				if (hasFocus) {
 					label.setForeground(new Color(0, 0, 255));
 					label.setOpaque(true);
@@ -249,7 +248,7 @@ public class GUI implements CategoryListener {
 						for (CpsObject cps : cat.getObjects()) {
 							if (actualObjectClicked.compareTo(cps.getCompareName()) == 0) {
 								img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
-										.getScaledInstance(GlobalVariables.SCALE, GlobalVariables.SCALE,
+										.getScaledInstance(controller.getScale(), controller.getScale(),
 												java.awt.Image.SCALE_SMOOTH);
 								tempCps = cps;
 								dragging = true;

src/ui/view/MyCanvas.java

@@ -30,7 +30,6 @@ import javax.swing.JPopupMenu;
 import javax.swing.JToolTip;
 
 import classes.CpsObject;
-import classes.GlobalVariables;
 import classes.HolonElement;
 import classes.HolonObject;
 import ui.controller.Control;
@@ -103,16 +102,16 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		// drawEdges
 		g2.setColor(Color.BLACK);
 		if (drawEdge)
-			g2.drawLine(tempCps.getPos().x + GlobalVariables.SCALE_DIVIDED2,
-					tempCps.getPos().y + GlobalVariables.SCALE_DIVIDED2, x, y);
+			g2.drawLine(tempCps.getPos().x + controller.getScaleDiv2(),
+					tempCps.getPos().y + controller.getScaleDiv2(), x, y);
 
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			for (CpsObject con : cps.getConnectedTo()) {
 				if (con.getID() != model.getSelectedObjectID() && cps.getID() != model.getSelectedObjectID())
-					g2.drawLine(cps.getPos().x + GlobalVariables.SCALE_DIVIDED2,
-							cps.getPos().y + GlobalVariables.SCALE_DIVIDED2,
-							con.getPos().x + GlobalVariables.SCALE_DIVIDED2,
-							con.getPos().y + GlobalVariables.SCALE_DIVIDED2);
+					g2.drawLine(cps.getPos().x + controller.getScaleDiv2(),
+							cps.getPos().y + controller.getScaleDiv2(),
+							con.getPos().x + controller.getScaleDiv2(),
+							con.getPos().y + controller.getScaleDiv2());
 			}
 		}
 
@@ -121,17 +120,17 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			for (CpsObject con : cps.getConnectedTo()) {
 				if (con.getID() == model.getSelectedObjectID())
-					g2.drawLine(cps.getPos().x + GlobalVariables.SCALE_DIVIDED2,
-							cps.getPos().y + GlobalVariables.SCALE_DIVIDED2,
-							con.getPos().x + GlobalVariables.SCALE_DIVIDED2,
-							con.getPos().y + GlobalVariables.SCALE_DIVIDED2);
+					g2.drawLine(cps.getPos().x + controller.getScaleDiv2(),
+							cps.getPos().y + controller.getScaleDiv2(),
+							con.getPos().x + controller.getScaleDiv2(),
+							con.getPos().y + controller.getScaleDiv2());
 			}
 		}
 
 		// Objects
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
-			g2.drawImage(img, cps.getPos().x, cps.getPos().y, GlobalVariables.SCALE, GlobalVariables.SCALE, null);
+			g2.drawImage(img, cps.getPos().x, cps.getPos().y, controller.getScale(), controller.getScale(), null);
 		}
 	}
 
@@ -163,7 +162,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			cx = cps.getPos().x;
 			cy = cps.getPos().y;
-			if (x - GlobalVariables.SCALE <= cx && y - GlobalVariables.SCALE <= cy && x >= cx && y >= cy) {
+			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
 				tempCps = cps;
 				if (e.isControlDown())
 					drawEdge = true;
@@ -188,7 +187,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			y = e.getY();
 
 			dragging = false;
-			tempCps.setPos(e.getX() - GlobalVariables.SCALE_DIVIDED2, e.getY() - GlobalVariables.SCALE_DIVIDED2);
+			tempCps.setPos(e.getX() - controller.getScaleDiv2(), e.getY() - controller.getScaleDiv2());
 			tempCps = null;
 		}
 
@@ -214,10 +213,10 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			repaint();
 		} else {
 			try {
-				tempCps.setPos(e.getX() - GlobalVariables.SCALE_DIVIDED2, e.getY() - GlobalVariables.SCALE_DIVIDED2);
+				tempCps.setPos(e.getX() - controller.getScaleDiv2(), e.getY() - controller.getScaleDiv2());
 				dragging = true;
-				selectRect.setLocation(tempCps.getPos().x - (GlobalVariables.SCALE / 20),
-						tempCps.getPos().y - (GlobalVariables.SCALE / 20));
+				selectRect.setLocation(tempCps.getPos().x - (controller.getScale() / 20),
+						tempCps.getPos().y - (controller.getScale() / 20));
 				objectTT.setTipText(tempCps.getName());
 				objectTT.setLocation(tempCps.getPos().x, tempCps.getPos().y);
 				repaint();
@@ -236,7 +235,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			cx = cps.getPos().x;
 			cy = cps.getPos().y;
-			if (x - GlobalVariables.SCALE <= cx && y - GlobalVariables.SCALE <= cy && x >= cx && y >= cy) {
+			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
 				objectTT.setTipText(cps.getName());
 				objectTT.setLocation(cx, cy);
 				on = true;
@@ -253,10 +252,10 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	 */
 	private void objectSelectionHighlighting() {
 		if (tempCps != null) {
-			selectRect.setBounds(tempCps.getPos().x - (GlobalVariables.SCALE / 20),
-					tempCps.getPos().y - (GlobalVariables.SCALE / 20),
-					GlobalVariables.SCALE + GlobalVariables.SCALE / 10,
-					GlobalVariables.SCALE + GlobalVariables.SCALE / 10);
+			selectRect.setBounds(tempCps.getPos().x - (controller.getScale() / 20),
+					tempCps.getPos().y - (controller.getScale() / 20),
+					controller.getScale() + controller.getScale() / 10,
+					controller.getScale() + controller.getScale() / 10);
 			controller.setSelectedObjectID(tempCps.getID());
 		} else {
 			controller.setSelectedObjectID(0);
@@ -271,7 +270,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			cx = cps.getPos().x;
 			cy = cps.getPos().y;
-			if (x - GlobalVariables.SCALE <= cx && y - GlobalVariables.SCALE <= cy && x >= cx && y >= cy) {
+			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
 				if (!cps.getConnectedTo().contains(tempCps)) {
 					cps.AddConnection(tempCps);
 					tempCps.AddConnection(cps);