jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java

*** 82,116 ****
              = new TaskHelper(JLINK_BUNDLE);
  
      private static final Option<?>[] recognizedOptions = {
          new Option<JlinkTask>(false, (task, opt, arg) -> {
              task.options.help = true;
!         }, "--help"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              String[] dirs = arg.split(File.pathSeparator);
              Arrays.stream(dirs)
                    .map(Paths::get)
                    .forEach(task.options.modulePath::add);
!         }, "--modulepath", "--mp"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              for (String mn : arg.split(",")) {
                  if (mn.isEmpty()) {
                      throw taskHelper.newBadArgs("err.mods.must.be.specified",
!                             "--limitmods");
                  }
                  task.options.limitMods.add(mn);
              }
!         }, "--limitmods"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              for (String mn : arg.split(",")) {
                  if (mn.isEmpty()) {
                      throw taskHelper.newBadArgs("err.mods.must.be.specified",
!                             "--addmods");
                  }
                  task.options.addMods.add(mn);
              }
!         }, "--addmods"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              Path path = Paths.get(arg);
              task.options.output = path;
          }, "--output"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
--- 82,117 ----
              = new TaskHelper(JLINK_BUNDLE);
  
      private static final Option<?>[] recognizedOptions = {
          new Option<JlinkTask>(false, (task, opt, arg) -> {
              task.options.help = true;
!         }, "--help", "-h"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              String[] dirs = arg.split(File.pathSeparator);
+             int i = 0;
              Arrays.stream(dirs)
                    .map(Paths::get)
                    .forEach(task.options.modulePath::add);
!         }, "--module-path", "-p"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              for (String mn : arg.split(",")) {
                  if (mn.isEmpty()) {
                      throw taskHelper.newBadArgs("err.mods.must.be.specified",
!                             "--limit-modules");
                  }
                  task.options.limitMods.add(mn);
              }
!         }, "--limit-modules"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              for (String mn : arg.split(",")) {
                  if (mn.isEmpty()) {
                      throw taskHelper.newBadArgs("err.mods.must.be.specified",
!                             "--add-modules");
                  }
                  task.options.addMods.add(mn);
              }
!         }, "--add-modules"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              Path path = Paths.get(arg);
              task.options.output = path;
          }, "--output"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
*** 132,145 ****
              }
              task.options.packagedModulesPath = path;
          }, true, "--keep-packaged-modules"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              task.options.saveoptsfile = arg;
!         }, "--saveopts"),
          new Option<JlinkTask>(false, (task, opt, arg) -> {
              task.options.fullVersion = true;
!         }, true, "--fullversion"),};
  
      private static final String PROGNAME = "jlink";
      private final OptionsValues options = new OptionsValues();
  
      private static final OptionsHelper<JlinkTask> optionsHelper
--- 133,146 ----
              }
              task.options.packagedModulesPath = path;
          }, true, "--keep-packaged-modules"),
          new Option<JlinkTask>(true, (task, opt, arg) -> {
              task.options.saveoptsfile = arg;
!         }, "--save-opts"),
          new Option<JlinkTask>(false, (task, opt, arg) -> {
              task.options.fullVersion = true;
!         }, true, "--full-version"),};
  
      private static final String PROGNAME = "jlink";
      private final OptionsValues options = new OptionsValues();
  
      private static final OptionsHelper<JlinkTask> optionsHelper
*** 292,302 ****
          ModuleFinder finder
                  = newModuleFinder(options.modulePath, options.limitMods, options.addMods);
          try {
              options.addMods = checkAddMods(options.addMods);
          } catch (IllegalArgumentException ex) {
!             throw taskHelper.newBadArgs("err.mods.must.be.specified", "--addmods")
                      .showUsage(true);
          }
          // First create the image provider
          ImageProvider imageProvider
                  = createImageProvider(finder,
--- 293,303 ----
          ModuleFinder finder
                  = newModuleFinder(options.modulePath, options.limitMods, options.addMods);
          try {
              options.addMods = checkAddMods(options.addMods);
          } catch (IllegalArgumentException ex) {
!             throw taskHelper.newBadArgs("err.mods.must.be.specified", "--add-modules")
                      .showUsage(true);
          }
          // First create the image provider
          ImageProvider imageProvider
                  = createImageProvider(finder,