# HG changeset patch
# User herrick
# Date 1559863720 14400
# Node ID 17c43babfc2f508cecaf396f8b0570125e7d72da
# Parent  85998c745ee9e718168a80757aa5c31c0ef4d6e6
8224748: --add-launcher option --add-modules
Reviewed-by: asemenyuk, almatvee

diff -r 85998c745ee9 -r 17c43babfc2f src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java	Thu Jun 06 19:21:05 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java	Thu Jun 06 19:28:40 2019 -0400
@@ -51,7 +51,6 @@
  *
  * appVersion
  * module
- * add-modules
  * main-jar
  * main-class
  * icon
@@ -105,10 +104,6 @@
                 getOptionValue(CLIOptions.VERSION));
 
         putUnlessNull(bundleParams,
-                CLIOptions.ADD_MODULES.getId(),
-                getOptionValue(CLIOptions.ADD_MODULES));
-
-        putUnlessNull(bundleParams,
                 CLIOptions.WIN_CONSOLE_HINT.getId(),
                 getOptionValue(CLIOptions.WIN_CONSOLE_HINT));
 
@@ -176,9 +171,6 @@
             tmp.remove("main-class");
         } else if (additional.containsKey("main-jar")) {
             tmp.remove("module");
-            // should we only remove add-modules when it wasn't actually passed
-            // but was inferred or empty ?
-            tmp.remove("add-modules");
         }
         tmp.putAll(additional);
         return tmp;
diff -r 85998c745ee9 -r 17c43babfc2f src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Thu Jun 06 19:21:05 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Thu Jun 06 19:28:40 2019 -0400
@@ -128,7 +128,7 @@
 \          Name of launcher, and a path to a Properties file that contains\n\
 \          a list of key, value pairs\n\
 \          (absolute path or relative to the current directory)\n\
-\          The keys "module", "add-modules", "main-jar", "main-class",\n\
+\          The keys "module", "main-jar", "main-class",\n\
 \          "arguments", "java-options", "app-version", "icon", and\n\
 \          "win-console" can be used.\n\
 \          These options are added to, or used to overwrite, the original\n\
diff -r 85998c745ee9 -r 17c43babfc2f src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties	Thu Jun 06 19:21:05 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties	Thu Jun 06 19:28:40 2019 -0400
@@ -128,7 +128,7 @@
 \          Name of launcher, and a path to a Properties file that contains\n\
 \          a list of key, value pairs\n\
 \          (absolute path or relative to the current directory)\n\
-\          The keys "module", "add-modules", "main-jar", "main-class",\n\
+\          The keys "module", "main-jar", "main-class",\n\
 \          "arguments", "java-options", "app-version", "icon", and\n\
 \          "win-console" can be used.\n\
 \          These options are added to, or used to overwrite, the original\n\
diff -r 85998c745ee9 -r 17c43babfc2f src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties	Thu Jun 06 19:21:05 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties	Thu Jun 06 19:28:40 2019 -0400
@@ -128,7 +128,7 @@
 \          Name of launcher, and a path to a Properties file that contains\n\
 \          a list of key, value pairs\n\
 \          (absolute path or relative to the current directory)\n\
-\          The keys "module", "add-modules", "main-jar", "main-class",\n\
+\          The keys "module", "main-jar", "main-class",\n\
 \          "arguments", "java-options", "app-version", "icon", and\n\
 \          "win-console" can be used.\n\
 \          These options are added to, or used to overwrite, the original\n\