buildSrc/src/main/java/workaround/GradleJUnitWorker.java

rev 9996 : 8163316: Update FX to use new gnu style java command line options
Reviewed-by: kcr

@@ -143,25 +143,25 @@
     public static void main(String args[]) {
 
         try {
             final ArrayList<String> cmd = new ArrayList<>(30);
             String gradleWorkerJar = null;
-            String xpatchesFile = null;
+            String patchmoduleFile = null;
             String exportsFile = null;
             String classpathFile = null;
             String jigsawJavapath = null;
 
             final String exportsFileProperty = "worker.exports.file";
             final String workerDebugProperty = "worker.debug";
-            final String xpatchesFileProperty = "worker.xpatch.file";
+            final String patchmoduleFileProperty = "worker.patchmodule.file";
             final String classpathFileProperty = "worker.classpath.file";
             final String javaCmdProperty = "worker.java.cmd";
 
             Collections.addAll(ignoreSysProps, defSysProps);
             ignoreSysProps.add(exportsFileProperty);
             ignoreSysProps.add(workerDebugProperty);
-            ignoreSysProps.add(xpatchesFileProperty);
+            ignoreSysProps.add(patchmoduleFileProperty);
             ignoreSysProps.add(classpathFileProperty);
             ignoreSysProps.add(javaCmdProperty);
 
             debug = Boolean.parseBoolean(System.getProperty(workerDebugProperty, "false"));
 

@@ -173,14 +173,14 @@
                     if (debug) System.err.println("XWORKER gradleWorkerJar="+exportsFile);
                 } else if (args[i].contains(exportsFileProperty)) {
                     int equals = args[i].indexOf("=");
                     exportsFile = args[i].substring(equals+1);
                     if (debug) System.err.println("XWORKER "+exportsFileProperty+"="+exportsFile);
-                } else if (args[i].contains(xpatchesFileProperty)) {
+                } else if (args[i].contains(patchmoduleFileProperty)) {
                     int equals = args[i].indexOf("=");
-                    xpatchesFile = args[i].substring(equals+1);
-                    if (debug) System.err.println("XWORKER "+xpatchesFileProperty+"="+xpatchesFile);
+                    patchmoduleFile = args[i].substring(equals+1);
+                    if (debug) System.err.println("XWORKER "+patchmoduleFileProperty+"="+patchmoduleFile);
                 } else if (args[i].contains(javaCmdProperty)) {
                     int equals = args[i].indexOf("=");
                     jigsawJavapath = args[i].substring(equals+1);
                     if (debug) System.err.println("XWORKER "+javaCmdProperty+"="+jigsawJavapath);
                 } else if (args[i].contains(classpathFileProperty)) {

@@ -372,17 +372,17 @@
 
             cmd.add(java_cmd);
 
             cmd.add("-D"+javaCmdProperty+"="+java_cmd);
 
-            if (xpatchesFile == null) {
-                xpatchesFile = System.getProperty(xpatchesFileProperty);
+            if (patchmoduleFile == null) {
+                patchmoduleFile = System.getProperty(patchmoduleFileProperty);
             }
 
-            if (xpatchesFile != null) {
-                cmd.add("@" + xpatchesFile);
-                cmd.add("-D" + xpatchesFileProperty + "=" + xpatchesFile);
+            if (patchmoduleFile != null) {
+                cmd.add("@" + patchmoduleFile);
+                cmd.add("-D" + patchmoduleFileProperty + "=" + patchmoduleFile);
             }
 
             if (exportsFile == null) {
                 exportsFile = System.getProperty(exportsFileProperty);
             }