Moves HolonObjectState

src/holeg/model/HolonObject.java

@@ -188,7 +188,7 @@ public class HolonObject extends AbstractCanvasObject {
      * STATE
      */
     private float actualEnergy;
-    
+    private HolonObjectState state;
     
     /** 
      * This Method returns the Energy of a HolonObject. Its sums all Energies from the HolonElements of the HolonObject that are ACTIVE.
@@ -210,8 +210,17 @@ public class HolonObject extends AbstractCanvasObject {
     	return actualEnergy;
     }
 
+	public enum HolonObjectState {
+		NO_ENERGY, NOT_SUPPLIED, SUPPLIED, PRODUCER, PARTIALLY_SUPPLIED, OVER_SUPPLIED
+	}
     
-    
+	public HolonObjectState getState() {
+		return state;
+	}
+	
+	public void setState(HolonObjectState state) {
+		this.state = state;
+	}
     
     
     
@@ -241,6 +250,7 @@ public class HolonObject extends AbstractCanvasObject {
 
         return sb.toString();
     }
+
     
 
 

src/holeg/preferences/ColorPreference.java

@@ -3,7 +3,7 @@ package holeg.preferences;
 import java.awt.Color;
 
 import holeg.model.Flexibility.FlexState;
-import holeg.ui.model.DecoratedHolonObject.HolonObjectState;
+import holeg.model.HolonObject.HolonObjectState;
 
 /**
  * A Class to save all colors in Holeg.

src/holeg/ui/model/Consumer.java

@@ -68,9 +68,6 @@ public class Consumer extends DecoratedHolonObject {
 	}
 
 	public float getSupplyBarPercentage() {
-//		double test = (getEnergyFromConsumingElemnets() > 0.001) ? (getEnergyFromNetwork()+ this.getEnergySelfSupplied())/getEnergyFromConsumingElemnets() : 1.0f;
-//		System.out.println("SupplyBar = [" +getEnergyFromConsumingElemnets() + "] is " + test);
-//		return (float) test;
 		return (getEnergyFromConsumingElemnets() > 0.001) ? (getEnergyFromNetwork()+ this.getEnergySelfSupplied())/getEnergyFromConsumingElemnets() : 1.0f;
 	}
 	public void setEnergySelfSupplied(float energySelfSupplied) {

src/holeg/ui/model/DecoratedGroupNode.java

@@ -7,8 +7,9 @@ import holeg.model.Edge;
 import holeg.model.Flexibility;
 import holeg.model.GroupNode;
 import holeg.model.HolonElement;
+import holeg.model.HolonObject;
+import holeg.model.HolonObject.HolonObjectState;
 import holeg.model.Node;
-import holeg.ui.model.DecoratedHolonObject.HolonObjectState;
 import jdk.jfr.Unsigned;
 
 /**

src/holeg/ui/model/DecoratedHolonObject.java

@@ -1,11 +1,10 @@
 package holeg.ui.model;
 
 import holeg.model.HolonObject;
+import holeg.model.HolonObject.HolonObjectState;
 
 public abstract class DecoratedHolonObject {
-	public enum HolonObjectState {
-		NO_ENERGY, NOT_SUPPLIED, SUPPLIED, PRODUCER, PARTIALLY_SUPPLIED, OVER_SUPPLIED
-	}
+
 	private HolonObject model;
 	private HolonObjectState state;
 	public DecoratedHolonObject(HolonObject objectToLookAt){

src/holeg/ui/model/DecoratedNetwork.java

@@ -6,7 +6,7 @@ import java.util.stream.Stream;
 import holeg.model.Edge;
 import holeg.model.HolonElement;
 import holeg.model.HolonObject;
-import holeg.ui.model.DecoratedHolonObject.HolonObjectState;
+import holeg.model.HolonObject.HolonObjectState;
 import holeg.ui.model.Model.FairnessModel;
 
 public class DecoratedNetwork {

src/holeg/ui/view/canvas/Canvas.java

@@ -32,6 +32,7 @@ import holeg.model.AbstractCanvasObject;
 import holeg.model.Edge;
 import holeg.model.GroupNode;
 import holeg.model.HolonObject;
+import holeg.model.HolonObject.HolonObjectState;
 import holeg.model.HolonSwitch;
 import holeg.model.Node;
 import holeg.preferences.ColorPreference;
@@ -39,7 +40,6 @@ import holeg.ui.controller.Control;
 import holeg.ui.model.Consumer;
 import holeg.ui.model.DecoratedGroupNode;
 import holeg.ui.model.DecoratedHolonObject;
-import holeg.ui.model.DecoratedHolonObject.HolonObjectState;
 import holeg.ui.model.DecoratedSwitch;
 import holeg.ui.model.DecoratedSwitch.SwitchState;
 import holeg.ui.model.ExitCable;

src/holeg/ui/view/information/FilterableGroupNode.java

@@ -9,6 +9,7 @@ import holeg.model.Edge;
 import holeg.model.Flexibility;
 import holeg.model.GroupNode;
 import holeg.model.HolonElement;
+import holeg.model.HolonObject.HolonObjectState;
 import holeg.model.Node;
 import holeg.ui.model.Consumer;
 import holeg.ui.model.DecoratedGroupNode;
@@ -17,7 +18,6 @@ import holeg.ui.model.DecoratedSwitch;
 import holeg.ui.model.ExitCable;
 import holeg.ui.model.Passiv;
 import holeg.ui.model.Supplier;
-import holeg.ui.model.DecoratedHolonObject.HolonObjectState;
 import jdk.jfr.Unsigned;
 
 /**

src/holeg/ui/view/information/HolonInformationPanel.java

@@ -33,6 +33,7 @@ import holeg.model.Flexibility;
 import holeg.model.GroupNode;
 import holeg.model.HolonElement;
 import holeg.model.HolonObject;
+import holeg.model.HolonObject.HolonObjectState;
 import holeg.preferences.ColorPreference;
 import holeg.ui.controller.Control;
 import holeg.ui.model.Consumer;
@@ -41,7 +42,6 @@ import holeg.ui.model.DecoratedHolonObject;
 import holeg.ui.model.Passiv;
 import holeg.ui.model.Supplier;
 import holeg.ui.model.VisualRepresentationalState;
-import holeg.ui.model.DecoratedHolonObject.HolonObjectState;
 import holeg.utility.math.decimal.Format;
 import holeg.ui.model.GuiSettings;