jess vor 7 Jahren
Ursprung
Commit
4ee134ecfe
2 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
  1. 3 3
      src/ui/controller/UpdateController.java
  2. 2 2
      src/ui/view/HolonCanvas.java

+ 3 - 3
src/ui/controller/UpdateController.java

@@ -375,7 +375,7 @@ public class UpdateController {
 				Object[] tempProd = { "Total Production",
 						"" + getTotalProduction(new ArrayList<AbstractCpsObject>(sub.getObjects())) };
 				model.getPropertyTable().addRow(tempProd);
-				Object[] tempCons = { "Total Production",
+				Object[] tempCons = { "Total Consumption",
 						"" + getTotalConsumption(new ArrayList<AbstractCpsObject>(sub.getObjects())) };
 				model.getPropertyTable().addRow(tempCons);
 				Object[] tempEle = { "Nr. of Elements",
@@ -427,8 +427,8 @@ public class UpdateController {
 		return prod;
 	}
 
-	private float getTotalElements(ArrayList<AbstractCpsObject> objects) {
-		float val = 0;
+	private int getTotalElements(ArrayList<AbstractCpsObject> objects) {
+		int val = 0;
 		for (AbstractCpsObject obj : objects) {
 			if (obj instanceof HolonObject) {
 				val += ((HolonObject) obj).getElements().size();

+ 2 - 2
src/ui/view/HolonCanvas.java

@@ -309,8 +309,8 @@ public class HolonCanvas extends JPanel implements MouseWheelListener, MouseList
 		return prod;
 	}
 
-	private float getTotalElements(ArrayList<AbstractCpsObject> objects) {
-		float val = 0;
+	private int getTotalElements(ArrayList<AbstractCpsObject> objects) {
+		int val = 0;
 		for (AbstractCpsObject obj : objects) {
 			if (obj instanceof HolonObject) {
 				val += ((HolonObject) obj).getElements().size();