Improve version display

- show the actual PMD version in title
- make the pmd.designer.version show up when running in IntelliJ (and no pom.properties file is found)

Author: adangel

CONTRIBUTING.md

@@ -25,7 +25,7 @@
 paste the following:
 ```shell
 git update-index --skip-worktree -- .idea/misc.xml pmd-designer.iml # Ignore some config files
-mvn process-resources # Generate CSS resources
+./mvnw process-resources # Generate CSS resources
 ```
 
 4. [Synchronize the directory contents](https://stackoverflow.com/a/4599243/6245827) to pick-up on the new CSS files

pom.xml

@@ -54,7 +54,9 @@
     </developers>
 
     <properties>
+        <pmd.designer.version>${project.version}</pmd.designer.version> <!-- see DesignerVersion -->
         <pmd.core.version>7.0.0-SNAPSHOT</pmd.core.version>
+
         <openjfx.version>11.0.2</openjfx.version>
         <java.version>8</java.version>
         <kotlin.version>1.7.20</kotlin.version>

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

@@ -10,6 +10,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import net.sourceforge.pmd.PMDVersion;
 import net.sourceforge.pmd.util.fxdesigner.app.DesignerParams;
 import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
 import net.sourceforge.pmd.util.fxdesigner.app.DesignerRootImpl;
@@ -72,7 +73,7 @@ public void stop() {
     public void start(Stage stage, DesignerRoot owner) throws IOException {
         this.designerRoot = owner;
 
-        stage.setTitle("PMD Rule Designer (v " + DesignerVersion.getCurrentVersion() + ')');
+        stage.setTitle("PMD Rule Designer " + DesignerVersion.getCurrentVersion() + " (with PMD " + PMDVersion.VERSION + ")");
         setIcons(stage);
 
         System.out.println(stage.getTitle() + " initializing... ");

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

@@ -25,10 +25,10 @@ public final class DesignerVersion {
     private static final String UNKNOWN_VERSION = "unknown";
 
     /**
-     * Determines the version from maven's generated pom.properties file.
+     * Determines the version from maven's generated designer.properties file.
      */
     static {
-        VERSION = readProperty("/META-INF/maven/net.sourceforge.pmd/pmd-designer/pom.properties", "version").orElse(UNKNOWN_VERSION);
+        VERSION = readProperty(ResourceUtil.resolveResource("designer.properties"), "pmd.designer.version").orElse(UNKNOWN_VERSION);
         PMD_CORE_MIN_VERSION = readProperty(ResourceUtil.resolveResource("designer.properties"), "pmd.core.version").orElse(UNKNOWN_VERSION);
     }
 

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

@@ -210,7 +210,7 @@ public static void showAboutPopup(DesignerRoot root) {
         String sb =
             "PMD core version:\t\t" + PMDVersion.VERSION + "\n"
                 + "Designer version:\t\t\t" + DesignerVersion.getCurrentVersion()
-                + " (supports PMD core " + DesignerVersion.getPmdCoreMinVersion() + ")\n"
+                + " (min. supported PMD core " + DesignerVersion.getPmdCoreMinVersion() + ")\n"
                 + "Designer settings dir:\t\t"
                 + root.getService(DesignerRoot.DISK_MANAGER).getSettingsDirectory() + "\n"
                 + "Available languages:\t\t"