src/jdk.jpackage/share/native/libapplauncher/Package.h

*** 38,63 ****
  class PackageBootFields {
  public:
      enum MemoryState {msManual, msAuto};
  
  public:
!     OrderedMap<TString, TString> FJVMArgs;
      std::list<TString> FArgs;
  
      TString FPackageRootDirectory;
      TString FPackageAppDirectory;
      TString FPackageLauncherDirectory;
      TString FAppDataDirectory;
-     TString FAppID;
      TString FPackageAppDataDirectory;
      TString FClassPath;
      TString FModulePath;
      TString FMainJar;
      TString FMainModule;
      TString FMainClassName;
!     TString FJVMRuntimeDirectory;
!     TString FJVMLibraryFileName;
      TString FSplashScreenFileName;
      bool FUseJavaPreferences;
      TString FCommandName;
  
      TString FAppCDSCacheFileName;
--- 38,62 ----
  class PackageBootFields {
  public:
      enum MemoryState {msManual, msAuto};
  
  public:
!     OrderedMap<TString, TString> FJavaOptions;
      std::list<TString> FArgs;
  
      TString FPackageRootDirectory;
      TString FPackageAppDirectory;
      TString FPackageLauncherDirectory;
      TString FAppDataDirectory;
      TString FPackageAppDataDirectory;
      TString FClassPath;
      TString FModulePath;
      TString FMainJar;
      TString FMainModule;
      TString FMainClassName;
!     TString FJavaRuntimeDirectory;
!     TString FJavaLibraryFileName;
      TString FSplashScreenFileName;
      bool FUseJavaPreferences;
      TString FCommandName;
  
      TString FAppCDSCacheFileName;
*** 80,90 ****
      DebugState FDebugging;
  
      Package(void);
  
      TString GetMainJar();
!     void ReadJVMArgs(ISectionalPropertyContainer* Config);
      void PromoteAppCDSState(ISectionalPropertyContainer* Config);
  
  public:
      static Package& GetInstance();
      ~Package(void);
--- 79,89 ----
      DebugState FDebugging;
  
      Package(void);
  
      TString GetMainJar();
!     void ReadJavaOptions(ISectionalPropertyContainer* Config);
      void PromoteAppCDSState(ISectionalPropertyContainer* Config);
  
  public:
      static Package& GetInstance();
      ~Package(void);
*** 93,103 ****
      void Clear();
      void FreeBootFields();
  
      void SetCommandLineArguments(int argc, TCHAR* argv[]);
  
!     OrderedMap<TString, TString> GetJVMArgs();
      TString GetMainModule();
  
      std::list<TString> GetArgs();
  
      TString GetPackageRootDirectory();
--- 92,102 ----
      void Clear();
      void FreeBootFields();
  
      void SetCommandLineArguments(int argc, TCHAR* argv[]);
  
!     OrderedMap<TString, TString> GetJavaOptions();
      TString GetMainModule();
  
      std::list<TString> GetArgs();
  
      TString GetPackageRootDirectory();
*** 106,122 ****
      TString GetAppDataDirectory();
  
      TString GetAppCDSCacheDirectory();
      TString GetAppCDSCacheFileName();
  
-     TString GetAppID();
      TString GetPackageAppDataDirectory();
      TString GetClassPath();
      TString GetModulePath();
      TString GetMainClassName();
!     TString GetJVMLibraryFileName();
!     TString GetJVMRuntimeDirectory();
      TString GetSplashScreenFileName();
      bool HasSplashScreen();
      TString GetCommandName();
  
      TPlatformNumber GetMemorySize();
--- 105,120 ----
      TString GetAppDataDirectory();
  
      TString GetAppCDSCacheDirectory();
      TString GetAppCDSCacheFileName();
  
      TString GetPackageAppDataDirectory();
      TString GetClassPath();
      TString GetModulePath();
      TString GetMainClassName();
!     TString GetJavaLibraryFileName();
!     TString GetJavaRuntimeDirectory();
      TString GetSplashScreenFileName();
      bool HasSplashScreen();
      TString GetCommandName();
  
      TPlatformNumber GetMemorySize();