Flexibility in Table

src/classes/HolonElement.java

@@ -47,6 +47,13 @@ public class HolonElement implements LocalMode, GraphEditable{
     private boolean active;
     /** Gives us whether this element is flexible and can flexibly use any part of the energy in flexibleEnergyAvailable */
 
+    
+    
+    private Priority priority;
+
+	public enum Priority {
+    	Essential, High, Medium , Low
+    }
 
     
     /** Place where the Object is Stored */
@@ -99,6 +106,7 @@ public class HolonElement implements LocalMode, GraphEditable{
         initGraphPoints();
         sampleGraph();
         setId(id);
+        this.priority = Priority.Low;
     }
 
     /**
@@ -107,6 +115,7 @@ public class HolonElement implements LocalMode, GraphEditable{
      * @param element element to copy
      */
     public HolonElement(HolonElement element) {
+    	this.priority = element.getPriority();
     	setLocalPeriod(element.getLocalPeriod());
     	setUseLocalPeriod(element.isUsingLocalPeriod());
         setEleName(element.getEleName());
@@ -178,7 +187,14 @@ public class HolonElement implements LocalMode, GraphEditable{
     public float getEnergyPerElement() {
         return energyPerElement;
     }
+    public Priority getPriority() {
+    	return priority;
+    }
+    
     
+    public void setPriority(Priority priority) {
+    	this.priority = priority;
+    }    
     /**
      *  Check the HolonElemnet is a Producer
      * 	@return true when the energy used be each element is higher then 0

src/ui/controller/Control.java

@@ -559,6 +559,7 @@ public class Control {
         simulationManager.calculateStateForTimeStep(x, true);
         updateOutliner();
         updateFlexWindow();
+        this.updateCanvas();
     }
 
     /**
@@ -1022,6 +1023,7 @@ public class Control {
 	
 	public void updateCanvas() {
 		gui.repaintCanvas();
+		gui.triggerUpdateController(null);
 	}
 	public GUI getGui() {
 		return gui;

src/ui/controller/UpdateController.java

@@ -81,7 +81,7 @@ public class UpdateController {
 			}
 			for (HolonElement e1 : elemList) {
 				Object[] temp2 = { e1.getObjName(), e1.getId(), e1.getEleName(), e1.getEnergyPerElement(),
-						666.f, e1.getAmount(), e1.isActive(), false };
+						controller.getSimManager().getActualFlexManager().isAFlexInUseOfHolonElement(e1), e1.getAmount(), e1.isActive(), false };
 				table.addRow(temp2);
 			}
 
@@ -95,7 +95,7 @@ public class UpdateController {
 				
 				for (HolonElement e1 : elemList) {
 					Object[] temp2 = { e1.getId(), e1.getEleName(), e1.getEnergyPerElement(),
-							666.f, e1.getAmount(), e1.isActive(), false };
+							controller.getSimManager().getActualFlexManager().isAFlexInUseOfHolonElement(e1), e1.getAmount(), e1.isActive(), false };
 					table.addRow(temp2);
 				}
 			}

src/ui/view/FlexibleData.java

@@ -9,6 +9,9 @@ import java.awt.Color;
 import javax.swing.JSplitPane;
 import javax.swing.border.EmptyBorder;
 
+
+
+@Deprecated
 public class FlexibleData extends JPanel {
 	private JLabel name_lbl;
 	private JProgressBar prodVal;

src/ui/view/FlexiblePane.java

@@ -59,7 +59,7 @@ public class FlexiblePane extends JScrollPane implements ObjectListener {
 			float subCons = 0;
 			Color subColor = netColors.get(colorCounter);
 			for(HolonObject hl: sn.getObjects()){
-				
+				System.out.println("Delete Me");
 				FlexibleData tmp = new FlexibleData(hl.getName()+" "+hl.getId(),
 						666.f, 666.f, gridProd, gridCons);
 				tmp.getColorPanel().setBackground(subColor);

src/ui/view/GUI.java

@@ -253,10 +253,9 @@ public class GUI implements CategoryListener {
 			"Reset Categories");
 	private final JMenu mnLanguage = new JMenu("Language");
 	private final String[] columnNamesMulti = { "Object", "Nr.", "Device",
-			"Energy", "Flexible Energy Available", "Quantity", "Activated",
-			"Flexible" };
+			"Energy", "Flexibility active", "Quantity", "Activated" };
 	private final String[] columnNamesSingle = { "Nr.", "Device", "Energy",
-			"Flexible Energy Available", "Quantity", "Activated", "Flexible" };
+			"Flexibility active", "Quantity", "Activated" };
 	private final ArrayList<PropertyTable> tables = new ArrayList<>();
 	private final String[] comboBoxCat = { "Category", "Object", "Switch", "Battery" };
 	private final UpdateController updCon;
@@ -3055,7 +3054,7 @@ public class GUI implements CategoryListener {
 		model.getSingleTable().setValueAt(eleBTemp.getAmount(),
 				selectedValueBY, 4);
 		model.getSingleTable().setValueAt(
-				666.f,
+				controller.getSimManager().getActualFlexManager().isAFlexInUseOfHolonElement(eleBTemp),
 				selectedValueBY, 3);
 		model.getSingleTable().setValueAt(eleBTemp.getEnergyPerElement(),
 				selectedValueBY, 2);

src/ui/view/PropertyTable.java

@@ -12,6 +12,12 @@ public class PropertyTable extends DefaultTableModel {
 	@Override
 	public Class<?> getColumnClass(int columnIndex) {
 		Class clazz = String.class;
+		if(columnIndex == 3) {
+			clazz = Boolean.class;
+			return clazz;
+		}
+		
+		
 		if (getColumnCount() == 8) {
 			switch (columnIndex) {
 			case 6: