added list change listener against npe, added method isProjectActive, setting tooltip where selectionNodeMap ist created, added method to add a project to projectSelectionNodeMap

Author: Martin Plieske

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

@@ -143,7 +143,7 @@ public void deleteProject(final Project p) {
          return;
       }
 
-      if (p == model.activeWorkItem.get().getProject()) {
+      if (isProjectActive(p)) {
          changeProject(model.getIdleProject());
       }
 
@@ -163,6 +163,10 @@ public void deleteProject(final Project p) {
       model.getProjectRepository().saveAll(changedProjects);
    }
 
+   private boolean isProjectActive(final Project p) {
+      return p == model.activeWorkItem.get().getProject();
+   }
+
    public void editProject(final Project p, final String newName, final Color newColor, final boolean isWork,
          final int newIndex) {
       LOG.info("Changing project '{}' to '{}' '{}' '{}'", p, newName, newColor, isWork);

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

@@ -20,6 +20,7 @@
 import de.doubleslash.keeptime.exceptions.FXMLLoaderException;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
+import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.fxml.FXMLLoader;
@@ -69,18 +70,23 @@ public ProjectsListViewController(final Model model, final Controller controller
       this.hideable = hideable;
       this.mainStage = mainStage;
       this.availableProjectsListView = availableProjectsListView;
-      availableProjectsListView.setCellFactory(callback -> returnListCellOfProject());
+      availableProjectsListView.setCellFactory(listView -> returnListCellOfProject());
 
       filteredData = new FilteredList<>(model.getSortedAvailableProjects(), p -> true);
       availableProjectsListView.setItems(filteredData);
 
       projectSelectionNodeMap = new HashMap<>(model.getAvailableProjects().size());
 
-      for (final Project project : model.getSortedAvailableProjects()) {
-         if (project.isEnabled()) {
-            final Node node = addProjectToProjectList(project);
-            projectSelectionNodeMap.put(project, node);
+      model.getSortedAvailableProjects().addListener((ListChangeListener<? super Project>) listener -> {
+         listener.next();
+         if (listener.wasAdded()) {
+            final Project addedProject = listener.getAddedSubList().get(0);
+            addProjectToProjectSelectionNodeMap(addedProject);
          }
+      });
+
+      for (final Project project : model.getSortedAvailableProjects()) {
+         addProjectToProjectSelectionNodeMap(project);
       }
 
       // TODO why is there no nice way for listview height?
@@ -151,13 +157,26 @@ public ProjectsListViewController(final Model model, final Controller controller
       searchTextField.setPromptText("Search");
    }
 
+   private void addProjectToProjectSelectionNodeMap(final Project project) {
+      if (project.isEnabled()) {
+         final Pane projectElement = addProjectToProjectList(project);
+         final Label projectNameLabel = (Label) projectElement.getChildren().get(0);
+         projectNameLabel.setTooltip(new Tooltip(projectNameLabel.getText()));
+         projectSelectionNodeMap.put(project, projectElement);
+      }
+   }
+
    public void changeProject(final Project newProject, final long minusSeconds) {
       if (hideable) {
          mainStage.hide();
       }
       controller.changeProject(newProject, minusSeconds);
    }
 
+   public Map<Project, Node> getProjectSelectionNodeMap() {
+      return projectSelectionNodeMap;
+   }
+
    private GridPane setUpGridPane(final String projectName, final Color projectColor, final boolean isWork) {
       final GridPane grid = new GridPane();
       grid.setHgap(10);
@@ -203,7 +222,7 @@ private void realignProjectList() {
       model.getSortedAvailableProjects().setComparator(comparator);
    }
 
-   private Node addProjectToProjectList(final Project p) {
+   private Pane addProjectToProjectList(final Project p) {
       final ContextMenu contextMenu = new ContextMenu();
 
       final FXMLLoader loader = new FXMLLoader();
@@ -375,10 +394,6 @@ protected void updateItem(final Project item, final boolean empty) {
             if (item == null || empty) {
                setGraphic(null);
             } else {
-               LOG.debug("Adding tooltip to Project Label.");
-               final Pane pane = (Pane) projectSelectionNodeMap.get(item);
-               final Label projectNameLabel = (Label) pane.getChildren().get(0);
-               projectNameLabel.setTooltip(new Tooltip(item.getName()));
                LOG.trace("Item: '{}' -> '{}'", item.getName(), projectSelectionNodeMap.get(item));
                setGraphic(projectSelectionNodeMap.get(item));
             }