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

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

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

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

Index: Logoff.java
===================================================================
RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/Logoff.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Logoff.java	18 Mar 2005 14:15:43 -0000	1.3
--- Logoff.java	2 May 2005 09:16:55 -0000	1.4
***************
*** 34,37 ****
--- 34,40 ----
  import org.eclipse.swt.events.FocusEvent;
  import org.eclipse.swt.events.FocusListener;
+ import org.eclipse.swt.events.KeyAdapter;
+ import org.eclipse.swt.events.KeyEvent;
+ import org.eclipse.swt.events.KeyListener;
  import org.eclipse.swt.events.SelectionAdapter;
  import org.eclipse.swt.events.SelectionEvent;
***************
*** 71,75 ****
  
     private LoginUI loginUI;
! 
     /**
      * @see org.redpos.client.ui.plugin.PluginFunctionMBean#invoke(org.eclipse.swt.widgets.Composite)
--- 74,78 ----
  
     private LoginUI loginUI;
!    
     /**
      * @see org.redpos.client.ui.plugin.PluginFunctionMBean#invoke(org.eclipse.swt.widgets.Composite)
***************
*** 134,138 ****
           // update parent composite
           parent.layout();
! 
           loginUI.setFocus();
        }
--- 137,141 ----
           // update parent composite
           parent.layout();
!  
           loginUI.setFocus();
        }
***************
*** 172,175 ****
--- 175,189 ----
        return false;
     }
+    
+    /**
+     * Is logoff in use
+     * 
+     * @jmx.managed-operation 
+     */
+    public boolean escLogoff()
+    {
+       return loginUI.getEscLogoff();
+    }
+   
  
     /**
***************
*** 343,346 ****
--- 357,362 ----
        
        private Color black;
+       
+       private boolean escLogoff = false;
        /**
         * @param arg0
***************
*** 451,454 ****
--- 467,488 ----
           usernameGridData.horizontalAlignment = GridData.FILL;
           usernameField.setLayoutData(usernameGridData);
+          // create input field key listener
+          KeyListener keyListener = new KeyAdapter()
+          {
+ 
+             public void keyPressed(KeyEvent event)
+             {
+                if(event.character == SWT.ESC)
+                {
+                   // send message to ui
+                   String message = getLanguageString(
+                         "ui.main.message.logoff3.text", "Cannot use ESC, you have to login");
+                   sendUIMessage(message);
+                   setEscLogoff(true);
+                }
+             }
+ 
+          };
+          usernameField.addKeyListener(keyListener);
           // create title for password field
           Label passwordTitleLabel = new Label(centerComposite, SWT.LEFT);
***************
*** 465,468 ****
--- 499,520 ----
           passwordGridData.horizontalAlignment = GridData.FILL;
           passwordField.setLayoutData(passwordGridData);
+          // create input field key listener
+          KeyListener keyListenerpw = new KeyAdapter()
+          {
+ 
+             public void keyPressed(KeyEvent event)
+             {
+                if(event.character == SWT.ESC)
+                {
+                   // send message to ui
+                   String message = getLanguageString(
+                         "ui.main.message.logoff3.text", "Cannot use ESC, you have to login");
+                   sendUIMessage(message);
+                   setEscLogoff(true);
+                }
+             }
+ 
+          };
+          passwordField.addKeyListener(keyListenerpw);
  
           // create button composite
***************
*** 507,510 ****
--- 559,563 ----
              public void handleEvent(Event arg0)
              {
+                setEscLogoff(false);
                 okButtonSelected();
              }
***************
*** 529,533 ****
           cancelButton.setBackground(getBackground());
           cancelButton.addFocusListener(buttonFocusListener);
! 
        }
  
--- 582,586 ----
           cancelButton.setBackground(getBackground());
           cancelButton.addFocusListener(buttonFocusListener);
!         
        }
  
***************
*** 568,572 ****
           layout();
        }
! 
        /**
         * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
--- 621,634 ----
           layout();
        }
!       
!       public void setEscLogoff(boolean value)
!       {
!          escLogoff =  value;
!       }
!       public boolean getEscLogoff()
!       {
!          return escLogoff;
!       }
!       
        /**
         * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)