added alert if license file was not found

Author: Martin Plieske

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

@@ -27,16 +27,21 @@ public class FileOpenHelper {
 
    private FileOpenHelper() {}
 
-   public static void openFile(final String fileString) {
+   public static boolean openFile(final String fileString) {
       final File file = new File(fileString);
       final Runtime rt = Runtime.getRuntime();
 
-      if (OS.isWindows()) {
-         executeCommandWindows(rt, file);
-      } else if (OS.isLinux()) {
-         executeCommandLinux(rt, file);
+      if (file.exists() && file.isFile()) {
+         if (OS.isWindows()) {
+            executeCommandWindows(rt, file);
+         } else if (OS.isLinux()) {
+            executeCommandLinux(rt, file);
+         } else {
+            LOG.warn("OS is not supported");
+         }
+         return true;
       } else {
-         LOG.warn("OS is not supported");
+         return false;
       }
    }
 

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

@@ -18,20 +18,29 @@
 
 public enum Licenses {
 
-   GPLV3("./licenses/GNU General Public License (GPL), Version 3.0.txt", "GNU General Public License Version 3.0"),
-   EPLV1("./licenses/EPL 1.0.txt", "Eclipse Public License 1.0"),
-   APACHEV2("./licenses/Apache License, Version 2.0.txt", "Apache License Version 2.0"),
+   GPLV3(
+         "./licenses/GNU General Public License (GPL), Version 3.0.txt",
+         "GNU General Public License Version 3.0",
+         "https://www.gnu.org/licenses/gpl-3.0.de.html"),
+   EPLV1("./licenses/EPL 1.0.txt", "Eclipse Public License 1.0", "https://www.eclipse.org/legal/epl-v10.html"),
+   APACHEV2(
+         "./licenses/Apache License, Version 2.0.txt",
+         "Apache License Version 2.0",
+         "https://www.apache.org/licenses/LICENSE-2.0"),
    LGPLV3(
          "./licenses/GNU Lesser General Public License (LGPL), Version 3.0.txt",
-         "GNU Lesser General Public License Version 3.0"),
-   MIT("./licenses/The MIT License.txt", "The MIT License");
+         "GNU Lesser General Public License Version 3.0",
+         "https://www.gnu.org/licenses/lgpl-3.0.de.html"),
+   MIT("./licenses/The MIT License.txt", "The MIT License", "https://opensource.org/licenses/MIT");
 
    private final String path;
    private final String name;
+   private final String url;
 
-   private Licenses(final String licensePath, final String licenseName) {
+   private Licenses(final String licensePath, final String licenseName, final String urlWebsite) {
       path = licensePath;
       name = licenseName;
+      url = urlWebsite;
    }
 
    public String getPath() {
@@ -41,4 +50,8 @@ public String getPath() {
    public String getName() {
       return name;
    }
+
+   public String getUrl() {
+      return url;
+   }
 }

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

@@ -27,6 +27,8 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
@@ -85,14 +87,22 @@ protected void updateItem(final String item, final boolean empty) {
 
             setOnMouseExited(e -> setUnderline(false));
 
-            setOnMouseClicked(e -> {
-               if (!empty && e.getButton() == MouseButton.PRIMARY) {
+            setOnMouseClicked(eventOnMouseClicked -> {
+               if (!empty && eventOnMouseClicked.getButton() == MouseButton.PRIMARY) {
                   final LicenceTableRow row = (LicenceTableRow) getTableRow().getItem();
                   final Licenses license = row.getLicense();
                   LOG.debug("License file name: {}", license);
 
-                  FileOpenHelper.openFile(license.getPath());
-                  // TODO show error if file does not exist
+                  if (!FileOpenHelper.openFile(license.getPath())) {
+                     final Alert alert = new Alert(AlertType.ERROR);
+                     alert.setTitle("Ooops");
+                     alert.setHeaderText("Could not find the license file");
+                     alert.setContentText(
+                           String.format("We could not find the license file at \"%s\".%nPlease visit \"%s\".",
+                                 license.getPath(), license.getUrl()));
+
+                     alert.show();
+                  }
                }
             });
          }

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

@@ -256,7 +256,7 @@ private void loadSubStages() {
          aboutStage.setOnHiding(e -> this.thisStage.setAlwaysOnTop(true));
          aboutStage.setOnShowing(e -> {
             this.thisStage.setAlwaysOnTop(false);
-            aboutStage.setAlwaysOnTop(true);
+            aboutStage.setAlwaysOnTop(false);
          });
 
          LOG.debug("done setting up stage");