src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.h

*** 21,57 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
- #include "Platform.h"
- 
- #ifdef LINUX
- 
  #ifndef LINUXPLATFORM_H
  #define LINUXPLATFORM_H
  
  #include "PosixPlatform.h"
- #include "GenericPlatform.h"
  #include <X11/Xlib.h>
  #include <X11/Xatom.h>
  #include <pthread.h>
  #include <list>
  
! 
! class LinuxPlatform : virtual public Platform, GenericPlatform, PosixPlatform
! {
  private:
      pthread_t FMainThread;
  
  protected:
      virtual TString getTmpDirString();
  
  public:
      LinuxPlatform(void);
      virtual ~LinuxPlatform(void);
  
      virtual void ShowMessage(TString title, TString description);
      virtual void ShowMessage(TString description);
  
      virtual TCHAR* ConvertStringToFileSystemString(
              TCHAR* Source, bool &release);
--- 21,55 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  #ifndef LINUXPLATFORM_H
  #define LINUXPLATFORM_H
  
+ #include "Platform.h"
  #include "PosixPlatform.h"
  #include <X11/Xlib.h>
  #include <X11/Xatom.h>
  #include <pthread.h>
  #include <list>
  
! class LinuxPlatform : virtual public Platform, PosixPlatform {
  private:
      pthread_t FMainThread;
  
  protected:
      virtual TString getTmpDirString();
  
  public:
      LinuxPlatform(void);
      virtual ~LinuxPlatform(void);
  
+     TString GetPackageAppDirectory();
+     TString GetPackageLauncherDirectory();
+     TString GetPackageRuntimeBinDirectory();
+ 
      virtual void ShowMessage(TString title, TString description);
      virtual void ShowMessage(TString description);
  
      virtual TCHAR* ConvertStringToFileSystemString(
              TCHAR* Source, bool &release);
*** 59,97 ****
              TCHAR* Source, bool &release);
  
      virtual void SetCurrentDirectory(TString Value);
      virtual TString GetPackageRootDirectory();
      virtual TString GetAppDataDirectory();
  
      virtual TString GetModuleFileName();
  
      virtual TString GetBundledJVMLibraryFileName(TString RuntimePath);
  
      virtual ISectionalPropertyContainer* GetConfigFile(TString FileName);
  
      virtual bool IsMainThread();
      virtual TPlatformNumber GetMemorySize();
- 
- #ifdef DEBUG
-     virtual bool IsNativeDebuggerPresent();
-     virtual int GetProcessID();
- #endif //DEBUG
- };
- 
- class ProcessReactivator {
- private:
-     void searchWindowHelper(Window w);
-     void reactivateProcess();
- 
-     Library libX11;
- 
-     pid_t _pid;
-     Atom _atomPid;
-     Display* _display;
-     std::list<Window> _result;
- public:
-     explicit ProcessReactivator(pid_t pid);
  };
  
  #endif //LINUXPLATFORM_H
- 
- #endif //LINUX
--- 57,74 ----
              TCHAR* Source, bool &release);
  
      virtual void SetCurrentDirectory(TString Value);
      virtual TString GetPackageRootDirectory();
      virtual TString GetAppDataDirectory();
+     virtual TString GetAppName();
  
      virtual TString GetModuleFileName();
  
      virtual TString GetBundledJVMLibraryFileName(TString RuntimePath);
  
      virtual ISectionalPropertyContainer* GetConfigFile(TString FileName);
  
      virtual bool IsMainThread();
      virtual TPlatformNumber GetMemorySize();
  };
  
  #endif //LINUXPLATFORM_H