modules/fxpackager/src/main/java/com/oracle/bundlers/windows/WindowsBundlerParam.java

*** 34,90 ****
  import java.io.File;
  import java.io.IOException;
  import java.io.PrintStream;
  import java.util.Map;
  import java.util.ResourceBundle;
  import java.util.function.Function;
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;
  
  
  public class WindowsBundlerParam<T> extends StandardBundlerParam<T> {
      
      private static final ResourceBundle I18N = ResourceBundle.getBundle("com.oracle.bundlers.windows.WindowsBundlerParam");
      
!     public WindowsBundlerParam(String name, String description, String id, Class<T> valueType, String[] fallbackIDs, Function<Map<String, ? super Object>, T> defaultValueFunction, boolean requiresUserSetting, Function<String, T> stringConverter) {
          super(name, description, id, valueType, fallbackIDs, defaultValueFunction, requiresUserSetting, stringConverter);
      }
  
      public static final StandardBundlerParam<String> MENU_GROUP =
              new StandardBundlerParam<>(
                      I18N.getString("param.menu-group.name"),
                      I18N.getString("param.menu-group.description"),
!                     "winMenuGroup", //KEY
                      String.class,
!                     new String[] {CATEGORY.getID(), VENDOR.getID()},
                      params -> I18N.getString("param.menu-group.default"),
                      false,
!                     s -> s
              );
      
      public static final StandardBundlerParam<Boolean> BIT_ARCH_64 =
              new StandardBundlerParam<>(
                      I18N.getString("param.64-bit.name"),
                      I18N.getString("param.64-bit.description"),
!                     "win64Bit", //KEY
                      Boolean.class,
                      null,
                      params -> System.getProperty("os.arch").contains("64"),
                      false,
!                     Boolean::valueOf
              );
  
      public static final StandardBundlerParam<Boolean> BIT_ARCH_64_RUNTIME =
              new StandardBundlerParam<>(
                      I18N.getString("param.runtime-64-bit.name"),
                      I18N.getString("param.runtime-64-bit.description"),
!                     "win64BitJreRuntime", //KEY
                      Boolean.class,
                      null,
                      params -> {extractFlagsFromRuntime(params); return "64".equals(params.get(".runtime.bit-arc"));},
                      false,
!                     Boolean::valueOf
              );
         
      public static void extractFlagsFromRuntime(Map<String, ? super Object> params) {
          if (params.containsKey(".runtime.autodetect")) return;
          
--- 34,91 ----
  import java.io.File;
  import java.io.IOException;
  import java.io.PrintStream;
  import java.util.Map;
  import java.util.ResourceBundle;
+ import java.util.function.BiFunction;
  import java.util.function.Function;
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;
  
  
  public class WindowsBundlerParam<T> extends StandardBundlerParam<T> {
      
      private static final ResourceBundle I18N = ResourceBundle.getBundle("com.oracle.bundlers.windows.WindowsBundlerParam");
      
!     public WindowsBundlerParam(String name, String description, String id, Class<T> valueType, String[] fallbackIDs, Function<Map<String, ? super Object>, T> defaultValueFunction, boolean requiresUserSetting, BiFunction<String, Map<String, ? super Object>, T> stringConverter) {
          super(name, description, id, valueType, fallbackIDs, defaultValueFunction, requiresUserSetting, stringConverter);
      }
  
      public static final StandardBundlerParam<String> MENU_GROUP =
              new StandardBundlerParam<>(
                      I18N.getString("param.menu-group.name"),
                      I18N.getString("param.menu-group.description"),
!                     "win.menuGroup",
                      String.class,
!                     new String[] {VENDOR.getID(), CATEGORY.getID(), },
                      params -> I18N.getString("param.menu-group.default"),
                      false,
!                     (s, p) -> s
              );
  
      public static final StandardBundlerParam<Boolean> BIT_ARCH_64 =
              new StandardBundlerParam<>(
                      I18N.getString("param.64-bit.name"),
                      I18N.getString("param.64-bit.description"),
!                     "win.64Bit",
                      Boolean.class,
                      null,
                      params -> System.getProperty("os.arch").contains("64"),
                      false,
!                     (s, p) -> Boolean.valueOf(s)
              );
  
      public static final StandardBundlerParam<Boolean> BIT_ARCH_64_RUNTIME =
              new StandardBundlerParam<>(
                      I18N.getString("param.runtime-64-bit.name"),
                      I18N.getString("param.runtime-64-bit.description"),
!                     "win.64BitJreRuntime",
                      Boolean.class,
                      null,
                      params -> {extractFlagsFromRuntime(params); return "64".equals(params.get(".runtime.bit-arc"));},
                      false,
!                     (s, p) -> Boolean.valueOf(s)
              );
         
      public static void extractFlagsFromRuntime(Map<String, ? super Object> params) {
          if (params.containsKey(".runtime.autodetect")) return;