src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
branchJDK-8200758-branch
changeset 57396 3944e4c2f779
parent 57393 85998c745ee9
child 57687 c56bbf4aaf98
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java	Thu Jun 06 19:31:11 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java	Thu Jun 06 19:51:17 2019 -0400
@@ -472,21 +472,21 @@
                     (s, p) -> new LinkedHashSet<>(Arrays.asList(s.split(",")))
             );
 
-    static boolean isRuntimeInstaller(Map<String, ? super Object> p) {
-        if (p.containsKey(MODULE.getID()) ||
-                p.containsKey(MAIN_JAR.getID()) ||
-                p.containsKey(PREDEFINED_APP_IMAGE.getID())) {
+    static boolean isRuntimeInstaller(Map<String, ? super Object> params) {
+        if (params.containsKey(MODULE.getID()) ||
+                params.containsKey(MAIN_JAR.getID()) ||
+                params.containsKey(PREDEFINED_APP_IMAGE.getID())) {
             return false; // we are building or are given an application
         }
         // runtime installer requires --runtime-image, if this is false
         // here then we should have thrown error validating args.
-        return p.containsKey(PREDEFINED_RUNTIME_IMAGE.getID());
+        return params.containsKey(PREDEFINED_RUNTIME_IMAGE.getID());
     }
 
-    static File getPredefinedAppImage(Map<String, ? super Object> p) {
+    static File getPredefinedAppImage(Map<String, ? super Object> params) {
         File applicationImage = null;
-        if (PREDEFINED_APP_IMAGE.fetchFrom(p) != null) {
-            applicationImage = PREDEFINED_APP_IMAGE.fetchFrom(p);
+        if (PREDEFINED_APP_IMAGE.fetchFrom(params) != null) {
+            applicationImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
             Log.debug("Using App Image from " + applicationImage);
             if (!applicationImage.exists()) {
                 throw new RuntimeException(
@@ -500,10 +500,10 @@
     }
 
     static void copyPredefinedRuntimeImage(
-            Map<String, ? super Object> p,
+            Map<String, ? super Object> params,
             AbstractAppImageBuilder appBuilder)
             throws IOException , ConfigException {
-        File image = PREDEFINED_RUNTIME_IMAGE.fetchFrom(p);
+        File image = PREDEFINED_RUNTIME_IMAGE.fetchFrom(params);
         if (!image.exists()) {
             throw new ConfigException(
                     MessageFormat.format(I18N.getString(
@@ -520,7 +520,7 @@
 
         // if module-path given - copy modules to appDir/mods
         List<Path> modulePath =
-                StandardBundlerParam.MODULE_PATH.fetchFrom(p);
+                StandardBundlerParam.MODULE_PATH.fetchFrom(params);
         List<Path> defaultModulePath = getDefaultModulePath();
         Path dest = appBuilder.getAppModsDir();