code review changes

Author: ddamke

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

@@ -209,7 +209,7 @@ private void readSettings() {
       model.screenSettings.screenHash.set(settings.getScreenHash());
       model.screenSettings.saveWindowPosition.set(settings.isSaveWindowPosition());
       model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
-      model.remindIfNotesAreEmptyOnlyForWorkEntry.set(settings.isEmptyNoteReminderIsWork());
+      model.remindIfNotesAreEmptyOnlyForWorkEntry.set(settings.isRemindIfNotesAreEmptyOnlyForWorkEntry());
 
    }
 

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

@@ -131,7 +131,7 @@ public void updateSettings(final Settings newValuedSettings) {
       settings.setWindowYProportion(newValuedSettings.getWindowYProportion());
       settings.setScreenHash(newValuedSettings.getScreenHash());
       settings.setRemindIfNotesAreEmpty(newValuedSettings.isRemindIfNotesAreEmpty());
-      settings.setEmptyNoteReminderIsWork(newValuedSettings.isEmptyNoteReminderIsWork());
+      settings.setRemindIfNotesAreEmptyOnlyForWorkEntry(newValuedSettings.isRemindIfNotesAreEmptyOnlyForWorkEntry());
 
       settings = model.getSettingsRepository().save(settings);
 
@@ -148,7 +148,7 @@ public void updateSettings(final Settings newValuedSettings) {
       model.screenSettings.proportionalY.set(settings.getWindowYProportion());
       model.screenSettings.screenHash.set(settings.getScreenHash());
       model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
-      model.remindIfNotesAreEmptyOnlyForWorkEntry.set(settings.isEmptyNoteReminderIsWork());
+      model.remindIfNotesAreEmptyOnlyForWorkEntry.set(settings.isRemindIfNotesAreEmptyOnlyForWorkEntry());
    }
 
    @PreDestroy

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

@@ -69,15 +69,15 @@ public class Settings {
 
    private boolean remindIfNotesAreEmpty;
 
-   private boolean emptyNoteReminderIsWork;
+   private boolean remindIfNotesAreEmptyOnlyForWorkEntry;
    public Settings() {
    }
 
    public Settings(final Color hoverBackgroundColor, final Color hoverFontColor, final Color defaultBackgroundColor,
          final Color defaultFontColor, final Color taskBarColor, final boolean useHotkey,
          final boolean displayProjectsRight, final boolean hideProjectsOnMouseExit, final double windowPositionX,
          final double windowPositionY, final int screenHash, final boolean saveWindowPosition,
-         final boolean remindIfNotesAreEmpty, final boolean emptyNoteReminderIsWork) {
+         final boolean remindIfNotesAreEmpty, final boolean remindIfNotesAreEmptyOnlyForWorkEntry) {
       this.hoverBackgroundColor = hoverBackgroundColor;
       this.hoverFontColor = hoverFontColor;
       this.defaultBackgroundColor = defaultBackgroundColor;
@@ -91,16 +91,16 @@ public Settings(final Color hoverBackgroundColor, final Color hoverFontColor, fi
       this.windowScreenhash = screenHash;
       this.saveWindowPosition = saveWindowPosition;
       this.remindIfNotesAreEmpty = remindIfNotesAreEmpty;
-      this.emptyNoteReminderIsWork = emptyNoteReminderIsWork;
+      this.remindIfNotesAreEmptyOnlyForWorkEntry = remindIfNotesAreEmptyOnlyForWorkEntry;
 
    }
 
-   public boolean isEmptyNoteReminderIsWork() {
-      return emptyNoteReminderIsWork;
+   public boolean isRemindIfNotesAreEmptyOnlyForWorkEntry() {
+      return remindIfNotesAreEmptyOnlyForWorkEntry;
    }
 
-   public void setEmptyNoteReminderIsWork(boolean emptyNoteReminderCheckBoxIsWork) {
-      this.emptyNoteReminderIsWork = emptyNoteReminderCheckBoxIsWork;
+   public void setRemindIfNotesAreEmptyOnlyForWorkEntry(boolean emptyNoteReminderCheckBoxIsWork) {
+      this.remindIfNotesAreEmptyOnlyForWorkEntry = emptyNoteReminderCheckBoxIsWork;
    }
 
    public long getId() {

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

@@ -168,31 +168,32 @@ private void changeProject(final Project newProject, final long minusSeconds) {
          mainStage.hide();
       }
       final Work currentWork = model.activeWorkItem.get();
-      if (model.remindIfNotesAreEmpty.get() && currentWork.getNotes().isEmpty()) {
+      if (model.remindIfNotesAreEmpty.get() && currentWork != null && currentWork.getNotes().isEmpty()) {
 
-         if (currentWork != null && (!model.remindIfNotesAreEmptyOnlyForWorkEntry.get() || currentWork.getProject().isWork())) {
-            if (showDialogNoNoteSelected(currentWork)) return;
+         if ( !model.remindIfNotesAreEmptyOnlyForWorkEntry.get() || currentWork.getProject().isWork()) {
+               Optional<String> result = showDialogNoNoteSelected(currentWork);
+            if (result.isPresent()){
+               currentWork.setNotes(result.get());
+            }
+            else{
+               //cancel pressed
+               return;
+            }
          }
       }
       controller.changeProject(newProject, minusSeconds);
    }
 
-   private boolean showDialogNoNoteSelected(Work currentWork) {
+   private Optional showDialogNoNoteSelected(Work currentWork) {
       final TextInputDialog noteDialog = new TextInputDialog();
       noteDialog.setTitle("Empty Notes");
       noteDialog.setHeaderText("Switch projects without notes?");
       noteDialog.setContentText(
-            "What did you do for project '" + model.activeWorkItem.get().getProject().getName() + "' ?");
+            "What did you do for project '" + currentWork.getProject().getName() + "' ?");
       noteDialog.initOwner(mainStage);
 
       final Optional<String> result = noteDialog.showAndWait();
-      if (result.isPresent()) {
-         currentWork.setNotes(result.get());
-      } else {
-         // cancel pressed
-         return true;
-      }
-      return false;
+      return result;
    }
 
    private void addProjectToProjectSelectionNodeMap(final Project project) {

src/main/resources/db/migration/V1_1_5__added_note_reminder_setting_only_work.sql

@@ -1,2 +1,2 @@
  ALTER TABLE settings
-  ADD COLUMN empty_note_reminder_is_work BOOLEAN NOT NULL DEFAULT(false)
+  ADD COLUMN remind_if_notes_are_empty_only_for_work_entry BOOLEAN NOT NULL DEFAULT(false)