modules/fxpackager/src/main/native/library/common/Package.h

*** 46,61 ****
  class PackageBootFields {
  public:
      enum MemoryState {msManual, msAuto};
      
  public:
!     TOrderedMap FJVMArgs;
      std::list<TString> FArgs;
      
      TString FPackageRootDirectory;
      TString FPackageAppDirectory;
      TString FPackageLauncherDirectory;
      TString FAppID;
      TString FPackageAppDataDirectory;
      TString FClassPath;
      TString FMainJar;
      TString FMainClassName;
--- 46,62 ----
  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 FMainJar;
      TString FMainClassName;
*** 64,73 ****
--- 65,76 ----
      TString FJVMLibraryFileName;
      TString FSplashScreenFileName;
      bool FUseJavaPreferences;
      TString FCommandName;
  
+     TString FAppCDSCacheFileName;
+ 
      TPlatformNumber FMemorySize;
      MemoryState FMemoryState;
  };
  
  
*** 75,123 ****
  private:
      Package(Package const&); // Don't Implement.
      void operator=(Package const&); // Don't implement
  
  private:
      PackageBootFields* FBootFields;
      TString FJVMUserArgsConfigFileName;
      
      DebugState FDebugging;
  
!     //PropertyFile* FJVMUserConfig; // Contains JVM user overrides
!     TOrderedMap FJVMUserArgsOverrides;
!     TOrderedMap FDefaultJVMUserArgs; // Contains JVM user defaults
!     TOrderedMap FJVMUserArgs; // Contains a merge of JVM defaults and user overrides
  
  
      Package(void);
  
!     void Initialize();
      void MergeJVMDefaultsWithOverrides();
      TString GetMainJar();
!     void SaveJVMUserArgOverrides(TOrderedMap Data);
      
  public:
      static Package& GetInstance();
      ~Package(void);
  
      void FreeBootFields();
  
      void SetCommandLineArguments(int argc, TCHAR* argv[]);
  
!     TOrderedMap GetJVMArgs();
!     TOrderedMap GetDefaultJVMUserArgs();
!     TOrderedMap GetJVMUserArgOverrides();
!     void SetJVMUserArgOverrides(TOrderedMap Value);
!     TOrderedMap GetJVMUserArgs();
  
      std::list<TString> GetArgs();
  
      TString GetPackageRootDirectory();
      TString GetPackageAppDirectory();
      TString GetPackageLauncherDirectory();
      
      TString GetJVMUserArgsConfigFileName();
  
      TString GetAppID();
      TString GetPackageAppDataDirectory();
      TString GetClassPath();
      TString GetMainClassName();
--- 78,133 ----
  private:
      Package(Package const&); // Don't Implement.
      void operator=(Package const&); // Don't implement
  
  private:
+     bool FInitialized;
      PackageBootFields* FBootFields;
      TString FJVMUserArgsConfigFileName;
+     TString FAppCDSCacheDirectory;
  
      DebugState FDebugging;
  
!     OrderedMap<TString, TString> FJVMUserArgsOverrides;
!     OrderedMap<TString, TString> FDefaultJVMUserArgs; // Contains JVM user defaults
!     OrderedMap<TString, TString> FJVMUserArgs; // Contains a merge of JVM defaults and user overrides
  
  
      Package(void);
  
!     //void Initialize();
      void MergeJVMDefaultsWithOverrides();
      TString GetMainJar();
!     void SaveJVMUserArgOverrides(OrderedMap<TString, TString> Data);
!     void ReadJVMArgs(ISectionalPropertyContainer* Config);
  
  public:
      static Package& GetInstance();
      ~Package(void);
  
+     void Initialize();
+     void Clear();
      void FreeBootFields();
  
      void SetCommandLineArguments(int argc, TCHAR* argv[]);
  
!     OrderedMap<TString, TString> GetJVMArgs();
!     OrderedMap<TString, TString> GetDefaultJVMUserArgs();
!     OrderedMap<TString, TString> GetJVMUserArgOverrides();
!     void SetJVMUserArgOverrides(OrderedMap<TString, TString> Value);
!     OrderedMap<TString, TString> GetJVMUserArgs();
  
      std::list<TString> GetArgs();
  
      TString GetPackageRootDirectory();
      TString GetPackageAppDirectory();
      TString GetPackageLauncherDirectory();
+     TString GetAppDataDirectory();
  
      TString GetJVMUserArgsConfigFileName();
+     TString GetAppCDSCacheDirectory();
+     TString GetAppCDSCacheFileName();
  
      TString GetAppID();
      TString GetPackageAppDataDirectory();
      TString GetClassPath();
      TString GetMainClassName();