Merge pull request #26 from doubleSlashde/feature/alert_if_license_is_missing

Feature/alert if license is missing

Author: Death111

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

@@ -16,6 +16,8 @@
 
 package de.doubleslash.keeptime.common;
 
+import java.util.Arrays;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,33 +31,33 @@ public static void openURL(final String url) {
       final Runtime rt = Runtime.getRuntime();
 
       if (OS.isWindows()) {
-         executeCommandWindows(rt, url);
+         openUrlWindows(rt, url);
       } else if (OS.isLinux()) {
-         executeCommandLinux(rt, url);
+         openUrlLinux(rt, url);
       } else {
          LOG.warn("OS is not supported");
       }
    }
 
-   private static void executeCommandWindows(final Runtime rt, final String url) {
+   private static void openUrlWindows(final Runtime rt, final String url) {
+      final String command = "rundll32 url.dll,FileProtocolHandler " + url;
       try {
-         final String command = "rundll32 url.dll,FileProtocolHandler " + url;
-         LOG.debug("execute command: {}", command);
-
+         LOG.debug("Executing command: {}", command);
          rt.exec(command);
       } catch (final Exception e) {
-         LOG.error(e.getMessage());
+         LOG.error("Could not open url '" + url + "' with command '" + command + "'.", e);
       }
    }
 
-   private static void executeCommandLinux(final Runtime rt, final String url) {
+   private static void openUrlLinux(final Runtime rt, final String url) {
+      final String[] command = {
+            "xdg-open", url
+      };
       try {
-         final String command = "xdg-open " + url;
-         LOG.debug("execute command: {}", command);
-
+         LOG.debug("Executing command: {}", Arrays.toString(command));
          rt.exec(command);
       } catch (final Exception e) {
-         LOG.warn(e.getMessage());
+         LOG.error("Could not open url '" + url + "' with command '" + Arrays.toString(command) + "'.", e);
       }
    }
 }

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

@@ -17,6 +17,7 @@
 package de.doubleslash.keeptime.common;
 
 import java.io.File;
+import java.util.Arrays;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,15 +28,15 @@ public class FileOpenHelper {
 
    private FileOpenHelper() {}
 
-   public static boolean openFile(final String fileString) {
-      final File file = new File(fileString);
+   public static boolean openFile(final String filePath) {
+      final File file = new File(filePath);
       final Runtime rt = Runtime.getRuntime();
 
       if (file.exists() && file.isFile()) {
          if (OS.isWindows()) {
-            executeCommandWindows(rt, file);
+            openFileWindows(rt, file);
          } else if (OS.isLinux()) {
-            executeCommandLinux(rt, file);
+            openFileLinux(rt, filePath);
          } else {
             LOG.warn("OS is not supported");
          }
@@ -45,25 +46,25 @@ public static boolean openFile(final String fileString) {
       }
    }
 
-   private static void executeCommandWindows(final Runtime rt, final File file) {
+   private static void openFileWindows(final Runtime rt, final File file) {
+      final String command = "rundll32 url.dll,FileProtocolHandler " + file;
       try {
-         final String command = "rundll32 url.dll,FileProtocolHandler " + file;
          LOG.debug("executing command: {}", command);
-
          rt.exec(command);
       } catch (final Exception e) {
-         LOG.error(e.getMessage());
+         LOG.error("Could not open file '" + file + "' with command '" + command + "'.", e);
       }
    }
 
-   private static void executeCommandLinux(final Runtime rt, final File file) {
+   private static void openFileLinux(final Runtime rt, final String filePath) {
+      final String[] command = {
+            "xdg-open", filePath
+      };
       try {
-         final String command = "xdg-open " + file;
-         LOG.debug("executing command: {}", command);
-
+         LOG.debug("executing command: {}", Arrays.toString(command));
          rt.exec(command);
       } catch (final Exception e) {
-         LOG.error(e.getMessage());
+         LOG.error("Could not open file '" + filePath + "' with command '" + Arrays.toString(command) + "'.", e);
       }
    }
 }

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

@@ -39,6 +39,7 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.input.MouseButton;
+import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
 
 public class AboutController {
@@ -153,6 +154,8 @@ private void showLicense(final Licenses license) {
          alert.setContentText(String.format(
                "We could not find the license file at \"%s\". Did you remove it?%nPlease redownload or visit \"%s\".",
                license.getPath(), license.getUrl()));
+         
+         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
 
          alert.show();
       }