--- old/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java 2019-06-04 11:08:40.137521100 -0400 +++ new/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java 2019-06-04 11:08:36.143818700 -0400 @@ -85,14 +85,14 @@ ); @Override - public boolean validate(Map p) + public boolean validate(Map params) throws UnsupportedPlatformException, ConfigException { try { - if (p == null) throw new ConfigException( + if (params == null) throw new ConfigException( I18N.getString("error.parameters-null"), I18N.getString("error.parameters-null.advice")); - return doValidate(p); + return doValidate(params); } catch (RuntimeException re) { if (re.getCause() instanceof ConfigException) { throw (ConfigException) re.getCause(); @@ -102,47 +102,48 @@ } } - private boolean doValidate(Map p) + private boolean doValidate(Map params) throws UnsupportedPlatformException, ConfigException { if (Platform.getPlatform() != Platform.LINUX) { throw new UnsupportedPlatformException(); } - imageBundleValidation(p); + imageBundleValidation(params); return true; } // it is static for the sake of sharing with "installer" bundlers // that may skip calls to validate/bundle in this class! - static File getRootDir(File outDir, Map p) { - return new File(outDir, APP_NAME.fetchFrom(p)); + static File getRootDir(File outDir, Map params) { + return new File(outDir, APP_NAME.fetchFrom(params)); } - static String getLauncherCfgName(Map p) { - return "app/" + APP_NAME.fetchFrom(p) +".cfg"; + static String getLauncherCfgName(Map params) { + return "app/" + APP_NAME.fetchFrom(params) +".cfg"; } - File doBundle(Map p, File outputDirectory, + File doBundle(Map params, File outputDirectory, boolean dependentTask) throws PackagerException { - if (StandardBundlerParam.isRuntimeInstaller(p)) { - return PREDEFINED_RUNTIME_IMAGE.fetchFrom(p); + if (StandardBundlerParam.isRuntimeInstaller(params)) { + return PREDEFINED_RUNTIME_IMAGE.fetchFrom(params); } else { - return doAppBundle(p, outputDirectory, dependentTask); + return doAppBundle(params, outputDirectory, dependentTask); } } - private File doAppBundle(Map p, + private File doAppBundle(Map params, File outputDirectory, boolean dependentTask) throws PackagerException { try { - File rootDirectory = createRoot(p, outputDirectory, dependentTask, - APP_NAME.fetchFrom(p)); - AbstractAppImageBuilder appBuilder = new LinuxAppImageBuilder(p, - outputDirectory.toPath()); - if (PREDEFINED_RUNTIME_IMAGE.fetchFrom(p) == null ) { - JLinkBundlerHelper.execute(p, appBuilder); + File rootDirectory = createRoot(params, outputDirectory, + dependentTask, APP_NAME.fetchFrom(params)); + AbstractAppImageBuilder appBuilder = new LinuxAppImageBuilder( + params, outputDirectory.toPath()); + if (PREDEFINED_RUNTIME_IMAGE.fetchFrom(params) == null ) { + JLinkBundlerHelper.execute(params, appBuilder); } else { - StandardBundlerParam.copyPredefinedRuntimeImage(p, appBuilder); + StandardBundlerParam.copyPredefinedRuntimeImage( + params, appBuilder); } return rootDirectory; } catch (PackagerException pe) {