src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java

@@ -47,11 +47,10 @@
  * There may be multiple add-launchers, each created by using the
  * command line arg "--add-launcher <file path>
  *
  * The add-launcher properties file may have any of:
  *
- * name (required)
  * appVersion
  * module
  * add-modules
  * main-jar
  * main-class

@@ -61,59 +60,62 @@
  * win-console
  *
  */
 class AddLauncherArguments {
 
+    private final String name;
     private final String filename;
     private Map<String, String> allArgs;
     private Map<String, ? super Object> bundleParams;
 
-    AddLauncherArguments(String filename) {
+    AddLauncherArguments(String name, String filename) {
+        this.name = name;
         this.filename = filename;
     }
 
     private void initLauncherMap() {
         if (bundleParams != null) {
             return;
         }
 
         allArgs = Arguments.getPropertiesFromFile(filename);
+        allArgs.put(CLIOptions.NAME.getId(), name);
 
         bundleParams = new HashMap<>();
         String mainJar = getOptionValue(CLIOptions.MAIN_JAR);
         String mainClass = getOptionValue(CLIOptions.APPCLASS);
         String module = getOptionValue(CLIOptions.MODULE);
 
         if (module != null && mainClass != null) {
-            putUnlessNull(bundleParams, Arguments.CLIOptions.MODULE.getId(),
+            putUnlessNull(bundleParams, CLIOptions.MODULE.getId(),
                     module + "/" + mainClass);
         } else if (module != null) {
-            putUnlessNull(bundleParams, Arguments.CLIOptions.MODULE.getId(),
+            putUnlessNull(bundleParams, CLIOptions.MODULE.getId(),
                     module);
         } else {
-            putUnlessNull(bundleParams, Arguments.CLIOptions.MAIN_JAR.getId(),
+            putUnlessNull(bundleParams, CLIOptions.MAIN_JAR.getId(),
                     mainJar);
-            putUnlessNull(bundleParams, Arguments.CLIOptions.APPCLASS.getId(),
+            putUnlessNull(bundleParams, CLIOptions.APPCLASS.getId(),
                     mainClass);
         }
 
-        putUnlessNull(bundleParams, Arguments.CLIOptions.NAME.getId(),
+        putUnlessNull(bundleParams, CLIOptions.NAME.getId(),
                 getOptionValue(CLIOptions.NAME));
 
-        putUnlessNull(bundleParams, Arguments.CLIOptions.VERSION.getId(),
+        putUnlessNull(bundleParams, CLIOptions.VERSION.getId(),
                 getOptionValue(CLIOptions.VERSION));
 
         putUnlessNull(bundleParams,
-                Arguments.CLIOptions.ADD_MODULES.getId(),
+                CLIOptions.ADD_MODULES.getId(),
                 getOptionValue(CLIOptions.ADD_MODULES));
 
         putUnlessNull(bundleParams,
-                Arguments.CLIOptions.WIN_CONSOLE_HINT.getId(),
+                CLIOptions.WIN_CONSOLE_HINT.getId(),
                 getOptionValue(CLIOptions.WIN_CONSOLE_HINT));
 
         String value = getOptionValue(CLIOptions.ICON);
-        putUnlessNull(bundleParams, Arguments.CLIOptions.ICON.getId(),
+        putUnlessNull(bundleParams, CLIOptions.ICON.getId(),
                 (value == null) ? null : new File(value));
 
         String argumentStr = getOptionValue(CLIOptions.ARGUMENTS);
         putUnlessNullOrEmpty(bundleParams,
                 CLIOptions.ARGUMENTS.getId(),