Move version info away from Designer

 - This allows consumers (ie: pmd-cli) to access the Designer version without requiring JavaFX

Author: jsotuyod

src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java

@@ -5,24 +5,13 @@
 package net.sourceforge.pmd.util.fxdesigner;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
-import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-import net.sourceforge.pmd.PMDVersion;
-import net.sourceforge.pmd.lang.ast.xpath.Attribute;
-import net.sourceforge.pmd.util.fxdesigner.app.DesignerParams;
-import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
-import net.sourceforge.pmd.util.fxdesigner.app.DesignerRootImpl;
-import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
-import net.sourceforge.pmd.util.fxdesigner.util.ResourceUtil;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
@@ -31,6 +20,11 @@
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
+import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+import net.sourceforge.pmd.util.fxdesigner.app.DesignerParams;
+import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
+import net.sourceforge.pmd.util.fxdesigner.app.DesignerRootImpl;
+import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
 
 
 /**
@@ -41,44 +35,6 @@
  */
 public class Designer extends Application {
 
-    /**
-     * Constant that contains always the current version of the designer.
-     */
-    private static final String VERSION;
-    private static final String PMD_CORE_MIN_VERSION;
-    private static final String UNKNOWN_VERSION = "unknown";
-
-
-    /**
-     * Determines the version from maven's generated pom.properties file.
-     */
-    static {
-        VERSION = readProperty("/META-INF/maven/net.sourceforge.pmd/pmd-ui/pom.properties", "version").orElse(UNKNOWN_VERSION);
-        PMD_CORE_MIN_VERSION = readProperty(ResourceUtil.resolveResource("designer.properties"), "pmd.core.version").orElse(UNKNOWN_VERSION);
-    }
-
-
-    public static String getCurrentVersion() {
-        return VERSION;
-    }
-
-    public static String getPmdCoreMinVersion() {
-        return PMD_CORE_MIN_VERSION;
-    }
-
-    private static Optional<String> readProperty(String resourcePath, String key) {
-        try (InputStream stream = PMDVersion.class.getResourceAsStream(resourcePath)) {
-            if (stream != null) {
-                final Properties properties = new Properties();
-                properties.load(stream);
-                return Optional.ofNullable(properties.getProperty(key));
-            }
-        } catch (final IOException ignored) {
-            // fallthrough
-        }
-        return Optional.empty();
-    }
-
     private long initStartTimeMillis;
     private DesignerRoot designerRoot;
 
@@ -101,7 +57,7 @@ public void stop() {
     public void start(Stage stage, DesignerRoot owner) throws IOException {
         this.designerRoot = owner;
 
-        stage.setTitle("PMD Rule Designer (v " + Designer.VERSION + ')');
+        stage.setTitle("PMD Rule Designer (v " + DesignerVersion.getCurrentVersion() + ')');
         setIcons(stage);
 
         Logger.getLogger(Attribute.class.getName()).setLevel(Level.OFF);

src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerVersion.java

@@ -0,0 +1,59 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.util.fxdesigner;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Optional;
+import java.util.Properties;
+
+import net.sourceforge.pmd.PMDVersion;
+import net.sourceforge.pmd.util.fxdesigner.util.ResourceUtil;
+
+/**
+ * Stores the current Designer and PMD version and provides utility methods around them.
+ */
+public class DesignerVersion {
+
+    /**
+     * Constant that contains always the current version of the designer.
+     */
+    private static final String VERSION;
+    private static final String PMD_CORE_MIN_VERSION;
+    private static final String UNKNOWN_VERSION = "unknown";
+
+    /**
+     * Determines the version from maven's generated pom.properties file.
+     */
+    static {
+        VERSION = readProperty("/META-INF/maven/net.sourceforge.pmd/pmd-ui/pom.properties", "version").orElse(UNKNOWN_VERSION);
+        PMD_CORE_MIN_VERSION = readProperty(ResourceUtil.resolveResource("designer.properties"), "pmd.core.version").orElse(UNKNOWN_VERSION);
+    }
+
+    private DesignerVersion() {
+        throw new AssertionError("Can't instantiate a utility class.");
+    }
+
+    public static String getCurrentVersion() {
+        return VERSION;
+    }
+
+    public static String getPmdCoreMinVersion() {
+        return PMD_CORE_MIN_VERSION;
+    }
+
+    private static Optional<String> readProperty(String resourcePath, String key) {
+        try (InputStream stream = PMDVersion.class.getResourceAsStream(resourcePath)) {
+            if (stream != null) {
+                final Properties properties = new Properties();
+                properties.load(stream);
+                return Optional.ofNullable(properties.getProperty(key));
+            }
+        } catch (final IOException ignored) {
+            // fallthrough
+        }
+        return Optional.empty();
+    }
+}

src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/GlobalDiskManagerImpl.java

@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import net.sourceforge.pmd.util.fxdesigner.Designer;
+import net.sourceforge.pmd.util.fxdesigner.DesignerVersion;
 import net.sourceforge.pmd.util.fxdesigner.app.ApplicationComponent;
 import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
 
@@ -33,7 +33,7 @@ public GlobalDiskManagerImpl(DesignerRoot root, Path settingsDirectory) {
         this.settingsDirectory = settingsDirectory;
 
 
-        Path curVersionStamp = settingsDirectory.resolve("version-" + Designer.getCurrentVersion());
+        Path curVersionStamp = settingsDirectory.resolve("version-" + DesignerVersion.getCurrentVersion());
 
 
         List<Path> diskVersionStamps = getDiskVersionStamps();
@@ -62,7 +62,7 @@ private List<Path> getDiskVersionStamps() {
                         .filter(it -> !Files.isDirectory(it))
                         .filter(it -> it.getFileName().toString().startsWith(STAMP_PREFIX))
                         .collect(Collectors.toList());
-        } catch (IOException e) {
+        } catch (IOException ignored) {
             return Collections.emptyList();
         }
     }

src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/OnDiskPersistenceManager.java

@@ -9,7 +9,7 @@
 import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
 
-import net.sourceforge.pmd.util.fxdesigner.Designer;
+import net.sourceforge.pmd.util.fxdesigner.DesignerVersion;
 import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
 import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsOwner;
 import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsPersistenceUtil;
@@ -85,7 +85,7 @@ private void commitAppState() throws IOException, InterruptedException {
         process.start().waitFor();
         process.command("git", "add", output.toString());
         process.start().waitFor();
-        process.command("git", "commit", "-m", "\"On version " + Designer.getCurrentVersion() + "\"");
+        process.command("git", "commit", "-m", "\"On version " + DesignerVersion.getCurrentVersion() + "\"");
         process.start().waitFor();
 
     }

src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/SimplePopups.java

@@ -19,13 +19,6 @@
 import org.reactfx.EventSource;
 import org.reactfx.EventStream;
 
-import net.sourceforge.pmd.PMDVersion;
-import net.sourceforge.pmd.lang.Language;
-import net.sourceforge.pmd.util.fxdesigner.Designer;
-import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
-import net.sourceforge.pmd.util.fxdesigner.util.AuxLanguageRegistry;
-import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
-
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.Transition;
@@ -39,6 +32,12 @@
 import javafx.scene.layout.StackPane;
 import javafx.stage.Popup;
 import javafx.util.Duration;
+import net.sourceforge.pmd.PMDVersion;
+import net.sourceforge.pmd.lang.Language;
+import net.sourceforge.pmd.util.fxdesigner.DesignerVersion;
+import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
+import net.sourceforge.pmd.util.fxdesigner.util.AuxLanguageRegistry;
+import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
 
 
 /**
@@ -213,8 +212,8 @@ public static void showAboutPopup(DesignerRoot root) {
 
         String sb =
             "PMD core version:\t\t\t" + PMDVersion.VERSION + "\n"
-                + "Designer version:\t\t\t" + Designer.getCurrentVersion()
-                + " (supports PMD core " + Designer.getPmdCoreMinVersion() + ")\n"
+                + "Designer version:\t\t\t" + DesignerVersion.getCurrentVersion()
+                + " (supports PMD core " + DesignerVersion.getPmdCoreMinVersion() + ")\n"
                 + "Designer settings dir:\t\t"
                 + root.getService(DesignerRoot.DISK_MANAGER).getSettingsDirectory() + "\n"
                 + "Available languages:\t\t"