# HG changeset patch
# User herrick
# Date 1554823809 14400
# Node ID 4f1efc26b577a6feabad1f62e2ded252ae5c82d6
# Parent  23da9e6f446fc7b8a391fa75890265b29d3bbaba
8222011: Update JNLPConverter after JDK-8221777
Submitten-by: almatvee
Reviewed-by: herrick

diff -r 23da9e6f446f -r 4f1efc26b577 src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/JNLPConverter.java
--- a/src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/JNLPConverter.java	Tue Apr 09 10:57:04 2019 -0400
+++ b/src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/JNLPConverter.java	Tue Apr 09 11:30:09 2019 -0400
@@ -385,8 +385,8 @@
     }
 
     private void buildLaunchArgs() {
-        if (options.createImage()) {
-            addLaunchArg("create-image", launchArgs);
+        if (options.createAppImage()) {
+            addLaunchArg("create-app-image", launchArgs);
         } else if (options.createInstaller()) {
             if (options.getInstallerType() == null) {
                 addLaunchArg("create-installer", launchArgs);
@@ -413,7 +413,6 @@
         addLaunchArg("--main-jar", jnlpd.getMainJar(), launchArgs);
         addLaunchArg("--main-class", jnlpd.getMainClass(), launchArgs);
 
-        addFiles(launchArgs);
         addArguments(launchArgs);
         addJVMArgs(launchArgs);
 
@@ -543,27 +542,6 @@
         }
     }
 
-    private void addFileList(String arg, List<String> filesToAdd, List<String> launchArgs) {
-        if (filesToAdd.isEmpty()) {
-            return;
-        }
-
-        String filesArg = "";
-        for (int i = 0; i < filesToAdd.size(); i++) {
-            filesArg += quote(filesToAdd.get(i));
-            if ((i + 1) != filesToAdd.size()) {
-                filesArg += File.pathSeparator;
-            }
-        }
-
-        launchArgs.add(arg);
-        launchArgs.add(filesArg);
-    }
-
-    private void addFiles(List<String> launchArgs) {
-        addFileList("--files", jnlpd.getFiles(), launchArgs);
-    }
-
     private void addArguments(List<String> launchArgs) {
         List<String> arguments = jnlpd.getArguments();
         if (arguments.isEmpty()) {
diff -r 23da9e6f446f -r 4f1efc26b577 src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/Options.java
--- a/src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/Options.java	Tue Apr 09 10:57:04 2019 -0400
+++ b/src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/Options.java	Tue Apr 09 11:30:09 2019 -0400
@@ -29,7 +29,7 @@
 
 public class Options {
 
-    private boolean createImage = false;
+    private boolean createAppImage = false;
     private boolean createInstaller = false;
     private String installerType = null;
     private String jnlp = null;
@@ -51,24 +51,23 @@
     private static final String [] INSTALLER_TYPES = {"msi", "exe", "dmg", "pkg",
                                                       "rpm", "deb"};
 
-    // --output, -o, --input, -i, --files, -f, --main-jar, --main-class
+    // --output, -o, --input, -i, --main-jar, --main-class
     private static final String [] BLOCKED_JPACKAGE_OPTIONS = {"--output", "-o", "--input", "-i",
-                                                                "--files", "-f", "--main-jar",
-                                                                "--main-class"};
+                                                               "--main-jar", "--main-class"};
 
     private static final String RUNTIME_IMAGE_OPTION = "--runtime-image";
 
     private static final String ERR_UNKNOWN_OPTION = "Unknown option: ";
     private static final String ERR_MISSING_VALUE = "Value is required for option ";
-    private static final String ERR_MISSING_MODE = "Error: create-image or create-installer mode is required";
+    private static final String ERR_MISSING_MODE = "Error: create-app-image or create-installer mode is required";
     private static final String ERR_MISSING_JNLP = "Error: --jnlp is required";
     private static final String ERR_MISSING_OUTPUT = "Error: --output is required";
     private static final String ERR_OUTPUT_EXISTS = "Error: output folder already exists";
     private static final String ERR_KEEP_EXISTS = "Error: folder for --keep argument already exists";
     private static final String ERR_INVALID_PROTOCOL_JNLP = "Error: Invalid protocol for JNLP file. Only HTTP, HTTPS and FILE protocols are supported.";
 
-    public boolean createImage() {
-        return createImage;
+    public boolean createAppImage() {
+        return createAppImage;
     }
 
     public boolean createInstaller() {
@@ -114,7 +113,7 @@
     // Helper method to dump all options
     private void display() {
         System.out.println("Options:");
-        System.out.println("createImage: " + createImage);
+        System.out.println("createAppImage: " + createAppImage);
         System.out.println("createInstaller: " + createInstaller);
         System.out.println("installerType: " + installerType);
         System.out.println("jnlp: " + jnlp);
@@ -133,7 +132,7 @@
             return;
         }
 
-        if (!createImage && !createInstaller) {
+        if (!createAppImage && !createInstaller) {
             optionError(ERR_MISSING_MODE);
         }
 
@@ -202,7 +201,7 @@
         System.out.println("Usage: java -jar JNLPConverter.jar <mode> <options>");
         System.out.println("");
         System.out.println("where mode is one of:");
-        System.out.println("  create-image");
+        System.out.println("  create-app-image");
         System.out.println("          Generates a platform-specific application image.");
         System.out.println("  create-installer");
         System.out.println("          Generates a platform-specific installer for the application.");
@@ -218,7 +217,7 @@
         System.out.println("      --jpackage-options <options>");
         System.out.println("          Specify additional jpackage options or overwrite provided by JNLPConverter.");
         System.out.println("          All jpackage options can be specified except: --output -o, --input -i,");
-        System.out.println("          --files -f, --main-jar -j and --class -c.");
+        System.out.println("          --main-jar -j and --class -c.");
         System.out.println("      --installer-type <type>");
         System.out.println("          The type of the installer to create");
         System.out.println("          Valid values are: {\"exe\", \"msi\", \"rpm\", \"deb\", \"pkg\", \"dmg\"}");
@@ -252,8 +251,8 @@
         int index = 0;
         if (args.length >= 1) {
             switch (args[0]) {
-                case "create-image":
-                    options.createImage = true;
+                case "create-app-image":
+                    options.createAppImage = true;
                     index = 1;
                     break;
                 case "create-installer":