expand OS an use it in SettingsController

Author: Martin Plieske

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

@@ -11,9 +11,7 @@ public class FileOpenHelper {
 
    private static final Logger LOG = LoggerFactory.getLogger(FileOpenHelper.class);
 
-   private File fileToOpen;
-
-   public FileOpenHelper() {}
+   private final File fileToOpen;
 
    public FileOpenHelper(final File file) {
       this.fileToOpen = file;
@@ -27,24 +25,16 @@ public void openFile() {
       executeCommand();
    }
 
-   public void openFile(final File file) {
+   public static void openFile(final File file) {
       executeCommand(file);
    }
 
-   public void openFile(final String fileString) {
+   public static void openFile(final String fileString) {
       final File file = new File(fileString);
 
       executeCommand(file);
    }
 
-   public void setFile(final File file) {
-      this.fileToOpen = file;
-   }
-
-   public void setFile(final String fileString) {
-      this.fileToOpen = new File(fileString);
-   }
-
    private void executeCommand() {
       final Runtime rt = Runtime.getRuntime();
 
@@ -57,7 +47,7 @@ private void executeCommand() {
       }
    }
 
-   private void executeCommand(final File file) {
+   private static void executeCommand(final File file) {
       final Runtime rt = Runtime.getRuntime();
 
       if (OS.isWindows()) {
@@ -77,7 +67,7 @@ private void executeCommandWindows(final Runtime rt) {
       }
    }
 
-   private void executeCommandWindows(final Runtime rt, final File file) {
+   private static void executeCommandWindows(final Runtime rt, final File file) {
       try {
          rt.exec("rundll32 url.dll,FileProtocolHandler " + file);
       } catch (final Exception e) {
@@ -93,7 +83,7 @@ private void executeCommandLinux(final Runtime rt) {
       }
    }
 
-   private void executeCommandLinux(final Runtime rt, final File file) {
+   private static void executeCommandLinux(final Runtime rt, final File file) {
       try {
          rt.exec("xdg-open " + file);
       } catch (final Exception e) {

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

@@ -4,24 +4,30 @@
 
 public class OS {
 
+   private static final String OS_PROPERTY = "os.name";
+
    private OS() {
 
    }
 
    public static boolean isWindows() {
-      if (System.getProperty("os.name").toLowerCase().contains("windows")) {
+      if (System.getProperty(OS_PROPERTY).toLowerCase().contains("windows")) {
          return true;
       }
 
       return false;
    }
 
    public static boolean isLinux() {
-      if (System.getProperty("os.name").toLowerCase().contains("linux")) {
+      if (System.getProperty(OS_PROPERTY).toLowerCase().contains("linux")) {
          return true;
       }
 
       return false;
    }
 
+   public static String getOSname() {
+      return System.getProperty(OS_PROPERTY);
+   }
+
 }

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

@@ -9,6 +9,7 @@
 import org.slf4j.LoggerFactory;
 
 import de.doubleslash.keeptime.common.ConfigParser;
+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;
@@ -91,13 +92,13 @@ public class SettingsController {
    @FXML
    private void initialize() {
       LOG.debug("start init");
-      LOG.info("OS: {}", System.getProperty(OS_NAME));
+      LOG.info("OS: {}", OS.getOSname());
       LOG.debug("set versionLabel text");
       LOG.debug("load substages");
       loadSubStages();
       LOG.debug("set version label text");
 
-      if (System.getProperty(OS_NAME).contains("Linux")) {
+      if (OS.isLinux()) {
          if (useHotkeyCheckBox != null) {
             LOG.debug("useHotkeyCheckBox is initialized");
             useHotkeyCheckBox.setDisable(true);
@@ -124,7 +125,7 @@ private void initialize() {
       saveButton.setOnAction(ae -> {
          LOG.info("Save clicked");
 
-         if (System.getProperty(OS_NAME).contains("Linux")) {
+         if (OS.isLinux()) {
             if (hoverBackgroundColor.getValue().getOpacity() < 0.5) {
                hoverBackgroundColor.setValue(Color.rgb((int) (hoverBackgroundColor.getValue().getRed() * 255),
                      (int) (hoverBackgroundColor.getValue().getGreen() * 255),