resolved some change requests

Author: Martin Plieske

…slash/keeptime/common/ColorTimeLine.java …leslash/keeptime/view/ColorTimeLine.javasrc/main/java/de/doubleslash/keeptime/common/ColorTimeLine.java renamed to src/main/java/de/doubleslash/keeptime/view/ColorTimeLine.java src/main/java/de/doubleslash/keeptime/common/ColorTimeLine.java renamed to src/main/java/de/doubleslash/keeptime/view/ColorTimeLine.java

@@ -1,4 +1,4 @@
-package de.doubleslash.keeptime.common;
+package de.doubleslash.keeptime.view;
 
 import java.time.Duration;
 

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

@@ -12,7 +12,6 @@
 
 import com.sun.javafx.scene.control.skin.DatePickerSkin;
 
-import de.doubleslash.keeptime.common.ColorTimeLine;
 import de.doubleslash.keeptime.common.DateFormatter;
 import de.doubleslash.keeptime.common.DateProvider;
 import de.doubleslash.keeptime.controller.Controller;
@@ -65,7 +64,7 @@ public class ReportController {
 
    private static final Logger LOG = LoggerFactory.getLogger(ReportController.class);
 
-   private DatePicker datePicker; // for calender element
+   private DatePicker datePicker; // for calendar element
 
    private Model model;
 
@@ -123,10 +122,7 @@ private void updateReport(final LocalDate newvalue) {
          this.gridPane.add(workedTimeLabel, 2, rowIndex);
 
          // text will be set later
-         /*
-          * final TextArea textArea = new TextArea(); textArea.setMaxHeight(20); textArea.setFont(Font.font("System",
-          * FontWeight.NORMAL, 15)); textArea.setWrapText(true); this.gridPane.add(textArea, 1, rowIndex);
-          */
+
          final Button bProjectReport = createProjectReport();
          this.gridPane.add(bProjectReport, 1, rowIndex);
 
@@ -157,15 +153,13 @@ private void updateReport(final LocalDate newvalue) {
 
             rowIndex++;
          }
-         // textArea.setText(pr.getNotes(true));
          bProjectReport.setUserData(pr.getNotes(true));
       }
       this.scrollPane.setVvalue(0); // scroll to the top
 
       this.currentDayTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentSeconds));
       this.currentDayWorkTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentWorkSeconds));
 
-      controller = new Controller(model, dateProvider);
       colorTimeLine = new ColorTimeLine(reportColorTimeLine, model, controller);
       colorTimeLine.update();
    }
@@ -217,4 +211,8 @@ public void updateItem(final LocalDate item, final boolean empty) {
    public void update() {
       updateReport(this.datePicker.getValue());
    }
+
+   public void setController(final Controller controller) {
+      this.controller = controller;
+   }
 }

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

@@ -16,7 +16,6 @@
 import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.common.ColorHelper;
-import de.doubleslash.keeptime.common.ColorTimeLine;
 import de.doubleslash.keeptime.common.DateFormatter;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
@@ -122,6 +121,8 @@ public class ViewController {
    @FXML
    private Canvas canvas;
 
+   private ColorTimeLine mainColorTimeLine;
+
    private static final Logger LOG = LoggerFactory.getLogger(ViewController.class);
 
    private class Delta {
@@ -316,11 +317,11 @@ private void initialize() {
             label.setText(DateFormatter.secondsToHHMMSS(seconds));
          }
 
-         final ColorTimeLine mainColorTimeLine = new ColorTimeLine(canvas, model, controller);
          mainColorTimeLine.update();
          updateTaskbarIcon(currentWorkSeconds);
       });
 
+      mainColorTimeLine = new ColorTimeLine(canvas, model, controller);
    }
 
    private Dialog<Project> dialogResultConverter(final Dialog<Project> dialog, final GridPane grid) {
@@ -424,6 +425,7 @@ private void loadSubStages() {
          final Parent sceneRoot = fxmlLoader.load();
          reportController = fxmlLoader.getController();
          reportController.setModel(model);
+         reportController.setController(controller);
          reportStage = new Stage();
          reportStage.initModality(Modality.APPLICATION_MODAL);
          reportStage.setScene(new Scene(sceneRoot));