did changes on ViewController and ReportController

ViewController doesn't work (see lines 700,701)

Author: mplieske

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

@@ -55,6 +55,8 @@ public class ReportController {
    private Controller controller;
    private Model model;
 
+   private final String SYSTEM = "System";
+
    @FXML
    private void initialize() {
       LOG.info("Init reportController");
@@ -83,7 +85,7 @@ private void updateReport(final LocalDate newvalue) {
       long currentSeconds = 0;
       for (final Project project : workedProjectsSet) {
          final Label projectName = new Label(project.getName());
-         projectName.setFont(Font.font("System", FontWeight.BOLD, 15));
+         projectName.setFont(Font.font(SYSTEM, FontWeight.BOLD, 15));
          gridPane.add(projectName, 0, rowIndex);
 
          final List<Work> onlyCurrentProjectWork = currentWorkItems.stream().filter(w -> w.getProject() == project)
@@ -99,7 +101,7 @@ private void updateReport(final LocalDate newvalue) {
          }
 
          final Label workedTimeLabel = new Label(DateFormatter.secondsToHHMMSS(todaysWorkSeconds));
-         workedTimeLabel.setFont(Font.font("System", FontWeight.BOLD, 15));
+         workedTimeLabel.setFont(Font.font(SYSTEM, FontWeight.BOLD, 15));
          gridPane.add(workedTimeLabel, 2, rowIndex);
          rowIndex++;
 
@@ -109,18 +111,18 @@ private void updateReport(final LocalDate newvalue) {
                   .secondsToHHMMSS(DateFormatter.getSecondsBewtween(work.getStartTime(), work.getEndTime()));
 
             final Label commentLabel = new Label(work.getNotes());
-            commentLabel.setFont(Font.font("System", FontWeight.NORMAL, 15));
+            commentLabel.setFont(Font.font(SYSTEM, FontWeight.NORMAL, 15));
             commentLabel.setWrapText(true);
             gridPane.add(commentLabel, 0, rowIndex);
 
             final Label fromTillLabel = new Label(DateFormatter.toTimeString(work.getStartTime()) + " - "
                   + DateFormatter.toTimeString(work.getEndTime()));
-            fromTillLabel.setFont(Font.font("System", FontWeight.NORMAL, 15));
+            fromTillLabel.setFont(Font.font(SYSTEM, FontWeight.NORMAL, 15));
             fromTillLabel.setWrapText(true);
             gridPane.add(fromTillLabel, 1, rowIndex);
 
             final Label workedHoursLabel = new Label(workedHours);
-            workedHoursLabel.setFont(Font.font("System", FontWeight.NORMAL, 15));
+            workedHoursLabel.setFont(Font.font(SYSTEM, FontWeight.NORMAL, 15));
             gridPane.add(workedHoursLabel, 2, rowIndex);
 
             rowIndex++;

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

@@ -127,7 +127,8 @@ public class ViewController {
    double startX = -1;
 
    class Delta {
-      double x, y;
+      double x;
+      double y;
    }
 
    private final Delta dragDelta = new Delta();
@@ -532,8 +533,6 @@ private Node addProjectToProjectList(final Project p) {
          final MouseButton button = a.getButton();
          if (button == MouseButton.PRIMARY) {
             changeProject(p, 0);
-         } else if (button == MouseButton.SECONDARY) {
-
          }
 
       });
@@ -677,35 +676,11 @@ private Node addProjectToProjectList(final Project p) {
       editMenuItem.setOnAction(e -> {
          // TODO refactor to use "add project" controls
          LOG.info("Edit project");
-         final Dialog<ButtonType> dialog = new Dialog<>();
-         dialog.setTitle("Edit project");
-         dialog.setHeaderText("Edit project '" + p.getName() + "'");
-
-         dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
-
-         final GridPane grid = new GridPane();
-         grid.setHgap(10);
-         grid.setVgap(10);
-         grid.setPadding(new Insets(20, 150, 10, 10));
-
-         grid.add(new Label("Name:"), 0, 0);
-         final TextField projectNameTextField = new TextField(p.getName());
-         grid.add(projectNameTextField, 1, 0);
-
-         grid.add(new Label("Color:"), 0, 1);
-         final ColorPicker colorPicker = new ColorPicker(p.getColor());
-         grid.add(colorPicker, 1, 1);
-
-         grid.add(new Label("IsWork:"), 0, 2);
-         final CheckBox isWorkCheckBox = new CheckBox();
-         isWorkCheckBox.setSelected(p.isWork());
-         grid.add(isWorkCheckBox, 1, 2);
+         Dialog<ButtonType> dialog = new Dialog<>();
+         dialog = setUpEditProjectDialog(p);
 
-         grid.add(new Label("SortIndex:"), 0, 3);
-         final Spinner<Integer> indexSpinner = new Spinner<>();
-         final int availableProjectAmount = model.availableProjects.size();
-         indexSpinner.setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount - 1, p.getIndex()));
-         grid.add(indexSpinner, 1, 3);
+         GridPane grid = new GridPane();
+         grid = setUpEditProjectGridPane(p);
 
          // TODO disable OK button if no name is set
          dialog.getDialogPane().setContent(grid);
@@ -741,6 +716,43 @@ private Node addProjectToProjectList(final Project p) {
       return projectElement;
    }
 
+   private Dialog<ButtonType> setUpEditProjectDialog(final Project p) {
+      final Dialog<ButtonType> dialog = new Dialog<>();
+      dialog.setTitle("Edit project");
+      dialog.setHeaderText("Edit project '" + p.getName() + "'");
+      dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+      return dialog;
+   }
+
+   private GridPane setUpEditProjectGridPane(final Project p) {
+      final GridPane grid = new GridPane();
+
+      grid.setHgap(10);
+      grid.setVgap(10);
+      grid.setPadding(new Insets(20, 150, 10, 10));
+
+      grid.add(new Label("Name:"), 0, 0);
+      final TextField projectNameTextField = new TextField(p.getName());
+      grid.add(projectNameTextField, 1, 0);
+
+      grid.add(new Label("Color:"), 0, 1);
+      final ColorPicker colorPicker = new ColorPicker(p.getColor());
+      grid.add(colorPicker, 1, 1);
+
+      grid.add(new Label("IsWork:"), 0, 2);
+      final CheckBox isWorkCheckBox = new CheckBox();
+      isWorkCheckBox.setSelected(p.isWork());
+      grid.add(isWorkCheckBox, 1, 2);
+
+      grid.add(new Label("SortIndex:"), 0, 3);
+      final Spinner<Integer> indexSpinner = new Spinner<>();
+      final int availableProjectAmount = model.availableProjects.size();
+      indexSpinner.setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount - 1, p.getIndex()));
+      grid.add(indexSpinner, 1, 3);
+
+      return grid;
+   }
+
    private void realignProjectList() {
       LOG.debug("Sorting project view");
       final ObservableList<Node> children = availableProjectVbox.getChildren();