Colors in objects, switch manual state

src/classes/HolonObject.java

@@ -1,5 +1,6 @@
 package classes;
 
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -7,7 +8,8 @@ import ui.controller.MultiPurposeController;
 import ui.model.idCounter;
 
 public class HolonObject extends CpsObject {
-
+	
+	private Color stateColor;
 	/* Array of all consumers */
 	private ArrayList<HolonElement> elements;
 	/* Array of all Indices of Elements */
@@ -53,9 +55,11 @@ public class HolonObject extends CpsObject {
 	public void setState() {
 		if (getCurrentEnergy() > 0) {
 			setState(3);
+			stateColor = Color.lightGray;
 		} else {
 			if (getCurrentEnergy() == 0) {
 				setState(0);
+				stateColor = Color.WHITE;
 			}
 		}
 	}
@@ -180,6 +184,21 @@ public class HolonObject extends CpsObject {
 	 */
 	public void setState(int st) {
 		this.state = st;
+		switch(st){
+			case 0: stateColor = Color.WHITE;
+					break;
+			
+			case 1: stateColor = new Color(230,120,100);
+					break;
+					
+			case 2: stateColor = Color.GREEN;
+					break;
+			
+			case 3: stateColor = Color.lightGray;
+					break;
+			
+			case 4: stateColor = Color.YELLOW;
+		}
 	}
 
 	public HolonElement searchElement(String name) {
@@ -217,4 +236,12 @@ public class HolonObject extends CpsObject {
 			return false;
 		}
 	}
+	
+	public void setColor(Color color){
+		stateColor = color;
+	}
+	
+	public Color getColor(){
+		return stateColor;
+	}
 }

src/classes/HolonSwitch.java

@@ -9,6 +9,11 @@ public class HolonSwitch extends CpsObject {
 	 * false
 	 */
 	boolean active;
+	
+	/*
+	 * true if switch has to be used manually
+	 */
+	boolean manualMode;
 
 	/*
 	 * Energy at each point of the graph with 50 predefined points. At the
@@ -91,4 +96,12 @@ public class HolonSwitch extends CpsObject {
 			this.activeAt[i] = active;
 		}
 	}
+	
+	public void setManualMode(boolean mode){
+		manualMode = mode;
+	}
+	
+	public boolean getManualMode(){
+		return manualMode;
+	}
 }

src/ui/view/MyCanvas.java

@@ -268,21 +268,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 							controller.getScale() + ((controller.getScale() / 20) * 2),
 							controller.getScale() + ((controller.getScale() / 20) * 2));
 				} else if (cps instanceof HolonObject) {
-					if (((HolonObject) cps).getState() == 4) {
-						g2.setColor(Color.YELLOW);
-					}
-					if (((HolonObject) cps).getState() == 3) {
-						g2.setColor(Color.lightGray);
-					}
-					if (((HolonObject) cps).getState() == 2) {
-						g2.setColor(Color.GREEN);
-					}
-					if (((HolonObject) cps).getState() == 1) {
-						g2.setColor(new Color(230,120,100));
-					}
-					if (((HolonObject) cps).getState() == 0) {
-						g2.setColor(Color.WHITE);
-					}
+					g2.setColor(((HolonObject) cps).getColor());
 
 					g2.fillRect(cps.getPosition().x - (controller.getScale() / 20),
 							cps.getPosition().y - (controller.getScale() / 20),