Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons

src/ui/view/FlexiblePane.java

@@ -30,6 +30,7 @@ public class FlexiblePane extends JScrollPane {
 		float gridCons = 0;
 		int counter = 1;
 		for(SubNet sn: controller.getSimManager().getSubNets()){
+			int index = flexPanel.getComponentCount();
 			float subProd = 0;
 			float subCons = 0;
 			for(HolonObject hl: sn.getObjects()){
@@ -40,7 +41,7 @@ public class FlexiblePane extends JScrollPane {
 			}
 			gridProd += subProd;
 			gridCons += subCons;
-			flexPanel.add(new FlexibleData("Subnet "+ counter, subProd, subCons));
+			flexPanel.add(new FlexibleData("Subnet "+ counter, subProd, subCons), index);
 			counter++;
 		}
 		if (flexPanel.getComponent(0) instanceof FlexibleData){

src/ui/view/StatisticGraphPanel.java

@@ -289,4 +289,12 @@ public class StatisticGraphPanel extends JPanel {
 		sGraph.calcMaximum();
 	}
 	
+	public StatisticGraph getStatGraph(){
+		return sGraph;
+	}
+	
+	public void setStatisticGraph(StatisticGraph sG){
+		this.sGraph = sG;
+	}
+	
 }