Merge pull request #93 from lightsuner/master

feature: add ability to use array of commands as runJavaParameters
FibreFoX · Dec 28, 2017 · 5b90599 · 5b90599
2 parents 760e79f + bcb10db
commit 5b90599
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/...main/java/de/dynamicfiles/projects/gradle/plugins/javafx/JavaFXGradlePluginExtension.java b/...main/java/de/dynamicfiles/projects/gradle/plugins/javafx/JavaFXGradlePluginExtension.java
@@ -100,6 +100,8 @@ public class JavaFXGradlePluginExtension {
     private String runJavaParameter = null;
     private String runAppParameter = null;
 
+    private List<String> runJavaParameters = null;
+
     // generic settings (not present on javafx-maven-plugin)
     private String alternativePathToJarFile = null;
     private boolean usePatchedJFXAntLib = true;
@@ -629,4 +631,11 @@ public void setCheckForAbsolutePaths(boolean checkForAbsolutePaths) {
         this.checkForAbsolutePaths = checkForAbsolutePaths;
     }
 
+    public List<String> getRunJavaParameters() {
+        return runJavaParameters;
+    }
+
+    public void setRunJavaParameters(List<String> runJavaParameters) {
+        this.runJavaParameters = runJavaParameters;
+    }
 }
diff --git a/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/tasks/workers/JfxRunWorker.java b/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/tasks/workers/JfxRunWorker.java
@@ -41,12 +41,21 @@ public void jfxrun(Project project) {
 
         List<String> command = new ArrayList<>();
         command.add(getEnvironmentRelativeExecutablePath(ext.isUseEnvironmentRelativeExecutables()) + "java");
+
         Optional.ofNullable(ext.getRunJavaParameter()).ifPresent(runJavaParameter -> {
             if( runJavaParameter.trim().isEmpty() ){
                 return;
             }
             command.add(runJavaParameter);
         });
+
+        Optional.ofNullable(ext.getRunJavaParameters()).ifPresent(runJavaParameters -> {
+            if( runJavaParameters.isEmpty() ){
+                return;
+            }
+            command.addAll(runJavaParameters);
+        });
+
         command.add("-jar");
         command.add(ext.getJfxMainAppJarName());
         Optional.ofNullable(ext.getRunAppParameter()).ifPresent(runAppParameter -> {