[Redpos-cvs] RedPOS/src/org/redpos/client/ui POSDashboardContext.java,1.3,1.4

[Anneli <an...@us...>]

Update of /cvsroot/redpos/RedPOS/src/org/redpos/client/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31802/src/org/redpos/client/ui

Modified Files:
	POSDashboardContext.java 
Log Message:
No longer possible to press ESC when you 
are in logoff-dialog, bug 1108213

Index: POSDashboardContext.java
===================================================================
RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/POSDashboardContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** POSDashboardContext.java	7 Mar 2005 11:13:56 -0000	1.3
--- POSDashboardContext.java	2 May 2005 09:16:55 -0000	1.4
***************
*** 198,208 ****
              if(e.character == SWT.ESC && !isAtHome)
              {
!                // enable other UI components
!                UIDisabler.getInstance().fireEnable();
!                // go...
!                home();
  
              }
           }
        };
        display.addFilter(SWT.KeyUp, keyListener);
--- 198,229 ----
              if(e.character == SWT.ESC && !isAtHome)
              {
!                try
!                {
!                   ObjectName logoffSession = new ObjectName(
!                         "RedPOS.client.ui.plugin.function:service=Logoff");
!                   Object[] params = {};
!                   String[] signature = {};
!                   
!                   // invoke method in ui service registry          
!                   Object response = mServer.invoke(logoffSession, "escLogoff", params,
!                         signature);
  
+                   if(((Boolean)response).booleanValue() == true)
+                   { }
+                   else
+                   {
+                      // enable other UI components
+                      UIDisabler.getInstance().fireEnable();
+                      // go...
+                      home();
+                   }
+                }
+                catch(Exception ex)
+                {
+                   ex.printStackTrace();
+                }
              }
           }
+         
        };
        display.addFilter(SWT.KeyUp, keyListener);
***************
*** 210,214 ****
        //
     }
! 
     public void paymentSelected(PaymentInfo payment)
     {
--- 231,235 ----
        //
     }
!    
     public void paymentSelected(PaymentInfo payment)
     {