replaced manual sorting with sortedList

Author: JSchraff

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

@@ -186,32 +186,22 @@ 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);
-      int index = model.getPastWorkItems().size() - 1;
-      for (int i = 0; i < model.getPastWorkItems().size(); i++) {
-         final Work work = model.getPastWorkItems().get(i);
-         if (work.getId() == workToBeEdited.getId()) {
-            model.getPastWorkItems().remove(work);
-            continue;
-         }
-         if (work.getStartTime().isAfter(newValuedWork.getStartTime())) {
-            index = i;
-            break;
-         }
-      }
+
+      model.getPastWorkItems().removeIf(w -> (w.getId() == workToBeEdited.getId()));
 
       workToBeEdited.setCreationDate(newValuedWork.getCreationDate());
       workToBeEdited.setStartTime(newValuedWork.getStartTime());
       workToBeEdited.setEndTime(newValuedWork.getEndTime());
       workToBeEdited.setNotes(newValuedWork.getNotes());
       workToBeEdited.setProject(newValuedWork.getProject());
 
+      final Work editedWork = model.getWorkRepository().save(workToBeEdited);
+
       final LocalDate dateNow = dateProvider.dateTimeNow().toLocalDate();
-      if (dateNow.equals(workToBeEdited.getCreationDate())) {
-         model.getPastWorkItems().add(index, workToBeEdited);
+      if (dateNow.equals(editedWork.getCreationDate())) {
+         model.getPastWorkItems().add(editedWork);
       }
 
-      model.getWorkRepository().save(workToBeEdited);
-
    }
 
    /**

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

@@ -19,6 +19,7 @@
 import java.util.Comparator;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.model.repos.ProjectRepository;
@@ -63,6 +64,8 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
    private ObservableList<Project> allProjects = FXCollections.observableArrayList();
 
    protected final ObservableList<Work> pastWorkItems = FXCollections.observableArrayList();
+   private final SortedList<Work> sortedPastWorkItems = new SortedList<>(pastWorkItems,
+         Comparator.comparing(Work::getStartTime));
    public final ObjectProperty<Work> activeWorkItem = new SimpleObjectProperty<>();
 
    public final ObjectProperty<Color> taskBarColor = new SimpleObjectProperty<>(ORIGINAL_TASK_BAR_FONT_COLOR);
@@ -76,6 +79,9 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
    public final ObjectProperty<Boolean> useHotkey = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Boolean> displayProjectsRight = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Boolean> hideProjectsOnMouseExit = new SimpleObjectProperty<>(true);
+   public final ObjectProperty<Boolean> emptyNoteReminder = new SimpleObjectProperty<>(false);
+
+   private ConfigurableApplicationContext springContext;
 
    public void setWorkRepository(final WorkRepository workRepository) {
       this.workRepository = workRepository;
@@ -128,4 +134,16 @@ public ObservableList<Project> getAvailableProjects() {
    public ObservableList<Project> getAllProjects() {
       return allProjects;
    }
+
+   public void setSpringContext(final ConfigurableApplicationContext springContext) {
+      this.springContext = springContext;
+   }
+
+   public ConfigurableApplicationContext getSpringContext() {
+      return this.springContext;
+   }
+
+   public SortedList<Work> getSortedPastWorkItems() {
+      return sortedPastWorkItems;
+   }
 }

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

@@ -295,7 +295,7 @@ private void initialize() {
 
          projectsListViewController.tick();
 
-         mainColorTimeLine.update(model.getPastWorkItems(), controller.calcTodaysSeconds());
+         mainColorTimeLine.update(model.getSortedPastWorkItems(), controller.calcTodaysSeconds());
          updateTaskbarIcon(currentWorkSeconds);
       });
 

src/test/java/de/doubleslash/keeptime/controller/ControllerTest.java

@@ -35,6 +35,9 @@
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import de.doubleslash.keeptime.common.DateProvider;
 import de.doubleslash.keeptime.model.Model;
@@ -334,6 +337,14 @@ public void shouldCalculateSecondsCorrectlyWhenWorkItemsAreGiven() {
    @Test
    public void shouldUpdateWorkItemPersistentlyWhenWorkItemIsEdited() {
       Mockito.when(mockedDateProvider.dateTimeNow()).thenReturn(LocalDateTime.now());
+      Mockito.when(mockedWorkRepository.save(Mockito.any(Work.class))).thenAnswer(new Answer<Work>() {
+
+         @Override
+         public Work answer(final InvocationOnMock invocation) {
+            final Object[] args = invocation.getArguments();
+            return (Work) args[0];
+         }
+      });
 
       final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
       model.getAllProjects().add(project1);
@@ -366,6 +377,13 @@ public void shouldUpdateWorkItemPersistentlyWhenWorkItemIsEdited() {
    @Test
    public void shouldNotUpdateOthersWhenWorkItemIsEdited() {
       Mockito.when(mockedDateProvider.dateTimeNow()).thenReturn(LocalDateTime.now());
+      Mockito.when(mockedWorkRepository.save(Mockito.any(Work.class))).thenAnswer(new Answer<Work>() {
+         @Override
+         public Work answer(final InvocationOnMock invocation) {
+            final Object[] args = invocation.getArguments();
+            return (Work) args[0];
+         }
+      });
 
       final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
       model.getAllProjects().add(project1);
@@ -375,14 +393,17 @@ public void shouldNotUpdateOthersWhenWorkItemIsEdited() {
 
       final Work notToBeUpdatedWork = new Work(localDateNow, localDateTimeMorning.plusHours(0),
             localDateTimeMorning.plusHours(1), project1, "originalWork");
+      ReflectionTestUtils.setField(notToBeUpdatedWork, "id", 1);
       model.getPastWorkItems().add(notToBeUpdatedWork);
 
       final Work originalWork = new Work(localDateNow, localDateTimeMorning.plusHours(1),
             localDateTimeMorning.plusHours(2), project1, "originalWork");
+      ReflectionTestUtils.setField(originalWork, "id", 2);
       model.getPastWorkItems().add(originalWork);
 
       final Work newWork = new Work(localDateNow, localDateTimeMorning.plusHours(3), localDateTimeMorning.plusHours(4),
             project1, "updated");
+      ReflectionTestUtils.setField(newWork, "id", 3);
 
       testee.editWork(originalWork, newWork);