controller is null bug fixed

diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java
index 78f17b09b91f36893b3e69cd5883bd40d86c1f8b..81cf64438dcee025f7b52392bc165d5be25b075a 100644 (file)
--- a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java
+++ b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java
@@ -81,34 +81,40 @@ public class FuelStationUIController {
     public void initialize() {
         // Load all tabs manually and keep controllers
         comboFuelTypes.getItems().setAll(FuelType.values());
-        // loadTab("/ui/ResultTab.fxml", resultTabContainer,
-        // (ResultTabController controller) -> resultTabController = controller);
-        // loadTab("/ui/PriceTab.fxml", priceTabContainer,
-        // (PriceTabController controller) -> priceTabController = controller);
-        // loadTab("/ui/StockTab.fxml", stockTabContainer,
-        // (StockTabController controller) -> stockTabController = controller);
-        // loadTab("/ui/SearchTab.fxml", searchTabContainer,
-        // (SearchTabController controller) -> searchTabController = controller);
-        // loadTab("/ui/NewStationTab.fxml", newStationTabContainer,
-        // (NewStationTabController controller) -> newStationTabController =
-        // controller);
-        // loadTab("/ui/OverviewTab.fxml", overviewTabContainer,
-        // (OverviewTabController controller) -> overviewTabController = controller);
-
         try {
-            loadTab("/ui/ResultTab.fxml", resultTabContainer, (ResultTabController c) -> resultTabController = c);
-            loadTab("/ui/PriceTab.fxml", priceTabContainer, (PriceTabController c) -> priceTabController = c);
-            loadTab("/ui/StockTab.fxml", stockTabContainer, (StockTabController c) -> stockTabController = c);
-            loadTab("/ui/SearchTab.fxml", searchTabContainer, (SearchTabController c) -> searchTabController = c);
+
+            loadTab("/ui/ResultTab.fxml", resultTabContainer, (ResultTabController c) -> {
+                resultTabController = c;
+                resultTabController.setParentController(this);
+            });
+            loadTab("/ui/PriceTab.fxml", priceTabContainer, (PriceTabController c) -> {
+                priceTabController = c;
+                priceTabController.setParentController(this);
+            });
+            loadTab("/ui/StockTab.fxml", stockTabContainer, (StockTabController c) -> {
+                stockTabController = c;
+                stockTabController.setParentController(this);
+            });
+            loadTab("/ui/SearchTab.fxml", searchTabContainer, (SearchTabController c) -> {
+                searchTabController = c;
+                searchTabController.setParentController(this);
+            });
             loadTab("/ui/NewStationTab.fxml", newStationTabContainer,
-                    (NewStationTabController c) -> newStationTabController = c);
+                    (NewStationTabController c) -> {
+                        newStationTabController = c;
+                        newStationTabController.setParentController(this);
+                    });
             loadTab("/ui/OverviewTab.fxml", overviewTabContainer,
-                    (OverviewTabController c) -> overviewTabController = c);
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
+                    (OverviewTabController c) -> {
+                        overviewTabController = c;
+                        overviewTabController.setParentController(this);
+                        overviewTabController.refresh();
+                    });
+
+        } catch (Exception e) {
             e.printStackTrace();
+            // TODO: handle exception
         }
-
     }
 
     // Generic loader helper

diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/OverviewTabController.java b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/OverviewTabController.java
index 2ce3c4682768b789c7b57a943d31422ddc29f7b6..354f5cf080fbcd241256733a55dc18ef7144ceaf 100644 (file)
--- a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/OverviewTabController.java
+++ b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/OverviewTabController.java
@@ -42,8 +42,6 @@ public class OverviewTabController {
         colAmount.setCellValueFactory(data -> new SimpleFloatProperty(data.getValue().amount()).asObject());
         colCapacity.setCellValueFactory(data -> new SimpleIntegerProperty(data.getValue().capacity()).asObject());
         colPrice.setCellValueFactory(data -> new SimpleFloatProperty(data.getValue().price()).asObject());
-
-        refresh();
     }
 
     @FXML

diff --git a/src/main/resources/ui/FuelStationUI.fxml b/src/main/resources/ui/FuelStationUI.fxml
index 1856b65891ddc31002c10a63cce6d29b0cd3aa91..f06036ee8b78f2408d4c252fcf3a32c3b0be2a18 100644 (file)
--- a/src/main/resources/ui/FuelStationUI.fxml
+++ b/src/main/resources/ui/FuelStationUI.fxml
@@ -50,7 +50,7 @@
     <bottom>
         <VBox>
             <Label text="Output:" />
-            <TextArea fx:id="outputArea" editable="false" wrapText="true" prefRowCount="5" />
+            <TextArea fx:id="outputArea" editable="false" wrapText="true" prefRowCount="10" />
         </VBox>
     </bottom>
 </BorderPane>
\ No newline at end of file