Merge pull request #30 from doubleSlashde/develop

Develop

Author: Death111

COPYING

@@ -0,0 +1,26 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+  
+  <id>bin</id>
+  
+  <formats>
+  	<format>zip</format>
+  </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/src/main/resources/licenses</directory>
+      <outputDirectory>licenses</outputDirectory>
+    </fileSet>
+  </fileSets>
+  
+  <dependencySets>
+    <dependencySet>
+      <includes>
+        <include>de.doubleslash:keeptime</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

assembly.xml

@@ -1 +1 @@
-start "" "javaw" -Dprism.order=sw -jar keeptime-v1.0.0.jar
+start "" "javaw" -Dprism.order=sw -jar keeptime-1.1.0-SNAPSHOT.jar

keeptime.bat

@@ -5,23 +5,37 @@
 
   <groupId>de.doubleslash</groupId>
   <artifactId>keeptime</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>KeepTime</name>
   <description>Time tracker</description>
 
+  <licenses>
+    <license>
+      <name>GNU General Public License (GPL) version 3.0</name>
+      <url>http://www.gnu.org/licenses/gpl.txt</url>
+      <distribution>manual</distribution>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>doubleSlash Net-Business GmbH</name>
+    <url>https://www.doubleslash.de/</url>
+  </organization>
+
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.0.2.RELEASE</version>
+    <version>2.1.5.RELEASE</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -34,20 +48,21 @@
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <scope>runtime</scope>
+      <!-- overwriting managed version as newer version is not supported by flyway: H2 1.4.199 is newer than this version 
+        of Flyway and support has not been tested. -->
+      <version>1.4.197</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/org.flywaydb/flyway-maven-plugin -->
+
     <dependency>
       <groupId>org.flywaydb</groupId>
-      <artifactId>flyway-maven-plugin</artifactId>
-      <version>5.1.4</version>
+      <artifactId>flyway-core</artifactId>
     </dependency>
 
-
     <dependency>
       <groupId>com.1stleg</groupId>
       <artifactId>jnativehook</artifactId>
@@ -58,17 +73,18 @@
       <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>
 
+    <!-- maven assembly plugin -->
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-assembly-plugin</artifactId>
+      <version>3.1.1</version>
+      <type>maven-plugin</type>
+    </dependency>
   </dependencies>
 
   <build>
@@ -77,8 +93,54 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
+
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-keeptime-zip</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>./assembly.xml</descriptor>
+              </descriptors>
+              <finalName>keeptime-${project.version}</finalName>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
+  <reporting>
+    <plugins>
+      <!-- needed for mvn site - see https://stackoverflow.com/a/51099913 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.7.1</version>
+      </plugin>
 
+      <plugin>
+        <groupId>org.owasp</groupId>
+        <artifactId>dependency-check-maven</artifactId>
+        <version>5.0.0-M2</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+          <failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>
+          <failBuildOnCVSS>8</failBuildOnCVSS>
+          <!-- <suppressionFile>dependency-check-report_suppressions.xml</suppressionFile> -->
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

pom.xml

@@ -1,3 +1,19 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime;
 
 import java.lang.Thread.UncaughtExceptionHandler;

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

@@ -1,3 +1,19 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime;
 
 import java.io.IOException;
@@ -14,6 +30,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 
+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;
@@ -22,8 +39,8 @@
 import de.doubleslash.keeptime.model.Settings;
 import de.doubleslash.keeptime.model.Work;
 import de.doubleslash.keeptime.view.ViewController;
-import de.doubleslash.keeptime.viewPopup.GlobalScreenListener;
-import de.doubleslash.keeptime.viewPopup.ViewControllerPopup;
+import de.doubleslash.keeptime.viewpopup.GlobalScreenListener;
+import de.doubleslash.keeptime.viewpopup.ViewControllerPopup;
 import javafx.application.Application;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
