Merge branch 'master' into feature/dayChange

# Conflicts:
#	src/main/java/de/doubleslash/keeptime/model/Model.java
#	src/main/java/de/doubleslash/keeptime/view/SettingsController.java

Author: Death111

pom.xml

@@ -45,6 +45,22 @@
       <artifactId>jnativehook</artifactId>
       <version>2.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.w3c</groupId>
+      <artifactId>dom</artifactId>
+      <version>2.3.0-jaxb-1.0.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.21.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.8</version>
+    </dependency>
+
   </dependencies>
 
   <build>

src/main/java/de/doubleslash/keeptime/Main.java

@@ -56,6 +56,7 @@ public void init() throws Exception {
 
    @Override
    public void start(final Stage primaryStage) throws Exception {
+
       stage = primaryStage;
 
       LOG.debug("Reading configuration");

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

@@ -0,0 +1,76 @@
+package de.doubleslash.keeptime.common;
+
+import java.io.File;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import de.doubleslash.keeptime.controller.Controller;
+import de.doubleslash.keeptime.model.Model;
+import de.doubleslash.keeptime.model.Project;
+import javafx.scene.paint.Color;
+
+public class ConfigParser {
+
+   Controller controller;
+   Model model;
+
+   public ConfigParser(final Model model, final Controller controller) {
+      this.model = model;
+      this.controller = controller;
+   }
+
+   public static boolean hasConfigFile(final String fileName) {
+      final File f = new File(fileName);
+      return f.exists();
+   }
+
+   public void parserConfig(final File inputFile) {
+      try {
+         final DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+         final DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+         final Document doc = dBuilder.parse(inputFile);
+         doc.getDocumentElement().normalize();
+         System.out.println("Root element :" + doc.getDocumentElement().getNodeName());
+         final NodeList nList = doc.getElementsByTagName("project");
+         System.out.println("----------------------------");
+
+         // index makes sure to add new projects at the end
+         int index = controller.getAvailableProjects().size();
+         for (int temp = 0; temp < nList.getLength(); temp++) {
+            final Node nNode = nList.item(temp);
+            if (nNode.getNodeType() == Node.ELEMENT_NODE) {
+               final Element eElement = (Element) nNode;
+               // get element
+               final String name = eElement.getElementsByTagName("name").item(0).getTextContent();
+               final String isWork = eElement.getElementsByTagName("isWork").item(0).getTextContent();
+               final String color = eElement.getElementsByTagName("color").item(0).getTextContent();
+
+               System.out.println("checking for: " + name);
+               boolean exists = false;
+
+               for (final Project p : controller.getAvailableProjects()) {
+                  if (name.equals(p.getName())) {
+                     System.out.println(name + "    " + Boolean.toString(exists));
+                     exists = true;
+                  }
+               }
+               if (!exists) {
+                  final Color colorTemp = Color.valueOf(color);
+                  controller.addNewProject(name, Boolean.parseBoolean(isWork), colorTemp, index);
+                  index++;
+               }
+
+            }
+         }
+
+      } catch (final Exception e) {
+         e.printStackTrace();
+      }
+   }
+}

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

@@ -20,6 +20,7 @@
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Settings;
 import de.doubleslash.keeptime.model.Work;
+import javafx.collections.ObservableList;
 import javafx.scene.paint.Color;
 
 @Service
@@ -160,13 +161,13 @@ public void editProject(final Project p, final String newName, final Color newCo
     * Changes the indexes of the originalList parameter to have a consistent order.
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                          list of all projects to adapt the indexes for
     * @param changedProject
-    *           the project which has changed which already has the new index
+    *                          the project which has changed which already has the new index
     * @param oldIndex
-    *           the old index of the changed project
+    *                          the old index of the changed project
     * @param newIndex
-    *           the new index of the changed project (which the projects also already has)
+    *                          the new index of the changed project (which the projects also already has)
     * @return all projects whose index has been adapted
     */
    List<Project> resortProjectIndexes(final List<Project> originalList, final Project changedProject,
@@ -208,9 +209,9 @@ List<Project> resortProjectIndexes(final List<Project> originalList, final Proje
     * Decreases all indexes by one, after the removed index
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                        list of all projects to adapt the indexes for
     * @param removedIndex
-    *           the index which has been removed
+    *                        the index which has been removed
     * @return all projects whose index has been adapted
     */
    List<Project> adaptProjectIndexesAfterRemoving(final List<Project> originalList, final int removedIndex) {
@@ -265,4 +266,7 @@ public long calcTodaysSeconds() {
       }).sum();
    }
 
+   public ObservableList<Project> getAvailableProjects() {
+      return this.model.availableProjects;
+   }
 }

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

@@ -30,9 +30,10 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
       this.settingsRepository = settingsRepository;
    }
 
-   public static final Color originalHoverBackgroundColor = new Color(54 / 255., 143 / 255., 179 / 255., .1);
+   public static final Color originalHoverBackgroundColor = new Color(54 / 255., 143 / 255., 179 / 255., .7);
+
    public static final Color originalHoverFontColor = Color.BLACK;
-   public static final Color originalDefaultBackgroundColor = new Color(54 / 255., 143 / 255., 179 / 255., 0.01);
+   public static final Color originalDefaultBackgroundColor = new Color(54 / 255., 143 / 255., 179 / 255., .7);
    public static final Color originalDefaultFontColor = Color.BLACK;
 
    public static final Color originalTaskBarFontColor = Color.BLACK;

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

@@ -1,10 +1,15 @@
 package de.doubleslash.keeptime.view;
 
+import java.io.File;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import de.doubleslash.keeptime.common.ConfigParser;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
@@ -49,9 +54,13 @@ public class SettingsController {
 
    private final Logger LOG = LoggerFactory.getLogger(this.getClass());
 
+   @FXML
+   private Button parseConfigButton;
+
    private Model model;
    private Controller controller;
    private Stage thisStage;
+   private static final String INPUT_FILE = "config.xml";
 
    @FXML
    private void initialize() {
@@ -85,6 +94,16 @@ private void initialize() {
          taskBarColor.setValue(Model.originalTaskBarFontColor);
       });
 
+      parseConfigButton.setOnAction(new EventHandler<ActionEvent>() {
+         @Override
+         public void handle(final ActionEvent actionEvent) {
+            if (ConfigParser.hasConfigFile(INPUT_FILE)) {
+               final ConfigParser parser = new ConfigParser(model, controller);
+               parser.parserConfig(new File(INPUT_FILE));
+            }
+         }
+      });
+
    }
 
    public void setModelAndController(final Model model, final Controller controller) {

src/main/resources/settings.fxml

@@ -118,6 +118,7 @@
                <children>
                   <Button fx:id="saveButton" mnemonicParsing="false" text="Save" />
                   <Button fx:id="cancelButton" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" text="Cancel" />
+                  <Button fx:id="parseConfigButton" mnemonicParsing="false" text="pars config.xml" />
                </children>
             </HBox>
          </children>