diff -r bd4ce7f9ea2c -r 06bc4bd64599 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java --- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java Tue Dec 18 19:31:20 2018 -0500 +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java Fri Dec 21 07:40:47 2018 -0500 @@ -25,8 +25,6 @@ package jdk.jpackage.internal; -import jdk.jpackage.internal.resources.MacResources; - import java.io.*; import java.nio.file.Files; import java.text.MessageFormat; @@ -54,11 +52,6 @@ params -> "", (s, p) -> s); - public MacDmgBundler() { - super(); - baseResourceLoader = MacResources.class; - } - public File bundle(Map params, File outdir) { Log.verbose(MessageFormat.format(I18N.getString("message.building-dmg"), APP_NAME.fetchFrom(params))); @@ -160,11 +153,10 @@ data.put("DEPLOY_INSTALL_NAME", "Desktop"); Writer w = new BufferedWriter(new FileWriter(dmgSetup)); - w.write(preprocessTextResource( - MacAppBundler.BUNDLER_PREFIX + dmgSetup.getName(), + w.write(preprocessTextResource(dmgSetup.getName(), I18N.getString("resource.dmg-setup-script"), DEFAULT_DMG_SETUP_SCRIPT, data, VERBOSE.fetchFrom(p), - DROP_IN_RESOURCES_ROOT.fetchFrom(p))); + RESOURCE_DIR.fetchFrom(p))); w.close(); } @@ -207,11 +199,10 @@ Writer w = new BufferedWriter( new FileWriter(getConfig_LicenseFile(params))); w.write(preprocessTextResource( - MacAppBundler.BUNDLER_PREFIX - + getConfig_LicenseFile(params).getName(), + getConfig_LicenseFile(params).getName(), I18N.getString("resource.license-setup"), DEFAULT_LICENSE_PLIST, data, VERBOSE.fetchFrom(params), - DROP_IN_RESOURCES_ROOT.fetchFrom(params))); + RESOURCE_DIR.fetchFrom(params))); w.close(); } catch (IOException ex) { @@ -222,41 +213,38 @@ private boolean prepareConfigFiles(Map params) throws IOException { File bgTarget = getConfig_VolumeBackground(params); - fetchResource(MacAppBundler.BUNDLER_PREFIX + bgTarget.getName(), + fetchResource(bgTarget.getName(), I18N.getString("resource.dmg-background"), DEFAULT_BACKGROUND_IMAGE, bgTarget, VERBOSE.fetchFrom(params), - DROP_IN_RESOURCES_ROOT.fetchFrom(params)); + RESOURCE_DIR.fetchFrom(params)); File iconTarget = getConfig_VolumeIcon(params); if (MacAppBundler.ICON_ICNS.fetchFrom(params) == null || !MacAppBundler.ICON_ICNS.fetchFrom(params).exists()) { - fetchResource( - MacAppBundler.BUNDLER_PREFIX + iconTarget.getName(), + fetchResource(iconTarget.getName(), I18N.getString("resource.volume-icon"), TEMPLATE_BUNDLE_ICON, iconTarget, VERBOSE.fetchFrom(params), - DROP_IN_RESOURCES_ROOT.fetchFrom(params)); + RESOURCE_DIR.fetchFrom(params)); } else { - fetchResource( - MacAppBundler.BUNDLER_PREFIX + iconTarget.getName(), + fetchResource(iconTarget.getName(), I18N.getString("resource.volume-icon"), MacAppBundler.ICON_ICNS.fetchFrom(params), iconTarget, VERBOSE.fetchFrom(params), - DROP_IN_RESOURCES_ROOT.fetchFrom(params)); + RESOURCE_DIR.fetchFrom(params)); } - fetchResource(MacAppBundler.BUNDLER_PREFIX - + getConfig_Script(params).getName(), + fetchResource(getConfig_Script(params).getName(), I18N.getString("resource.post-install-script"), (String) null, getConfig_Script(params), VERBOSE.fetchFrom(params), - DROP_IN_RESOURCES_ROOT.fetchFrom(params)); + RESOURCE_DIR.fetchFrom(params)); prepareLicense(params);