Revert excessive changes of JDK-8308349 patch irrelevant to JDK-8364564

alexeysemenyukoracle · alexeysemenyukoracle · commit 397abf83bb1f · 2025-08-07T11:29:37.000-04:00
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java
@@ -46,7 +46,6 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import jdk.jpackage.internal.model.FileAssociation;
-import jdk.jpackage.internal.model.LauncherShortcut;
 import jdk.jpackage.internal.model.LinuxLauncher;
 import jdk.jpackage.internal.model.LinuxPackage;
 import jdk.jpackage.internal.model.Package;
@@ -238,26 +237,6 @@ private Map<String, String> createDataForDesktopFile() {
         data.put("DEPLOY_BUNDLE_CATEGORY", pkg.menuGroupName());
         data.put("APPLICATION_LAUNCHER", Enquoter.forPropertyValues().applyTo(
                 installedLayout.launchersDirectory().resolve(launcher.executableNameWithSuffix()).toString()));
-        data.put("STARTUP_DIRECTORY", launcher.shortcut()
-                .flatMap(LauncherShortcut::startupDirectory)
-                .map(startupDirectory -> {
-                    switch (startupDirectory) {
-                        case DEFAULT -> {
-                            return (Path)null;
-                        }
-                        case APP_DIR -> {
-                            return installedLayout.appDirectory();
-                        }
-                        case INSTALL_DIR -> {
-                            return installedLayout.launchersDirectory();
-                        }
-                        default -> {
-                            throw new AssertionError();
-                        }
-                    }
-                }).map(str -> {
-                    return "Path=" + str;
-                }).orElse(null));
 
         return data;
     }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java
