Merge branch 'develop' into feature/update_settings_dialog_design

# Conflicts:
#	src/main/java/de/doubleslash/keeptime/view/SettingsController.java
#	src/main/resources/layouts/settings.fxml

Author: ddamke

.github/workflows/mavenCi.yml

@@ -0,0 +1,61 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master", "develop" ]
+  pull_request:
+    branches: [ "master", "develop" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+
+  analyze:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'corretto'
+          cache: maven
+      - name: Analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: mvn sonar:sonar
+          -Dsonar.host.url=${{ secrets.HOST_URL }}
+          -Dsonar.organization=${{ secrets.ORGANIZATION_NAME }}
+          -Dsonar.projectKey=${{ secrets.PROJECT_KEY }} -X
+          -Dsonar.java.binaries=.
+          -Dsonar.qualitygate.wait=true
+
+
+  build_and_upload:
+    needs: analyze
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'corretto'
+          cache: maven
+      - name: Build
+        run: |
+          mvn package -B clean verify
+
+      - name: Upload Build Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: KeepTime
+          path: /home/runner/work/KeepTime/KeepTime/target/keeptime-*-bin.zip

README.md

@@ -48,14 +48,24 @@ It is recommended to run the application at computer start so you do not forget
 
 You should put the .jar in an extra folder as a *logs* and a *db* folder will be created next to it.\
 
-### Migrate from old version
+### Migrate from older version than v1.2.0
 
 1. Download new version and replace the .jar file.
 2. Start new version of KeepTime. Notice that your old data is not available.
 3. Stop KeepTime
 4. Copy the files (not directories) of directory `db` (next to the .jar file) into `db/1.4.197/` (path now includes the database version).
 5. Start KeepTime again. Notice that your data is available again.
 
+### Migrate from KeepTime v1.2.0
+
+1. Start your current version of KeepTime (v1.2.0)
+2. Go to the settings and export your KeepTime data 
+3. Download new version and replace the .jar file. 
+4. Start new version of KeepTime. Notice that your old data is not available. 
+5. Open the new version and import the exported sql script 
+6. After the import KeepTime closes automatically
+7. To see the changes just start the new KeepTime again
+
 ## Requirements
 
 * Windows 7, 10

pom.xml

@@ -67,11 +67,11 @@
       <artifactId>flyway-core</artifactId>
     </dependency>
 
-    <!-- https://mvnrepository.com/artifact/com.github.kwhat/jnativehook -->
+    <!-- https://mvnrepository.com/artifact/com.1stleg/jnativehook -->
     <dependency>
-      <groupId>com.github.kwhat</groupId>
+      <groupId>com.1stleg</groupId>
       <artifactId>jnativehook</artifactId>
-      <version>2.2.2</version>
+      <version>2.1.0</version>
     </dependency>
 
     <!-- maven assembly plugin -->
@@ -81,6 +81,11 @@
       <version>3.4.2</version>
       <type>maven-plugin</type>
     </dependency>
+    <dependency>
+      <groupId>org.sonarsource.scanner.maven</groupId>
+      <artifactId>sonar-maven-plugin</artifactId>
+      <version>3.9.1.2184</version>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>

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

@@ -20,10 +20,17 @@
 
 public class SvgNodeProvider {
 
-   public static String getSvgPathWithXMl(Resources.RESOURCE resource) {
+   public static String getSvgPathWithXMl(Resources.RESOURCE resource){
       String svgPath;
       Document document;
       DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+      try {
+         // fixes sonar issue RSPEC-2755
+         dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+      } catch (ParserConfigurationException e) {
+         throw new RuntimeException(e);
+      }
+
       DocumentBuilder db;
 
       try {

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

@@ -18,9 +18,14 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.sql.SQLException;
 import java.util.Comparator;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import de.doubleslash.keeptime.common.*;
 import de.doubleslash.keeptime.view.license.LicenseTableRow;
@@ -30,13 +35,21 @@
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.input.MouseButton;
 import javafx.scene.shape.SVGPath;
+import de.doubleslash.keeptime.Main;
+import de.doubleslash.keeptime.model.Project;
+import de.doubleslash.keeptime.model.Work;
+import javafx.application.Platform;
+import javafx.scene.control.*;
+import org.h2.tools.RunScript;
 import org.h2.tools.Script;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.ApplicationProperties;
+import de.doubleslash.keeptime.common.OS;
+import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.exceptions.FXMLLoaderException;
@@ -46,7 +59,12 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ColorPicker;
+import javafx.scene.control.Label;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
@@ -109,6 +127,9 @@ public class SettingsController {
    @FXML
    private Button exportButton;
 
+   @FXML
+   private Button importButton;
+
    @FXML
    private Button aboutButton;
 
@@ -176,6 +197,7 @@ private void initialize() {
       }
 
       initExportButton();
+      initImportButton();
 
       LOG.debug("saveButton.setOnAction");
       saveButton.setOnAction(ae -> {
@@ -322,6 +344,63 @@ protected void updateItem(final String item, final boolean empty) {
          BrowserHelper.openURL(GITHUB_ISSUE_PAGE);
       });
    }
+   private void initImportButton(){
+      LOG.debug("Initialize importButton.");
+      importButton.setOnAction(event ->{
+
+         try {
+            Alert confirmationAlert = new Alert(AlertType.CONFIRMATION , "", ButtonType.YES, ButtonType.NO);
+            confirmationAlert.setTitle("Import");
+            confirmationAlert.setHeaderText("Do you want to Override current Data ?");
+            confirmationAlert.setContentText("Import previously exported .sql file. This will overwrite the currently used database contents - all current data will be lost!\n" +
+                    "\n" +
+                    "If you do not have a .sql file yet you need to open the previous version of KeepTime and in the settings dialog press \"Export\".\n" +
+                    "\n" +
+                    "You will need to restart the application after this action. If you proceed you need to select the previouls exported .sql file.");
+            confirmationAlert.showAndWait();
+
+            if(confirmationAlert.getResult()==ButtonType.NO){
+               LOG.info("User canceled import");
+               return;
+            }
+
+            final FileChooser fileChooser = new FileChooser();
+            fileChooser.setTitle("Open Exported SQl Script");
+            fileChooser.getExtensionFilters().add(new ExtensionFilter("SQL script files.", "*.sql"));
+            File file = fileChooser.showOpenDialog(thisStage);
+            if (file == null) {
+               LOG.info("User canceled import.");
+               return;
+            }
+
+            final String url = applicationProperties.getSpringDataSourceUrl();
+            final String username = applicationProperties.getSpringDataSourceUserName();
+            final String password = applicationProperties.getSpringDataSourcePassword();
+            //TODO: add an option at the next release to make the "FROM_1X flag" configurable. E.g. if we upgrade (in the release after) from H2 version 2.x to 2.x we must not set the "FROM_1X flag".
+            new RunScript().runTool("-url", url, "-user",username,"-password",password,"-script",file.toString(),"-options", "FROM_1X");
+
+            Alert informationDialog = new Alert(AlertType.INFORMATION);
+            informationDialog.setTitle("Import done");
+            informationDialog.setHeaderText("The data was imported.");
+            informationDialog.setContentText("KeepTime will now be CLOSED! You have to RESTART it again to see the changes");
+            informationDialog.showAndWait();
+            Platform.exit();
+
+
+         } catch (SQLException e) {
+            LOG.error("Could not import script file to db.", e);
+
+            Alert errorDialog = new Alert(AlertType.ERROR);
+            errorDialog.setTitle("Import failed");
+            errorDialog.setHeaderText("The current data could not be imported.");
+            errorDialog.setContentText("Please inform a developer and provide your log file.");
+
+            errorDialog.showAndWait();
+         }
+
+      });
+
+   }
 
    private void initExportButton() {
       LOG.debug("Initialize exportButton.");

src/main/java/de/doubleslash/keeptime/viewpopup/GlobalScreenListener.java

@@ -24,15 +24,14 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.jnativehook.GlobalScreen;
+import org.jnativehook.NativeHookException;
+import org.jnativehook.keyboard.NativeKeyEvent;
+import org.jnativehook.keyboard.NativeKeyListener;
+import org.jnativehook.mouse.NativeMouseEvent;
+import org.jnativehook.mouse.NativeMouseMotionListener;
 import org.slf4j.LoggerFactory;
 
-import com.github.kwhat.jnativehook.GlobalScreen;
-import com.github.kwhat.jnativehook.NativeHookException;
-import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent;
-import com.github.kwhat.jnativehook.keyboard.NativeKeyListener;
-import com.github.kwhat.jnativehook.mouse.NativeMouseEvent;
-import com.github.kwhat.jnativehook.mouse.NativeMouseMotionListener;
-
 import javafx.application.Platform;
 
 /**