@@ -76,6 +76,7 @@ public class ManageWorkController {
7676 private ComboBox <Project > projectComboBox ;
7777
7878 private boolean comboChange ;
79+ private Project selectedProject ;
7980
8081 public void setModel (final Model model ) {
8182 this .model = model ;
@@ -226,6 +227,7 @@ public void changed(final ObservableValue<? extends Project> observable, final P
226227 return ;
227228 }
228229
230+ selectedProject = newValue ;
229231 comboChange = true ;
230232 // needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
231233 Platform .runLater (() -> {
@@ -292,6 +294,7 @@ public void changed(final ObservableValue<? extends Boolean> observable, final B
292294
293295 public void initializeWith (final Work work ) {
294296 LOG .info ("Setting values." );
297+ selectedProject = work .getProject ();
295298 startDatePicker .setValue (work .getStartTime ().toLocalDate ());
296299 endDatePicker .setValue (work .getEndTime ().toLocalDate ());
297300
@@ -316,8 +319,8 @@ public Work getWorkFromUserInput() {
316319
317320 return new Work (startDatePicker .getValue (),
318321 LocalDateTime .of (startDatePicker .getValue (), startTimeSpinner .getValue ()),
319- LocalDateTime .of (endDatePicker .getValue (), endTimeSpinner .getValue ()),
320- projectComboBox . getSelectionModel (). getSelectedItem (), noteTextArea .getText ());
322+ LocalDateTime .of (endDatePicker .getValue (), endTimeSpinner .getValue ()), selectedProject ,
323+ noteTextArea .getText ());
321324 }
322325
323326}
0 commit comments