svn commit: r599160 - in /ofbiz/branches/release4.0/specialpurpose/pos: screens/default/includes/ src/org/ofbiz/pos/component/ src/org/ofbiz/pos/event/ src/org/ofbiz/pos/screen/

Author: jleroux
Date: Wed Nov 28 14:08:08 2007
New Revision: 599160

URL: http://svn.apache.org/viewvc?rev=599160&view=rev
Log:
Applied fix from trunk for revision: 593671

Added:
    ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java
      - copied unchanged from r593671, ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java
Modified:
    ofbiz/branches/release4.0/specialpurpose/pos/screens/default/includes/posinput.xml
    ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java
    ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java
    ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java

Modified: ofbiz/branches/release4.0/specialpurpose/pos/screens/default/includes/posinput.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/specialpurpose/pos/screens/default/includes/posinput.xml?rev=599160&r1=599159&r2=599160&view=diff
==============================================================================
--- ofbiz/branches/release4.0/specialpurpose/pos/screens/default/includes/posinput.xml (original)
+++ ofbiz/branches/release4.0/specialpurpose/pos/screens/default/includes/posinput.xml Wed Nov 28 14:08:08 2007
@@ -22,6 +22,7 @@
         <Panel name="toppan" x="0" y="1" w="1024" h="46" border="1" style="panel">
             <Edit name="pos_output" x="2" y="2" w="618" h="42" style="input" border="0" alignment="Left"/>
             <Edit name="pos_input" x="622" y="2" w="400" h="42" style="input" border="0" alignment="Right"/>
+            <Password name="pos_inputpassword" x="622" y="2" w="400" h="42" style="input" border="0" alignment="Right"/>
         </Panel>
     </Components>
 </XPage>

Modified: ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java?rev=599160&r1=599159&r2=599160&view=diff
==============================================================================
--- ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java (original)
+++ ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java Wed Nov 28 14:08:08 2007
@@ -42,7 +42,7 @@
     protected Stack functionStack = new Stack();
     protected Component[] pageComs = null;
     protected Color lastColor = null;
-    protected XEdit input = null;
+    protected javax.swing.JTextField input = null;
     protected boolean isLocked = false;
 
     public Input(PosScreen page) {

Modified: ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java?rev=599160&r1=599159&r2=599160&view=diff
==============================================================================
--- ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java (original)
+++ ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java Wed Nov 28 14:08:08 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 
 import org.ofbiz.pos.screen.PosScreen;
-import org.ofbiz.pos.component.Input;
+import org.ofbiz.pos.component.InputWithPassword;
 import org.ofbiz.pos.component.Output;
 import org.ofbiz.pos.PosTransaction;
 import org.ofbiz.base.util.UtilProperties;
@@ -79,7 +79,7 @@
     private static void baseLogin(PosScreen pos, boolean mgr) {
         XuiSession session = pos.getSession();
         Output output = pos.getOutput();
-        Input input = pos.getInput();
+        InputWithPassword input = pos.getInput();
 
         String loginFunc = mgr ? "MGRLOGIN" : "LOGIN";
         String[] func = input.getLastFunction();
@@ -88,10 +88,13 @@
             if (UtilValidate.isEmpty(func[1]) && UtilValidate.isEmpty(text)) {
                 output.print(UtilProperties.getMessage("pos","ULOGIN",Locale.getDefault()));
                 input.setFunction(loginFunc);
+                input.setPasswordInput( false);
             } else if (UtilValidate.isEmpty(func[1])) {
                 output.print(UtilProperties.getMessage("pos","UPASSW",Locale.getDefault()));
                 input.setFunction(loginFunc);
+                input.setPasswordInput( true);
             } else {
+                input.setPasswordInput( false);
                 String username = func[1];
                 String password = text;
                 if (!mgr) {

Modified: ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java?rev=599160&r1=599159&r2=599160&view=diff
==============================================================================
--- ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java (original)
+++ ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java Wed Nov 28 14:08:08 2007
@@ -39,7 +39,7 @@
 import org.ofbiz.guiapp.xui.XuiSession;
 import org.ofbiz.pos.PosTransaction;
 import org.ofbiz.pos.adaptor.KeyboardAdaptor;
-import org.ofbiz.pos.component.Input;
+import org.ofbiz.pos.component.InputWithPassword;
 import org.ofbiz.pos.component.Journal;
 import org.ofbiz.pos.component.Operator;
 import org.ofbiz.pos.component.Output;
@@ -63,7 +63,7 @@
     protected ClassLoader classLoader = null;
     protected XuiSession session = null;
     protected Output output = null;
-    protected Input input = null;
+    protected InputWithPassword input = null;
     protected Journal journal = null;
     protected Operator operator = null;
     protected PosButton buttons = null;
@@ -89,7 +89,7 @@
         // setup the shared components
         this.session = XuiContainer.getSession();
         this.output = new Output(this);
-        this.input = new Input(this);
+        this.input = new InputWithPassword(this);
         this.journal = new Journal(this);
         this.operator = new Operator(this);
         this.setLastActivity(System.currentTimeMillis());
@@ -256,7 +256,7 @@
         return this.session;
     }
 
-    public Input getInput() {
+    public InputWithPassword getInput() {
         return this.input;
     }