@@ -46,7 +63,7 @@ public class Main extends Application {
 
    private static final Logger LOG = LoggerFactory.getLogger(Main.class);
 
-   public static final String VERSION = "v1.0.0";
+   public static final String VERSION = "v1.1.0";
 
    private ConfigurableApplicationContext springContext;
 
@@ -75,7 +92,7 @@ public void init() throws Exception {
    public void start(final Stage primaryStage) {
       LOG.info("Initialising the UI");
       try {
-         initUI(primaryStage);
+         initialiseApplication(primaryStage);
          LOG.info("UI successfully initialised.");
       } catch (final Exception e) {
          LOG.error("There was an error while initialising the UI", e);
@@ -112,35 +129,35 @@ public void start(final Stage primaryStage) {
       }
    }
 
-   private void initUI(final Stage primaryStage) throws Exception {
-
+   private void initialiseApplication(final Stage primaryStage) throws Exception {
+      FontProvider.loadFonts();
       readSettings();
 
-      final List<Work> todaysWorkItems = model.workRepository.findByCreationDate(LocalDate.now());
+      final List<Work> todaysWorkItems = model.getWorkRepository().findByCreationDate(LocalDate.now());
       LOG.info("Found {} past work items", todaysWorkItems.size());
-      model.pastWorkItems.addAll(todaysWorkItems);
+      model.getPastWorkItems().addAll(todaysWorkItems);
 
-      final List<Project> projects = model.projectRepository.findAll();
+      final List<Project> projects = model.getProjectRepository().findAll();
 
       LOG.debug("Found '{}' projects", projects.size());
       if (projects.isEmpty()) {
          LOG.info("Adding default project");
-         projects.add(model.DEFAULT_PROJECT);
-         model.projectRepository.save(model.DEFAULT_PROJECT);
+         projects.add(Model.DEFAULT_PROJECT);
+         model.getProjectRepository().save(Model.DEFAULT_PROJECT);
       }
 
-      model.allProjects.addAll(projects);
-      model.availableProjects
-            .addAll(model.allProjects.stream().filter(Project::isEnabled).collect(Collectors.toList()));
+      model.getAllProjects().addAll(projects);
+      model.getAvailableProjects()
+            .addAll(model.getAllProjects().stream().filter(Project::isEnabled).collect(Collectors.toList()));
 
       // set default project
       final Optional<Project> findAny = projects.stream().filter(Project::isDefault).findAny();
       if (findAny.isPresent()) {
-         model.idleProject = findAny.get();
-         LOG.debug("Using project '{}' as default project.", model.idleProject);
+         model.setIdleProject(findAny.get());
+         LOG.debug("Using project '{}' as default project.", model.getIdleProject());
       }
 
-      primaryStage.setOnHiding((we) -> {
+      primaryStage.setOnHiding(we -> {
          popupViewStage.close();
          globalScreenListener.shutdown(); // deregister, as this will keep app running
       });
@@ -152,21 +169,21 @@ private void initUI(final Stage primaryStage) throws Exception {
    private void readSettings() {
       LOG.debug("Reading configuration");
 
-      final List<Settings> settingsList = model.settingsRepository.findAll();
+      final List<Settings> settingsList = model.getSettingsRepository().findAll();
       final Settings settings;
       if (settingsList.isEmpty()) {
          settings = new Settings();
          settings.setTaskBarColor(model.taskBarColor.get());
 
-         settings.setDefaultBackgroundColor(model.defaultBackgroundColor.get());
-         settings.setDefaultFontColor(model.defaultFontColor.get());
+         settings.setDefaultBackgroundColor(Model.ORIGINAL_DEFAULT_BACKGROUND_COLOR);
+         settings.setDefaultFontColor(Model.ORIGINAL_DEFAULT_FONT_COLOR);
 
-         settings.setHoverBackgroundColor(model.hoverBackgroundColor.get());
-         settings.setHoverFontColor(model.hoverFontColor.get());
+         settings.setHoverBackgroundColor(Model.ORIGINAL_HOVER_BACKGROUND_COLOR);
+         settings.setHoverFontColor(Model.ORIGINAL_HOVER_Font_COLOR);
          settings.setUseHotkey(false);
          settings.setDisplayProjectsRight(false);
-         settings.setHideProjectsOnMouseExit(true);
-         model.settingsRepository.save(settings);
+         settings.setHideProjectsOnMouseExit(false);
+         model.getSettingsRepository().save(settings);
       } else {
          settings = settingsList.get(0);
       }
@@ -185,10 +202,8 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
       LOG.debug("Initialising popup UI.");
 
       globalScreenListener = new GlobalScreenListener();
-      // stop and close stage when main stage is shutdown
-      model.useHotkey.addListener((a, b, newValue) -> {
-         globalScreenListener.register(newValue);
-      });
+
+      model.useHotkey.addListener((a, b, newValue) -> globalScreenListener.register(newValue));
       globalScreenListener.register(model.useHotkey.get());
 
       popupViewStage = new Stage();
@@ -206,8 +221,8 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
       // Give the controller access to the main app.
       popupViewStage.setAlwaysOnTop(true);
       final ViewControllerPopup viewControllerPopupController = loader.getController();
-      viewControllerPopupController.setStage(popupViewStage, popupScene);
-      viewControllerPopupController.setController(controller, model);
+      viewControllerPopupController.setStage(popupViewStage);
+      viewControllerPopupController.setControllerAndModel(controller, model);
       globalScreenListener.setViewController(viewControllerPopupController);
    }
 
@@ -237,13 +252,12 @@ public void handle(final WindowEvent event) {
             LOG.info("On close request");
          }
       });
-
+      primaryStage.show();
       viewController = loader.getController();
       // Give the controller access to the main app.
       viewController.setStage(primaryStage);
       viewController.setController(controller, model);
 
-      primaryStage.show();
    }
 
    @Override