FWD » Core Development » User Interface

=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/swing/SwingEmulatedWindow.java'

--- src/com/goldencode/p2j/ui/client/gui/driver/swing/SwingEmulatedWindow.java	2015-10-24 19:51:34 +0000

+++ src/com/goldencode/p2j/ui/client/gui/driver/swing/SwingEmulatedWindow.java	2015-11-03 08:50:31 +0000

@@ -73,6 +73,8 @@

 **                  operations.  Removed save/restore of focus listeners and replaced it with

 **                  a global flag.

 ** 035 CA  20151024 Added support for WINDOW:SENSITIVE attribute.

+**     SBI 20151102 To check the ThinClient instance due to the default window survives

+**                  the client's restart.

 */

 package com.goldencode.p2j.ui.client.gui.driver.swing;

@@ -267,7 +269,12 @@

                if (toOS)

                {

                   // if focus is lost to a non-4GL window, the titlebar needs to be aware of this

-                  ThinClient.getInstance().postOSEvent(new WindowActivated(window, false, toOS));

+                  ThinClient tc = ThinClient.getInstance();

+                  // It needs to check since the default window survives the client's restart.

+                  if (tc != null)

+                  {

+                     ThinClient.getInstance().postOSEvent(new WindowActivated(window, false, toOS));

+                  }

                }

             }

          }

=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/swing/SwingGuiDriver.java'

--- src/com/goldencode/p2j/ui/client/gui/driver/swing/SwingGuiDriver.java	2015-10-22 23:14:19 +0000

+++ src/com/goldencode/p2j/ui/client/gui/driver/swing/SwingGuiDriver.java	2015-11-03 08:48:55 +0000

@@ -68,6 +68,8 @@

 **     HC  20151022 A fix for JWindow not able to receive focus when its owner window is not

 **                  visible. This resolves ALERT-BOX and DIALOG-BOX not receiving key input when

 **                  no main window visible.

+**     SBI 20151102 To save the keyboard reader in the application context owned by the main

+**                  thread group.

 */

 package com.goldencode.p2j.ui.client.gui.driver.swing;

@@ -78,6 +80,8 @@

 import javax.swing.*;

+import sun.awt.AppContext;

+

 import java.lang.reflect.*;

 import java.io.*;

 import java.util.*;

@@ -102,7 +106,16 @@

    {

       protected SwingKeyboardReader initialValue()

       {

-         return new WinKeyboardReader();

+         // the "main" thread of the gui client defines the thread group to which

+         // this application context belongs

+         AppContext appContext = AppContext.getAppContext();

+         Object keyboardReader = appContext.get(WinKeyboardReader.class);

+         if (keyboardReader == null)

+         {

+            keyboardReader = new WinKeyboardReader();

+            appContext.put(WinKeyboardReader.class, keyboardReader);

+         }

+         return (WinKeyboardReader) keyboardReader;

       };

    };