modules/jdk.packager/src/antplugin/java/com/sun/javafx/tools/ant/DeployFXTask.java

*** 192,237 ****
  
              deployParams.setUpdateMode(updateMode);
              deployParams.setExtension(isExtension);
              deployParams.setIncludeDT(includeDT);
  
-             if (platform != null) {
-                 Platform pl = platform.get();
-                 if (pl.j2se != null) {
-                     deployParams.setJRE(pl.j2se);
-                 }
-                 if (pl.javafx != null) {
-                     deployParams.setJavafx(pl.javafx);
-                 }
- 
-                 //only pass it further if it was explicitly set
-                 // as we do not want to override default
-                 if (pl.javaRoot != null) {
-                     if (Platform.USE_SYSTEM_JRE.equals(pl.javaRoot)) {
-                         deployParams.setJavaRuntimeSource(null);
-                     } else {
-                         deployParams.setJavaRuntimeSource(new File(pl.javaRoot));
-                     }
-                 }
- 
-                 for (Property p: pl.properties) {
-                     deployParams.addJvmProperty(p.name, p.value);
-                 }
-                 for (Jvmarg a: pl.jvmargs) {
-                     deployParams.addJvmArg(a.value);
-                 }
-                 for (Property a: pl.jvmUserArgs) {
-                     deployParams.addJvmUserArg(a.name, a.value);
-                 }
-             }
- 
              if (callbacks != null) {
                  for (Callback cb: callbacks.callbacks) {
                      deployParams.addCallback(cb.getName(), cb.getCmd());
                  }
              }
  
              setPreferences();
  
              for (Template t: templateList) {
                  deployParams.addTemplate(t.infile, t.outfile);
              }
--- 192,208 ----
  
              deployParams.setUpdateMode(updateMode);
              deployParams.setExtension(isExtension);
              deployParams.setIncludeDT(includeDT);
  
              if (callbacks != null) {
                  for (Callback cb: callbacks.callbacks) {
                      deployParams.addCallback(cb.getName(), cb.getCmd());
                  }
              }
  
+             setPlatform();
              setPreferences();
  
              for (Template t: templateList) {
                  deployParams.addTemplate(t.infile, t.outfile);
              }
*** 317,326 ****
--- 288,298 ----
                          appInfo.fileAssociations.stream()
                              .map(FileAssociation::createLauncherMap)
                              .collect(Collectors.toList()));
              }
  
+             setPlatform();
              setPreferences();
          }
  
          if (!isModular &&
              (nativeBundles == BundleType.NATIVE ||
*** 365,374 ****
--- 337,347 ----
                          appInfo.fileAssociations.stream()
                              .map(FileAssociation::createLauncherMap)
                              .collect(Collectors.toList()));
              }
  
+             setPlatform();
              setPreferences();
          }
  
          for (BundleArgument ba : bundleArgumentList) {
              deployParams.addBundleArgument(ba.arg, ba.value);
*** 651,660 ****
--- 624,665 ----
          //Use qName and value - can't really validate anything until we know which bundlers we have, so this has
          //to done (way) downstream
          bundleArgumentList.add(new BundleArgument(name, value));
      }
  
+     private void setPlatform() {
+         if (platform != null) {
+             Platform pl = platform.get();
+             if (pl.j2se != null) {
+                 deployParams.setJRE(pl.j2se);
+             }
+             if (pl.javafx != null) {
+                 deployParams.setJavafx(pl.javafx);
+             }
+ 
+             //only pass it further if it was explicitly set
+             // as we do not want to override default
+             if (pl.javaRoot != null) {
+                 if (Platform.USE_SYSTEM_JRE.equals(pl.javaRoot)) {
+                     deployParams.setJavaRuntimeSource(null);
+                 } else {
+                     deployParams.setJavaRuntimeSource(new File(pl.javaRoot));
+                 }
+             }
+ 
+             for (Property p: pl.properties) {
+                 deployParams.addJvmProperty(p.name, p.value);
+             }
+             for (Jvmarg a: pl.jvmargs) {
+                 deployParams.addJvmArg(a.value);
+             }
+             for (Property a: pl.jvmUserArgs) {
+                 deployParams.addJvmUserArg(a.name, a.value);
+             }
+         }
+     }
+ 
      private void setPreferences() {
          if (prefs != null) {
              deployParams.setNeedShortcut(prefs.getShortcut());
              deployParams.setNeedInstall(prefs.getInstall());
              deployParams.setNeedMenu(prefs.getMenu());