#10 outsourced ColorTimeLine

Author: Martin Plieske

src/main/java/de/doubleslash/keeptime/common/ColorTimeLine.java

@@ -0,0 +1,42 @@
+package de.doubleslash.keeptime.common;
+
+import java.time.Duration;
+
+import de.doubleslash.keeptime.controller.Controller;
+import de.doubleslash.keeptime.model.Model;
+import de.doubleslash.keeptime.model.Work;
+import javafx.scene.canvas.Canvas;
+import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.paint.Color;
+
+public class ColorTimeLine {
+
+   private final Canvas canvas;
+   private final Model model;
+   private final Controller controller;
+
+   public ColorTimeLine(final Canvas canvas, final Model model, final Controller controller) {
+      this.canvas = canvas;
+      this.model = model;
+      this.controller = controller;
+   }
+
+   public void update() {
+      final GraphicsContext gc = canvas.getGraphicsContext2D();
+
+      gc.setFill(new Color(.3, .3, .3, .3));
+      gc.clearRect(0, 0, canvas.getWidth(), canvas.getHeight());
+      gc.fillRect(0, 0, canvas.getWidth(), canvas.getHeight());
+
+      double currentX = 0;
+      final long maxSeconds = controller.calcTodaysSeconds();
+      for (final Work w : model.getPastWorkItems()) {
+         final long workedSeconds = Duration.between(w.getStartTime(), w.getEndTime()).getSeconds();
+         final double fillX = (float) workedSeconds / maxSeconds * canvas.getWidth();
+         gc.setFill(w.getProject().getColor());
+         gc.fillRect(currentX, 0, fillX, canvas.getHeight());
+         currentX += fillX;
+      }
+   }
+
+}

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

@@ -16,14 +16,14 @@
 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;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.exceptions.FXMLLoaderException;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
-import de.doubleslash.keeptime.model.Work;
 import de.doubleslash.keeptime.view.time.Interval;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -316,7 +316,8 @@ private void initialize() {
             label.setText(DateFormatter.secondsToHHMMSS(seconds));
          }
 
-         updateProjectColorTimeline();
+         final ColorTimeLine mainColorTimeLine = new ColorTimeLine(canvas, model, controller);
+         mainColorTimeLine.update();
          updateTaskbarIcon(currentWorkSeconds);
       });
 
@@ -754,24 +755,6 @@ private void realignProjectList() {
       }
    }
 
-   private void updateProjectColorTimeline() {
-      final GraphicsContext gc = canvas.getGraphicsContext2D();
-
-      gc.setFill(new Color(.3, .3, .3, .3));
-      gc.clearRect(0, 0, canvas.getWidth(), canvas.getHeight());
-      gc.fillRect(0, 0, canvas.getWidth(), canvas.getHeight());
-
-      double currentX = 0;
-      final long maxSeconds = controller.calcTodaysSeconds();
-      for (final Work w : model.getPastWorkItems()) {
-         final long workedSeconds = Duration.between(w.getStartTime(), w.getEndTime()).getSeconds();
-         final double fillX = (float) workedSeconds / maxSeconds * canvas.getWidth();
-         gc.setFill(w.getProject().getColor());
-         gc.fillRect(currentX, 0, fillX, canvas.getHeight());
-         currentX += fillX;
-      }
-   }
-
    private void updateTaskbarIcon(final long currentWorkSeconds) {
       final GraphicsContext gcIcon = taskbarCanvas.getGraphicsContext2D();