changed all View Controllers to use Dependency Injection for Model and Controller

Author: JSchraff

src/main/java/de/doubleslash/keeptime/Main.java

@@ -33,7 +33,6 @@
 import de.doubleslash.keeptime.common.FontProvider;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
-import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Settings;
@@ -74,7 +73,6 @@ public class Main extends Application {
    private Stage popupViewStage;
 
    private Model model;
-   private Controller controller;
 
    private ViewController viewController;
 
@@ -89,7 +87,7 @@ public void init() throws Exception {
       springContext = SpringApplication.run(Main.class);
       // TODO test if everywhere is used the same model
       model = springContext.getBean(Model.class);
-      controller = springContext.getBean(Controller.class);
+      model.setSpringContext(springContext);
    }
 
    @Override
@@ -215,6 +213,7 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
       // Load root layout from fxml file.
       final FXMLLoader loader = new FXMLLoader();
       loader.setLocation(Resources.getResource(RESOURCE.FXML_VIEW_POPUP_LAYOUT));
+      loader.setControllerFactory(springContext::getBean);
       final Parent popupLayout = loader.load();
       popupViewStage.initStyle(StageStyle.TRANSPARENT);
       // Show the scene containing the root layout.
@@ -226,8 +225,6 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
       popupViewStage.setAlwaysOnTop(true);
       final ViewControllerPopup viewControllerPopupController = loader.getController();
       viewControllerPopupController.setStage(popupViewStage);
-      viewControllerPopupController.setControllerAndModel(controller, model);
-      viewControllerPopupController.secondInitialize();
 
       globalScreenListener.setViewController(viewControllerPopupController);
    }
