svn commit: r616709 - in /ofbiz/trunk/specialpurpose/pos: screens/default/menu/posmain.xml src/org/ofbiz/pos/component/Journal.java src/org/ofbiz/pos/event/TestEvents.java

Author: jleroux
Date: Wed Jan 30 02:08:32 2008
New Revision: 616709

URL: http://svn.apache.org/viewvc?rev=616709&view=rev
Log:
A temporary patch from Chris Lombardi " Add numeric keypad popup function" (https://issues.apache.org/jira/browse/OFBIZ-1606) - OFBIZ-1606
Mostly usefulk for test at this stage. I added a button to acces from maion page and a caption to the new dialog box (incating it's only test for now)

Modified:
    ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java

Modified: ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml?rev=616709&r1=616708&r2=616709&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml Wed Jan 30 02:08:32 2008
@@ -66,7 +66,9 @@
         <Button name="" x="204" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="306" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="408" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/>
-        <Button name="" x="510" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/>
+        <!--Button name="" x="510" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/-->
         <!--Button name="testMsr" x="510" y="310" w="100" h="60" style="posButton" content="TEST MSR" alignment="Center"/-->
+        <Button name="testNumeric" x="510" y="310" w="100" h="60" style="posButton" content="Num Keypad" alignment="Center"/>
+        
     </Components>    
 </XPage>

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java?rev=616709&r1=616708&r2=616709&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java Wed Jan 30 02:08:32 2008
@@ -22,18 +22,18 @@
 import java.util.Locale;
 
 import javax.swing.ListSelectionModel;
-import javax.swing.ScrollPaneConstants;
+
 import net.xoetrope.data.XDataSource;
-import net.xoetrope.swing.XTable;
 import net.xoetrope.swing.XScrollPane;
+import net.xoetrope.swing.XTable;
 import net.xoetrope.xui.XProject;
 import net.xoetrope.xui.XProjectManager;
 import net.xoetrope.xui.data.XModel;
 
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.pos.PosTransaction;
 import org.ofbiz.pos.screen.PosScreen;
-import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.base.util.Debug;
 
 public class Journal {
 

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java?rev=616709&r1=616708&r2=616709&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java Wed Jan 30 02:08:32 2008
@@ -22,6 +22,7 @@
 import org.ofbiz.pos.component.Journal;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.Debug;
+import org.ofbiz.pos.screen.NumericKeypad;
 
 public class TestEvents {
 
@@ -44,4 +45,20 @@
             pos.showDialog("dialog/error/exception", e.getMessage());
         }
     }
+    
+    public static synchronized void testNumericKeypad(PosScreen pos) {
+              
+        try {
+            NumericKeypad numericKeypad = new NumericKeypad(pos);
+            numericKeypad.setMinus(true);
+            numericKeypad.setPercent(false);
+            String results = numericKeypad.openDlg();
+        }catch(Exception e){
+            Debug.logError(e, module);
+        }
+        
+        pos.refresh();    
+        return;
+    }
+    
 }