Allow DesignerStarter to be invoked directly

 - The JCommander usage is deprecated
 - We update debug params for compatibility with all PMD commands
 - We allow to call startGui directly

Author: jsotuyod

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

@@ -12,6 +12,12 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+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 javafx.application.Application;
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
@@ -20,11 +26,6 @@
 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;
 
 
 /**

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

@@ -11,6 +11,8 @@
 
 import org.apache.commons.lang3.SystemUtils;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.ParameterException;
 import javafx.application.Application;
@@ -47,7 +49,7 @@ private static boolean isJavaFxAvailable() {
         }
     }
 
-
+    @Deprecated
     private static MainCliArgs readParameters(String[] argv) {
 
         MainCliArgs argsObj = new MainCliArgs();
@@ -75,7 +77,12 @@ private static MainCliArgs readParameters(String[] argv) {
 
     }
 
-
+    /**
+     * Starting from PMD 7.0.0 this method usage will be limited for development.
+     * CLI support will be provided by pmd-cli
+     */
+    @Deprecated
+    @InternalApi
     public static void main(String[] args) {
 
         readParameters(args);
@@ -118,6 +125,7 @@ private static String getJavaFxVersion() {
         return null;
     }
 
+    @Deprecated
     private static String getHelpText(JCommander jCommander) {
 
         StringBuilder sb = new StringBuilder();
@@ -139,7 +147,7 @@ private static String getHelpText(JCommander jCommander) {
     }
 
     @SuppressWarnings("PMD.AvoidCatchingThrowable")
-    private static void launchGui(String[] args) {
+    public static int launchGui(String[] args) {
         setSystemProperties();
 
         String message = null;
@@ -152,14 +160,16 @@ private static void launchGui(String[] args) {
         if (message != null) {
             System.err.println(message);
             JOptionPane.showMessageDialog(null, message);
-            System.exit(ERROR_EXIT);
+            return ERROR_EXIT;
         }
 
         try {
             Application.launch(Designer.class, args);
         } catch (Throwable unrecoverable) {
             unrecoverable.printStackTrace();
-            System.exit(ERROR_EXIT);
+            return ERROR_EXIT;
         }
+
+        return OK;
     }
 }

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

@@ -15,7 +15,7 @@
 /**
  * Stores the current Designer and PMD version and provides utility methods around them.
  */
-public class DesignerVersion {
+public final class DesignerVersion {
 
     /**
      * Constant that contains always the current version of the designer.

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

@@ -6,10 +6,11 @@
 
 import com.beust.jcommander.Parameter;
 
+@Deprecated
 final class MainCliArgs {
 
 
-    @Parameter(names = {"--verbose", "-v"},
+    @Parameter(names = {"--verbose", "-v", "-D", "--debug"},
                arity = 0,
                description = "Whether to launch the app in verbose mode. "
                    + "This enables logging of exception stack traces and "

src/main/java/net/sourceforge/pmd/util/fxdesigner/app/DesignerParams.java

@@ -9,7 +9,6 @@
 import java.util.List;
 
 import com.sun.javafx.application.ParametersImpl;
-
 import javafx.application.Application.Parameters;
 
 

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

@@ -19,6 +19,13 @@
 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.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;
+
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.Transition;
@@ -32,12 +39,6 @@
 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;
 
 
 /**