Revert "Fixed all"

This reverts commit 2107d0a.

Author: Martin Plieske

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

@@ -79,7 +79,7 @@ public void parseConfig(final File inputFile) {
                if (!exists) {
                   LOG.info("Adding project '{}'.", name);
                   final Color colorTemp = Color.valueOf(color);
-                  controller.addNewProject(name, "", Boolean.parseBoolean(isWork), colorTemp, index);
+                  controller.addNewProject(name, Boolean.parseBoolean(isWork), colorTemp, index);
                   index++;
                } else {
                   LOG.debug("Project '{}' already exists", name);

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

@@ -38,7 +38,6 @@ public enum RESOURCE {
       FXML_VIEW_POPUP_LAYOUT("/layouts/ViewLayoutPopup.fxml"),
       FXML_REPORT("/layouts/report.fxml"),
       FXML_ABOUT("/layouts/about.fxml"),
-      FXML_MANAGE_PROJECT("/layouts/manage-project.fxml"),
 
       // icon
       ICON_MAIN("/icons/icon.png"),

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

@@ -91,9 +91,9 @@ public void changeProject(final Project newProject, final long minusSeconds) {
       model.activeWorkItem.set(work);
    }
 
-   public void addNewProject(final String projectName, final String description, final boolean isWork,
-         final Color projectColor, final int index) {
-      final Project project = new Project(projectName, description, projectColor, isWork, index, false);
+   public void addNewProject(final String projectName, final boolean isWork, final Color projectColor,
+         final int index) {
+      final Project project = new Project(projectName, projectColor, isWork, index, false);
       model.getAllProjects().add(project);
       model.getAvailableProjects().add(project);
 
@@ -167,12 +167,11 @@ private boolean isProjectActive(final Project p) {
       return p == model.activeWorkItem.get().getProject();
    }
 
-   public void editProject(final Project p, final String newName, final String description, final Color newColor,
-         final boolean isWork, final int newIndex) {
+   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);
 
       p.setName(newName);
-      p.setDescription(description);
       p.setColor(newColor);
       p.setWork(isWork);
       final int oldIndex = p.getIndex();

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

@@ -54,7 +54,7 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
 
    public static final Color ORIGINAL_TASK_BAR_FONT_COLOR = Color.BLACK;
 
-   public static final Project DEFAULT_PROJECT = new Project("Idle", "", Color.ORANGE, false, 0, true);
+   public static final Project DEFAULT_PROJECT = new Project("Idle", Color.ORANGE, false, 0, true);
    private Project idleProject = DEFAULT_PROJECT;
 
    private final ObservableList<Project> availableProjects = FXCollections.observableArrayList();

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

@@ -22,7 +22,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Lob;
 import javax.persistence.Table;
 
 import de.doubleslash.keeptime.model.persistenceconverter.ColorConverter;
@@ -39,9 +38,6 @@ public class Project {
 
    private String name;
 
-   @Lob
-   private String description;
-
    @Convert(converter = ColorConverter.class, disableConversion = false)
    private Color color;
 
@@ -57,21 +53,19 @@ public Project() {
       // Needed for jpa
    }
 
-   public Project(final String name, final String description, final Color color, final boolean isWork, final int index,
+   public Project(final String name, final Color color, final boolean isWork, final int index,
          final boolean isDefault) {
       super();
       this.name = name;
-      this.description = description;
       this.color = color;
       this.isWork = isWork;
       this.isDefault = isDefault;
       this.isEnabled = true;
       this.index = index;
    }
 
-   public Project(final String name, final String description, final Color color, final boolean isWork,
-         final int index) {
-      this(name, description, color, isWork, index, false);
+   public Project(final String name, final Color color, final boolean isWork, final int index) {
+      this(name, color, isWork, index, false);
    }
 
    public String getName() {
@@ -126,14 +120,6 @@ public void setIndex(final int index) {
       this.index = index;
    }
 
-   public String getDescription() {
-      return description;
-   }
-
-   public void setDescription(final String description) {
-      this.description = description;
-   }
-
    @Override
    public String toString() {
       return "Project [id=" + id + ", name=" + name + ", color=" + color + ", isWork=" + isWork + ", isDefault="

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

@@ -12,6 +12,7 @@
 import org.slf4j.LoggerFactory;
 
 import de.doubleslash.keeptime.common.DateFormatter;
+import de.doubleslash.keeptime.common.FontProvider;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
 import de.doubleslash.keeptime.controller.Controller;
@@ -21,6 +22,7 @@
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
@@ -36,7 +38,7 @@
 import javafx.scene.control.MultipleSelectionModel;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.Spinner;
-import javafx.scene.control.TextArea;
+import javafx.scene.control.SpinnerValueFactory.IntegerSpinnerValueFactory;
 import javafx.scene.control.TextField;
 import javafx.scene.control.Tooltip;
 import javafx.scene.effect.Bloom;
@@ -54,18 +56,19 @@ public class ProjectsListViewController {
    private final Controller controller;
    private final Stage mainStage;
    private final Map<Project, Label> elapsedProjectTimeLabelMap = new HashMap<>();
+   private final ListView<Project> availableProjectsListView;
    private final Map<Project, Node> projectSelectionNodeMap;
    private final FilteredList<Project> filteredData;
 
    private boolean hideable;
-   private ManageProjectController manageProjectController;
 
    public ProjectsListViewController(final Model model, final Controller controller, final Stage mainStage,
          final ListView<Project> availableProjectsListView, final TextField searchTextField, final boolean hideable) {
       this.model = model;
       this.controller = controller;
       this.hideable = hideable;
       this.mainStage = mainStage;
+      this.availableProjectsListView = availableProjectsListView;
       availableProjectsListView.setCellFactory(listView -> returnListCellOfProject());
 
       filteredData = new FilteredList<>(model.getSortedAvailableProjects(), p -> true);
@@ -84,8 +87,7 @@ public ProjectsListViewController(final Model model, final Controller controller
 
             final String lowerCaseFilter = newValue.toLowerCase();
 
-            if (project.getName().toLowerCase().contains(lowerCaseFilter)
-                  || project.getDescription().toLowerCase().contains(lowerCaseFilter)) {
+            if (project.getName().toLowerCase().contains(lowerCaseFilter)) {
                return true;
             }
 
@@ -159,7 +161,6 @@ private void changeProject(final Project newProject, final long minusSeconds) {
    private void addProjectToProjectSelectionNodeMap(final Project project) {
       final Node projectElement = createListEntryForProject(project);
       projectSelectionNodeMap.put(project, projectElement);
-      updateTooltip(project);
    }
 
    private void realignProjectList() {
@@ -221,6 +222,8 @@ private Node createListEntryForProject(final Project p) {
          projectNameLabel.setEffect(null);
       });
 
+      projectNameLabel.setTooltip(new Tooltip(projectNameLabel.getText()));
+
       final MenuItem changeWithTimeMenuItem = new MenuItem("Change with time");
       changeWithTimeMenuItem.setOnAction(e -> {
          final ChangeWithTimeDialog changeWithTimeDialog = new ChangeWithTimeDialog(model,
@@ -274,7 +277,7 @@ private Node createListEntryForProject(final Project p) {
                return;
             }
             final ObservableList<Node> nodes = grid.getChildren();
-            editProject(p, manageProjectController);
+            editProject(nodes, p);
 
             projectNameLabel.setText(p.getName());
             projectNameLabel.setTextFill(new Color(p.getColor().getRed() * dimFactor,
@@ -284,7 +287,6 @@ private Node createListEntryForProject(final Project p) {
 
             // TODO how to update currentProjectLabel when active project was edited?
             realignProjectList();
-            updateTooltip(p);
          });
       });
 
@@ -294,17 +296,6 @@ private Node createListEntryForProject(final Project p) {
       return projectElement;
    }
 
-   private void updateTooltip(final Project p) {
-      final Pane pane = (Pane) projectSelectionNodeMap.get(p);
-      final Label projectNameLabel = (Label) pane.getChildren().get(0);
-      final String tooltipText = String.format("%s%n%s", p.getName(), p.getDescription());
-      final Tooltip projectTooltip = projectNameLabel.getTooltip();
-      if (projectTooltip == null) {
-         projectNameLabel.setTooltip(new Tooltip());
-      }
-      projectNameLabel.getTooltip().setText(tooltipText);
-   }
-
    private Dialog<ButtonType> setUpDialogButtonType(final String title, final String headerText) {
       final Dialog<ButtonType> dialog = new Dialog<>();
       dialog.setTitle(title);
@@ -314,29 +305,60 @@ private Dialog<ButtonType> setUpDialogButtonType(final String title, final Strin
    }
 
    private GridPane setUpEditProjectGridPane(final Project p) {
-      GridPane grid;
-      final FXMLLoader loader = new FXMLLoader(Resources.getResource(RESOURCE.FXML_MANAGE_PROJECT));
-      try {
-         grid = loader.load();
-      } catch (final IOException e) {
-         throw new FXMLLoaderException("Error while loading '" + Resources.RESOURCE.FXML_MANAGE_PROJECT + "'.", e);
-      }
-      manageProjectController = loader.getController();
-      manageProjectController.setModel(model);
-      manageProjectController.secondInitialize();
-      manageProjectController.setValues(p.getName(), p.getDescription(), p.getColor(), p.isWork(), p.getIndex());
+      final GridPane grid = setUpGridPane(p.getName(), p.getColor(), p.isWork());
+
+      final Spinner<Integer> indexSpinner = new Spinner<>();
+      final int availableProjectAmount = model.getAvailableProjects().size();
+      indexSpinner.setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount - 1, p.getIndex()));
+      grid.add(indexSpinner, 1, 3);
+
+      return grid;
+   }
+
+   private GridPane setUpGridPane(final String projectName, final Color projectColor, final boolean isWork) {
+      final GridPane grid = new GridPane();
+      grid.setHgap(10);
+      grid.setVgap(10);
+      grid.setPadding(new Insets(20, 150, 10, 10));
+
+      final Label nameLabel = new Label("Name:");
+      nameLabel.setFont(FontProvider.getDefaultFont());
+      grid.add(nameLabel, 0, 0);
+
+      final TextField projectNameTextField = new TextField(projectName);
+      projectNameTextField.setFont(FontProvider.getDefaultFont());
+      grid.add(projectNameTextField, 1, 0);
+
+      final Label colorLabel = new Label("Color:");
+      colorLabel.setFont(FontProvider.getDefaultFont());
+      grid.add(colorLabel, 0, 1);
+
+      final ColorPicker colorPicker = new ColorPicker(projectColor);
+      grid.add(colorPicker, 1, 1);
+
+      final Label isWorkLabel = new Label("IsWork:");
+      isWorkLabel.setFont(FontProvider.getDefaultFont());
+      grid.add(isWorkLabel, 0, 2);
+
+      final CheckBox isWorkCheckBox = new CheckBox();
+      isWorkCheckBox.setSelected(isWork);
+      isWorkCheckBox.setFont(FontProvider.getDefaultFont());
+      grid.add(isWorkCheckBox, 1, 2);
+
+      final Label sortIndex = new Label("SortIndex:");
+      sortIndex.setFont(FontProvider.getDefaultFont());
+      grid.add(new Label("SortIndex:"), 0, 3);
 
       return grid;
    }
 
-   private void editProject(final Project p, final ManageProjectController manageProjectController) {
-      final TextField nameTextField = manageProjectController.getNameTextField();
-      final TextArea descriptionTextArea = manageProjectController.getDescriptionTextArea();
-      final ColorPicker textFillColorPicker = manageProjectController.getTextFillColorPicker();
-      final CheckBox isWorkCheckBox = manageProjectController.getIsWorkCheckBox();
-      final Spinner<Integer> sortIndexSpinner = manageProjectController.getSortIndexSpinner();
-      controller.editProject(p, nameTextField.getText(), descriptionTextArea.getText(), textFillColorPicker.getValue(),
-            isWorkCheckBox.isSelected(), sortIndexSpinner.getValue());
+   private void editProject(final ObservableList<Node> nodes, final Project p) {
+      final TextField projectNameTextField = (TextField) nodes.get(1);
+      final ColorPicker colorPicker = (ColorPicker) nodes.get(3);
+      final CheckBox isWorkCheckBox = (CheckBox) nodes.get(5);
+      final Spinner<Integer> indexSpinner = (Spinner<Integer>) nodes.get(7);
+      controller.editProject(p, projectNameTextField.getText(), colorPicker.getValue(), isWorkCheckBox.isSelected(),
+            indexSpinner.getValue());
    }
 
    private ListCell<Project> returnListCellOfProject() {