--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java Mon Mar 11 13:31:48 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java Mon Mar 11 14:44:00 2019 -0400
@@ -46,8 +46,6 @@
static final BundlerParamInfo<File> ICON_ICO =
new StandardBundlerParam<>(
- I18N.getString("param.icon-ico.name"),
- I18N.getString("param.icon-ico.description"),
"icon.ico",
File.class,
params -> {
@@ -171,41 +169,18 @@
File doBundle(Map<String, ? super Object> p, File outputDirectory,
boolean dependentTask) throws PackagerException {
- if (RUNTIME_INSTALLER.fetchFrom(p)) {
- return doJreBundle(p, outputDirectory, dependentTask);
+ if (StandardBundlerParam.isRuntimeInstaller(p)) {
+ return PREDEFINED_RUNTIME_IMAGE.fetchFrom(p);
} else {
return doAppBundle(p, outputDirectory, dependentTask);
}
}
- File doJreBundle(Map<String, ? super Object> p, File outputDirectory,
- boolean dependentTask) throws PackagerException {
- try {
- File rootDirectory = createRoot(p, outputDirectory, dependentTask,
- APP_NAME.fetchFrom(p), "windowsapp-image-builder");
- AbstractAppImageBuilder appBuilder = new WindowsAppImageBuilder(
- APP_NAME.fetchFrom(p),
- outputDirectory.toPath());
- File predefined = PREDEFINED_RUNTIME_IMAGE.fetchFrom(p);
- if (predefined == null ) {
- JLinkBundlerHelper.generateJre(p, appBuilder);
- } else {
- return predefined;
- }
- return rootDirectory;
- } catch (PackagerException pe) {
- throw pe;
- } catch (Exception e) {
- Log.verbose(e);
- throw new PackagerException(e);
- }
- }
-
File doAppBundle(Map<String, ? super Object> p, File outputDirectory,
boolean dependentTask) throws PackagerException {
try {
File rootDirectory = createRoot(p, outputDirectory, dependentTask,
- APP_NAME.fetchFrom(p), "windowsapp-image-builder");
+ APP_NAME.fetchFrom(p));
AbstractAppImageBuilder appBuilder =
new WindowsAppImageBuilder(p, outputDirectory.toPath());
if (PREDEFINED_RUNTIME_IMAGE.fetchFrom(p) == null ) {