@@ -264,8 +261,6 @@ public void handle(final WindowEvent event) {
       viewController = loader.getController();
       // Give the controller access to the main app.
       viewController.setStage(primaryStage);
-      viewController.setController(controller, model);
-      viewController.secondInitialize();
 
    }
 

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -188,13 +188,13 @@ public void editProject(final Project projectToBeUpdated, final Project newValue
     * Changes the indexes of the originalList parameter to have a consistent order.
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                          list of all projects to adapt the indexes for
     * @param changedProject
-    *           the project which has changed which already has the new index
+    *                          the project which has changed which already has the new index
     * @param oldIndex
-    *           the old index of the changed project
+    *                          the old index of the changed project
     * @param newIndex
-    *           the new index of the changed project (which the projects also already has)
+    *                          the new index of the changed project (which the projects also already has)
     * @return all projects whose index has been adapted
     */
    List<Project> resortProjectIndexes(final List<Project> originalList, final Project changedProject,
@@ -231,9 +231,9 @@ List<Project> resortProjectIndexes(final List<Project> originalList, final Proje
     * Decreases all indexes by one, after the removed index
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                        list of all projects to adapt the indexes for
     * @param removedIndex
-    *           the index which has been removed
+    *                        the index which has been removed
     * @return all projects whose index has been adapted
     */
    List<Project> adaptProjectIndexesAfterRemoving(final List<Project> originalList, final int removedIndex) {

src/main/java/de/doubleslash/keeptime/model/Model.java

@@ -19,6 +19,7 @@
 import java.util.Comparator;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.model.repos.ProjectRepository;
@@ -77,6 +78,8 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
    public final ObjectProperty<Boolean> displayProjectsRight = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Boolean> hideProjectsOnMouseExit = new SimpleObjectProperty<>(true);
 
+   private ConfigurableApplicationContext springContext;
+
    public void setWorkRepository(final WorkRepository workRepository) {
       this.workRepository = workRepository;
    }
@@ -128,4 +131,12 @@ public ObservableList<Project> getAvailableProjects() {
    public ObservableList<Project> getAllProjects() {
       return allProjects;
    }
+
+   public void setSpringContext(final ConfigurableApplicationContext springContext) {
+      this.springContext = springContext;
+   }
+
+   public ConfigurableApplicationContext getSpringContext() {
+      return this.springContext;
+   }
 }

src/main/java/de/doubleslash/keeptime/view/AboutController.java

@@ -20,6 +20,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.Main;
 import de.doubleslash.keeptime.common.BrowserHelper;
@@ -42,6 +43,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
 
+@Component
 public class AboutController {
 
    private static final String GITHUB_PAGE = "https://www.github.com/doubleSlashde/KeepTime";
@@ -154,7 +156,7 @@ private void showLicense(final Licenses license) {
          alert.setContentText(String.format(
                "We could not find the license file at \"%s\". Did you remove it?%nPlease redownload or visit \"%s\".",
                license.getPath(), license.getUrl()));
-         
+
          alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
 
          alert.show();

src/main/java/de/doubleslash/keeptime/view/ManageProjectController.java

@@ -18,6 +18,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
@@ -30,11 +32,12 @@
 import javafx.scene.control.TextField;
 import javafx.scene.layout.GridPane;
 
+@Component
 public class ManageProjectController {
 
    private static final Logger LOG = LoggerFactory.getLogger(ManageProjectController.class);
 
-   private Model model;
+   private final Model model;
 
    @FXML
    private GridPane grid;
@@ -54,17 +57,17 @@ public class ManageProjectController {
    @FXML
    private Spinner<Integer> sortIndexSpinner;
 
-   public void setModel(final Model model) {
+   @Autowired
+   public ManageProjectController(final Model model) {
       this.model = model;
    }
 
-   public void secondInitialize() {
-      if (model != null) {
-         final int availableProjectAmount = model.getAllProjects().size();
-         sortIndexSpinner
-               .setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount, availableProjectAmount));
-         sortIndexSpinner.getValueFactory().setValue(model.getAvailableProjects().size());
-      }
+   @FXML
+   private void initialize() {
+      final int availableProjectAmount = model.getAllProjects().size();
+      sortIndexSpinner
+            .setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount, availableProjectAmount));
+      sortIndexSpinner.getValueFactory().setValue(model.getAvailableProjects().size());
    }
 
    public void initializeWith(final Project project) {

src/main/java/de/doubleslash/keeptime/view/ProjectsListViewController.java

@@ -187,6 +187,7 @@ private Node createListEntryForProject(final Project p) {
 
       final FXMLLoader loader = new FXMLLoader();
       loader.setLocation(Resources.getResource(RESOURCE.FXML_PROJECT_LAYOUT));
+      loader.setControllerFactory(model.getSpringContext()::getBean);
       Pane projectElement;
       try {
          projectElement = loader.load();
@@ -332,14 +333,13 @@ private Dialog<Project> setupEditProjectDialog(final String title, final String
    private GridPane setUpEditProjectGridPane(final Project p, final Dialog<Project> dialog) {
       GridPane grid;
       final FXMLLoader loader = new FXMLLoader(Resources.getResource(RESOURCE.FXML_MANAGE_PROJECT));
+      loader.setControllerFactory(model.getSpringContext()::getBean);
       try {
          grid = loader.load();
       } catch (final IOException e) {
          throw new FXMLLoaderException("Error while loading '" + Resources.RESOURCE.FXML_MANAGE_PROJECT + "'.", e);
       }
       final ManageProjectController manageProjectController = loader.getController();
-      manageProjectController.setModel(model);
-      manageProjectController.secondInitialize();
       manageProjectController.initializeWith(p);
 
       dialog.setResultConverter(dialogButton -> {

src/main/java/de/doubleslash/keeptime/view/ReportController.java

@@ -25,6 +25,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import com.sun.javafx.scene.control.skin.DatePickerSkin;
 
@@ -55,6 +57,7 @@
 import javafx.scene.shape.Circle;
 import javafx.util.Callback;
 
+@Component
 public class ReportController {
 
    public static final String NOTE_DELIMETER = "; ";
@@ -89,12 +92,18 @@ public class ReportController {
 
    private DatePicker datePicker; // for calendar element
 
-   private Model model;
+   private final Model model;
 
-   private Controller controller;
+   private final Controller controller;
 
    private ColorTimeLine colorTimeLine;
 
+   @Autowired
+   public ReportController(final Model model, final Controller controller) {
+      this.model = model;
+      this.controller = controller;
+   }
+
    @FXML
    private void initialize() {
       LOG.info("Init reportController");
@@ -106,6 +115,24 @@ private void initialize() {
       });
 
       colorTimeLine = new ColorTimeLine(colorTimeLineCanvas);
+
+      // HACK to show calendar from datepicker
+      // https://stackoverflow.com/questions/34681975/javafx-extract-calendar-popup-from-datepicker-only-show-popup
+      final DatePickerSkin datePickerSkin = new DatePickerSkin(datePicker);
+      final Callback<DatePicker, DateCell> dayCellFactory = callback -> new DateCell() {
+         @Override
+         public void updateItem(final LocalDate item, final boolean empty) {
+            super.updateItem(item, empty);
+            if (model.getWorkRepository().findByCreationDate(item).isEmpty()) {
+               setDisable(true);
+               setStyle(FX_BACKGROUND_COLOR_NOT_WORKED);
+            }
+         }
+      };
+
+      this.datePicker.setDayCellFactory(dayCellFactory);
+      final Node popupContent = datePickerSkin.getPopupContent();
+      this.topBorderPane.setRight(popupContent);
    }
 
    private void updateReport(final LocalDate dateToShow) {
@@ -219,33 +246,8 @@ public void handle(final ActionEvent event) {
       return bProjectReport;
    }
 
-   public void setModel(final Model model) {
-      this.model = model;
-
-      // HACK to show calendar from datepicker
-      // https://stackoverflow.com/questions/34681975/javafx-extract-calendar-popup-from-datepicker-only-show-popup
-      final DatePickerSkin datePickerSkin = new DatePickerSkin(datePicker);
-      final Callback<DatePicker, DateCell> dayCellFactory = callback -> new DateCell() {
-         @Override
-         public void updateItem(final LocalDate item, final boolean empty) {
-            super.updateItem(item, empty);
-            if (model.getWorkRepository().findByCreationDate(item).isEmpty()) {
-               setDisable(true);
-               setStyle(FX_BACKGROUND_COLOR_NOT_WORKED);
-            }
-         }
-      };
-
-      this.datePicker.setDayCellFactory(dayCellFactory);
-      final Node popupContent = datePickerSkin.getPopupContent();
-      this.topBorderPane.setRight(popupContent);
-   }
-
    public void update() {
       updateReport(this.datePicker.getValue());
    }
 
-   public void setController(final Controller controller) {
-      this.controller = controller;
-   }
 }

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -20,6 +20,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.common.OS;
 import de.doubleslash.keeptime.common.Resources;
@@ -43,6 +45,7 @@
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
+@Component
 public class SettingsController {
 
    @FXML
@@ -95,13 +98,19 @@ public class SettingsController {
 
    private static final Logger LOG = LoggerFactory.getLogger(SettingsController.class);
 
-   private Controller controller;
-   private Model model;
+   private final Controller controller;
+   private final Model model;
 
    private Stage thisStage;
 
    private Stage aboutStage;
 
+   @Autowired
+   public SettingsController(final Model model, final Controller controller) {
+      this.model = model;
+      this.controller = controller;
+   }
+
    @FXML
    private void initialize() {
       LOG.debug("start init");
@@ -191,12 +200,6 @@ private void initialize() {
       });
    }
 
-   public void setControllerAndModel(final Controller controller, final Model model) {
-      this.controller = controller;
-      this.model = model;
-      update();
-   }
-
    void update() {
       // needed to close stage on esc
       settingsRoot.requestFocus();
@@ -223,6 +226,7 @@ private void loadAboutStage() {
          // About stage
          LOG.debug("load about.fxml");
          final FXMLLoader fxmlLoader3 = createFXMLLoader(RESOURCE.FXML_ABOUT);
+         fxmlLoader3.setControllerFactory(model.getSpringContext()::getBean);
          LOG.debug("load root");
          final Parent rootAbout = fxmlLoader3.load();
          LOG.debug("set stage");