resolve merge conflicts

Author: ddamke

src/main/java/de/doubleslash/keeptime/common/Resources.java

@@ -57,6 +57,8 @@ public enum RESOURCE {
 
       SVG_BUG_ICON("/svgs/bug.svg"),
 
+      ICON_MAIN("/icons/icon.png")
+
       ;
 
       String resourceLocation;

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

@@ -24,6 +24,7 @@
 
 import javax.annotation.PreDestroy;
 
+import javafx.scene.control.ButtonType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -307,14 +307,6 @@ private Node createListEntryForProject(final Project p) {
          LOG.info("Edit project");
          final Dialog<Project> dialog = setupEditProjectDialog("Edit project", "Edit project '" + p.getName() + "'", p);
 
-         final Dialog<ButtonType> dialog = setUpDialogButtonType("Edit project", "Edit project '" + p.getName() + "'");
-         final GridPane grid = setUpEditProjectGridPane(p);
-
-         // TODO disable OK button if no name is set
-         dialog.getDialogPane().setContent(grid);
-
-         dialog.setResultConverter(dialogButton -> dialogButton);
-         dialog.initOwner(mainStage);
          mainStage.setAlwaysOnTop(false);
          final Optional<Project> result = dialog.showAndWait();
          mainStage.setAlwaysOnTop(true);
@@ -324,7 +316,7 @@ private Node createListEntryForProject(final Project p) {
 
             projectNameLabel.setText(p.getName());
             projectNameLabel.setTextFill(new Color(p.getColor().getRed() * dimFactor,
-                  p.getColor().getGreen() * dimFactor, p.getColor().getBlue() * dimFactor, 1));
+                    p.getColor().getGreen() * dimFactor, p.getColor().getBlue() * dimFactor, 1));
             projectNameLabel.setUnderline(p.isWork());
             projectNameLabel.getTooltip().setText(p.getName());
 

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

@@ -133,7 +133,6 @@ public class ViewController {
 
    private ColorTimeLine mainColorTimeLine;
 
-   private static final Logger LOG = LoggerFactory.getLogger(ViewController.class);
 
    private class Delta {
       double x;
@@ -546,12 +545,6 @@ public void addNewProject(final ActionEvent ae) {
       // TODO somewhat duplicate dialog of create and edit
       final Dialog<Project> dialog = setUpDialogProject("Create new project", "Create a new project");
 
-      final GridPane grid = setUpAddNewProjectGridPane("", Color.WHITE, true);
-
-      // TODO disable OK button if no name is set
-      dialog.getDialogPane().setContent(grid);
-
-      dialogResultConverter(dialog, grid);
       mainStage.setAlwaysOnTop(false);
       final Optional<Project> result = dialog.showAndWait();
       mainStage.setAlwaysOnTop(true);