small refactoring

src/blackstart/controlAlgorithm.java

@@ -312,7 +312,7 @@ public class controlAlgorithm implements AddOn {
 			e.printStackTrace();
 		}
 		control.getModel().setCurIteration(curIteration);
-		if (blackstartRunning()) {
+		if (control.getSimManager().blackstartRunning()) {
 			if (!blackstartAlgo(curIteration)) {
 				// blackstart for this iteration was not successfull
 				deactivateBlackstart();
@@ -354,6 +354,8 @@ public class controlAlgorithm implements AddOn {
 	 * TODO: elements und amount nachschauen
 	 * TODO: batterie status wechesel fuehrt zu unterversorgung in GUI
 	 * TODO: wie soll ich unter / ueberversorgung handeln vorm blackstart
+	 * TODO: batterie modes wo nicht passiert? obwohl laden / entladen moeglich waere?
+	 * TODO: batterie laden prios? entfernung?
 	 *
 	 * @param curIteration
 	 * @return true or false depending on whether the blackstart was successful for
@@ -385,6 +387,7 @@ public class controlAlgorithm implements AddOn {
 		}
 	}
 
+	//TODO: das ist ja eigentlich doppelt
 	public ArrayList<StorageElement> getStorageElements() {
 		ArrayList<StorageElement> storageElements = new ArrayList<StorageElement>();
 		for (HolonObject holonObject : control.getModel().getAllHolonObjectsOnCanvas()) {
@@ -592,10 +595,6 @@ public class controlAlgorithm implements AddOn {
 		}
 	}
 
-	private boolean blackstartRunning() {
-		return control.getSimManager().blackstartRunning();
-	}
-
 	private void activateBlackstart() {
 		for (HolonElement ele : powerPlant.getElements()) {
 			if (ele.getEleName().equals("Blackstart")) {

src/ui/controller/StorageProductionController.java

@@ -7,17 +7,10 @@ import java.util.ArrayList;
 public class StorageProductionController {
 	private ArrayList<StorageElement> storages;
 
-//	public StorageProductionController(){}
-
 	public StorageProductionController(ArrayList<StorageElement> storages) {
 		this.storages = storages;
 	}
 
-
-//	public void setStorages(ArrayList<StorageElement> storages) {
-//		this.storages = storages;
-//	}
-
 	public float currentPossibleStorageProduction() {
 		float possibleEnergy = 0;
 		for (StorageElement so : storages) {