changed editWork to have listlogic closer together; removed duplicate arguments on workdialogue creation; removed lonely ';';moved styleediting to extra function

Author: JSchraff

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

@@ -187,8 +187,6 @@ public void editProject(final Project projectToBeUpdated, final Project newValue
    public void editWork(final Work workToBeEdited, final Work newValuedWork) {
       LOG.info("Changing work '{}' to '{}'.", workToBeEdited, newValuedWork);
 
-      model.getPastWorkItems().removeIf(w -> (w.getId() == workToBeEdited.getId()));
-
       workToBeEdited.setCreationDate(newValuedWork.getCreationDate());
       workToBeEdited.setStartTime(newValuedWork.getStartTime());
       workToBeEdited.setEndTime(newValuedWork.getEndTime());
@@ -197,6 +195,9 @@ public void editWork(final Work workToBeEdited, final Work newValuedWork) {
 
       final Work editedWork = model.getWorkRepository().save(workToBeEdited);
 
+      // remove old
+      model.getPastWorkItems().removeIf(w -> (w.getId() == workToBeEdited.getId()));
+      // add if started today
       final LocalDate dateNow = dateProvider.dateTimeNow().toLocalDate();
       if (dateNow.equals(editedWork.getCreationDate())) {
          model.getPastWorkItems().add(editedWork);

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

@@ -34,6 +34,7 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
+import javafx.scene.Node;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.ListCell;
@@ -186,10 +187,7 @@ protected void updateItem(final Project item, final boolean empty) {
                   if (item == null || empty) {
                      setGraphic(null);
                   } else {
-                     final Color color = item.getColor();
-                     final String style = StyleUtils.changeStyleAttribute(getStyle(), "fx-background-color",
-                           "rgba(" + ColorHelper.colorToCssRgba(color) + ")");
-                     setStyle(style);
+                     setColor(this, item.getColor());
                      setText(item.getName());
 
                   }
@@ -260,14 +258,14 @@ public void initializeWith(final Work work) {
 
       projectComboBox.getSelectionModel().select(work.getProject());
 
-      setComboBoxColor(work.getProject().getColor());
+      setColor(projectComboBox, work.getProject().getColor());
 
    }
 
-   private void setComboBoxColor(final Color color) {
-      final String style = StyleUtils.changeStyleAttribute(projectComboBox.getStyle(), "fx-background-color",
+   private void setColor(final Node object, final Color color) {
+      final String style = StyleUtils.changeStyleAttribute(object.getStyle(), "fx-background-color",
             "rgba(" + ColorHelper.colorToCssRgba(color) + ")");
-      projectComboBox.setStyle(style);
+      object.setStyle(style);
    }
 
    public Work getWorkFromUserInput() {

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

@@ -125,7 +125,6 @@ private void updateReport(final LocalDate dateToShow) {
 
       this.currentDayLabel.setText(DateFormatter.toDayDateString(dateToShow));
       final List<Work> currentWorkItems = model.getWorkRepository().findByCreationDateOrderByStartTimeAsc(dateToShow);
-      ;
 
       colorTimeLine.update(currentWorkItems, controller.calcSeconds(currentWorkItems));
 
@@ -205,7 +204,7 @@ private void updateReport(final LocalDate dateToShow) {
 
             editMenuItem.setOnAction(e -> {
                LOG.info("Edit work");
-               final Dialog<Work> dialog = setupEditWorkDialog("Edit work", "Edit work ", work);
+               final Dialog<Work> dialog = setupEditWorkDialog("Edit work", work);
 
                final Optional<Work> result = dialog.showAndWait();
 
@@ -262,12 +261,12 @@ public void updateItem(final LocalDate item, final boolean empty) {
 
    }
 
-   private Dialog<Work> setupEditWorkDialog(final String title, final String headerText, final Work work) {
+   private Dialog<Work> setupEditWorkDialog(final String title, final Work work) {
       final Dialog<Work> dialog = new Dialog<>();
 
       dialog.initOwner(stage);
       dialog.setTitle(title);
-      dialog.setHeaderText(headerText);
+      dialog.setHeaderText(title);
       dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
 
       final GridPane grid = setUpEditWorkGridPane(work, dialog);