@@ -109,8 +109,12 @@ private static LinuxPackage createLinuxDebPackage(
     static final BundlerParamInfo<LinuxPackage> DEB_PACKAGE = createPackageBundlerParam(
             LinuxFromParams::createLinuxDebPackage);
 
-    private static final BundlerParamInfo<String> LINUX_SHORTCUT_HINT = createStringBundlerParam(
-            Arguments.CLIOptions.LINUX_SHORTCUT_HINT.getId());
+    private static final BundlerParamInfo<Boolean> LINUX_SHORTCUT_HINT = new BundlerParamInfo<>(
+            Arguments.CLIOptions.LINUX_SHORTCUT_HINT.getId(),
+            Boolean.class,
+            params -> false,
+            (s, p) -> (s == null || "null".equalsIgnoreCase(s)) ? false : Boolean.valueOf(s)
+    );
 
     private static final BundlerParamInfo<String> LINUX_CATEGORY = createStringBundlerParam(
             Arguments.CLIOptions.LINUX_CATEGORY.getId());
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.desktop b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.desktop
@@ -2,7 +2,6 @@
 Name=APPLICATION_NAME
 Comment=APPLICATION_DESCRIPTION
 Exec=APPLICATION_LAUNCHER
-STARTUP_DIRECTORY
 Icon=APPLICATION_ICON
 Terminal=false
 Type=Application
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
@@ -37,7 +37,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.ResourceBundle;
@@ -349,13 +348,16 @@ public enum CLIOptions {
 
         WIN_UPDATE_URL ("win-update-url", OptionCategories.PLATFORM_WIN),
 
-        WIN_MENU_HINT ("win-menu", OptionCategories.PLATFORM_WIN,
-                createArgumentWithOptionalValueAction("win-menu")),
+        WIN_MENU_HINT ("win-menu", OptionCategories.PLATFORM_WIN, () -> {
+            setOptionValue("win-menu", true);
+        }),
 
         WIN_MENU_GROUP ("win-menu-group", OptionCategories.PLATFORM_WIN),
 
-        WIN_SHORTCUT_HINT ("win-shortcut", OptionCategories.PLATFORM_WIN,
-                createArgumentWithOptionalValueAction("win-shortcut")),
+        WIN_SHORTCUT_HINT ("win-shortcut",
+                OptionCategories.PLATFORM_WIN, () -> {
+            setOptionValue("win-shortcut", true);
+        }),
 
         WIN_SHORTCUT_PROMPT ("win-shortcut-prompt",
                 OptionCategories.PLATFORM_WIN, () -> {
@@ -394,8 +396,10 @@ public enum CLIOptions {
         LINUX_PACKAGE_DEPENDENCIES ("linux-package-deps",
                 OptionCategories.PLATFORM_LINUX),
 
-        LINUX_SHORTCUT_HINT ("linux-shortcut", OptionCategories.PLATFORM_LINUX,
-                createArgumentWithOptionalValueAction("linux-shortcut")),
+        LINUX_SHORTCUT_HINT ("linux-shortcut",
+                OptionCategories.PLATFORM_LINUX, () -> {
+            setOptionValue("linux-shortcut", true);
+        }),
 
         LINUX_MENU_GROUP ("linux-menu-group", OptionCategories.PLATFORM_LINUX);
 
@@ -474,27 +478,9 @@ private static void nextArg() {
             context().pos++;
         }
 
-        private static void prevArg() {
-            Objects.checkIndex(context().pos, context().argList.size());
-            context().pos--;
-        }
-
         private static boolean hasNextArg() {
             return context().pos < context().argList.size();
         }
-
-        private static Runnable createArgumentWithOptionalValueAction(String option) {
-            Objects.requireNonNull(option);
-            return () -> {
-                var value = popArg();
-                if (value.startsWith("-")) {
-                    prevArg();
-                    setOptionValue(option, true);
-                } else {
-                    setOptionValue(option, value);
-                }
-            };
-        }
     }
 
     enum OptionCategories {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
@@ -52,7 +52,6 @@
 import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
 import static jdk.jpackage.internal.StandardBundlerParam.hasPredefinedAppImage;
 import static jdk.jpackage.internal.StandardBundlerParam.isRuntimeInstaller;
-import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -172,31 +171,29 @@ static Optional<jdk.jpackage.internal.model.Package> getCurrentPackage(Map<Strin
     }
 
     static Optional<LauncherShortcut> findLauncherShortcut(
-            BundlerParamInfo<String> shortcutParam,
+            BundlerParamInfo<Boolean> shortcutParam,
             Map<String, ? super Object> mainParams,
             Map<String, ? super Object> launcherParams) {
 
-        Optional<String> launcherValue;
+        Optional<Boolean> launcherValue;
         if (launcherParams == mainParams) {
             // The main launcher
             launcherValue = Optional.empty();
         } else {
             launcherValue = shortcutParam.findIn(launcherParams);
         }
 
-        return launcherValue.map(ParsedLauncherShortcutStartupDirectory::parseForAddLauncher).or(() -> {
-            return Optional.ofNullable(mainParams.get(shortcutParam.getID())).map(toFunction(value -> {
-                if (value instanceof Boolean) {
-                    return new ParsedLauncherShortcutStartupDirectory(LauncherShortcutStartupDirectory.DEFAULT);
-                } else {
-                    try {
-                        return ParsedLauncherShortcutStartupDirectory.parseForMainLauncher((String)value);
-                    } catch (IllegalArgumentException ex) {
-                        throw I18N.buildConfigException("error.invalid-option-value", value, "--" + shortcutParam.getID()).create();
-                    }
-                }
-            }));
-        }).map(ParsedLauncherShortcutStartupDirectory::value).map(LauncherShortcut::new);
+        return launcherValue.map(withShortcut -> {
+            if (withShortcut) {
+                return Optional.of(LauncherShortcutStartupDirectory.DEFAULT);
+            } else {
+                return Optional.<LauncherShortcutStartupDirectory>empty();
+            }
+        }).or(() -> {
+            return shortcutParam.findIn(mainParams).map(_ -> {
+                return Optional.of(LauncherShortcutStartupDirectory.DEFAULT);
+            });
+        }).map(LauncherShortcut::new);
     }
 
     private static ApplicationLaunchers createLaunchers(
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ParsedLauncherShortcutStartupDirectory.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ParsedLauncherShortcutStartupDirectory.java
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherShortcutStartupDirectory.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherShortcutStartupDirectory.java
@@ -36,24 +36,12 @@ public enum LauncherShortcutStartupDirectory {
      * Platform-specific default value.
      * <p>
      * On Windows, it indicates that the startup directory should be the package's
-     * installation directory. I.e. same as {@link #INSTALL_DIR}.
+     * installation directory.
      * <p>
      * On Linux, it indicates that a shortcut doesn't have the startup directory
      * configured explicitly.
      */
-    DEFAULT("true"),
-
-    /**
-     * The 'app' directory in the installed application app image. This is the
-     * directory that is referenced with {@link ApplicationLayout#appDirectory()}
-     * method.
-     */
-    APP_DIR("app-dir"),
-
-    /**
-     * The installation directory of the package.
-     */
-    INSTALL_DIR("install-dir");
+    DEFAULT("true");
 
     LauncherShortcutStartupDirectory(String stringValue) {
         this.stringValue = Objects.requireNonNull(stringValue);
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
@@ -82,8 +82,6 @@ error.invalid-app-image=Error: app-image dir "{0}" generated by another jpackage
 
 error.invalid-install-dir=Invalid installation directory "{0}"
 
-error.invalid-option-value=Invalid value "{0}" of option {1}
-
 MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a package
 MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem: {1} \n\
 Advice to fix: {2}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java
@@ -105,10 +105,10 @@ private static WinMsiPackage createWinMsiPackage(Map<String, ? super Object> par
     static final BundlerParamInfo<WinMsiPackage> MSI_PACKAGE = createPackageBundlerParam(
             WinFromParams::createWinMsiPackage);
 
-    private static final BundlerParamInfo<String> WIN_MENU_HINT = createStringBundlerParam(
+    private static final BundlerParamInfo<Boolean> WIN_MENU_HINT = createBooleanBundlerParam(
             Arguments.CLIOptions.WIN_MENU_HINT.getId());
 
-    private static final BundlerParamInfo<String> WIN_SHORTCUT_HINT = createStringBundlerParam(
+    private static final BundlerParamInfo<Boolean> WIN_SHORTCUT_HINT = createBooleanBundlerParam(
             Arguments.CLIOptions.WIN_SHORTCUT_HINT.getId());
 
     public static final BundlerParamInfo<Boolean> CONSOLE_HINT = createBooleanBundlerParam(
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java
@@ -471,12 +471,9 @@ private void addShortcutComponentGroup(XMLStreamWriter xml) throws
                 if (folder.isRequestedFor(launcher)) {
                     var workDirectory = folder.shortcut(launcher).startupDirectory().map(v -> {
                         switch (v) {
-                            case DEFAULT, INSTALL_DIR -> {
+                            case DEFAULT -> {
                                 return INSTALLDIR;
                             }
-                            case APP_DIR -> {
-                                return installedAppImage.appDirectory();
-                            }
                             default -> {
                                 throw new AssertionError();
                             }

Original file line number	Diff line number	Diff line change
`@@ -471,12 +471,9 @@ private void addShortcutComponentGroup(XMLStreamWriter xml) throws`
`471`	`471`	`if (folder.isRequestedFor(launcher)) {`
`472`	`472`	`var workDirectory = folder.shortcut(launcher).startupDirectory().map(v -> {`
`473`	`473`	`switch (v) {`
`474`		`- case DEFAULT, INSTALL_DIR -> {`
	`474`	`+ case DEFAULT -> {`
`475`	`475`	`return INSTALLDIR;`
`476`	`476`	`}`
`477`		`- case APP_DIR -> {`
`478`		`- return installedAppImage.appDirectory();`
`479`		`- }`
`480`	`477`	`default -> {`
`481`	`478`	`throw new AssertionError();`
`482`	`479`	`}`