svn commit: r791212 [8/8] - in /ofbiz/trunk: ./ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/test/ applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/ applications/acc...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r791212 [8/8] - in /ofbiz/trunk: ./ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/test/ applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/ applications/acc...

lektran
Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java (original)
+++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java Sun Jul  5 10:01:19 2009
@@ -47,6 +47,7 @@
 
     }
 
+    @Override
     public SearchResult getLdapSearchResult(String username, String password, Element rootElement, boolean bindRequired) throws NamingException {
         DirContext ctx = null;
         SearchResult result = null;

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Sun Jul  5 10:01:19 2009
@@ -862,6 +862,7 @@
         // threaded drawer/receipt printing
         final PosTransaction currentTrans = this;
         final SwingWorker worker = new SwingWorker() {
+            @Override
             public Object construct() {
                 // open the drawer
                 currentTrans.popDrawer();

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java Sun Jul  5 10:01:19 2009
@@ -219,6 +219,7 @@
             }
         }
 
+        @Override
         public void run() {
             while (running) {
                 long now = System.currentTimeMillis();

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java Sun Jul  5 10:01:19 2009
@@ -113,6 +113,7 @@
 
         if (buttonName != null) {
             final SwingWorker worker = new SwingWorker() {
+                @Override
                 public Object construct() {
                     if (cl != null) {
                         Thread.currentThread().setContextClassLoader(cl);

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java Sun Jul  5 10:01:19 2009
@@ -32,10 +32,12 @@
 
 public class PosContainer extends XuiContainer {
 
+    @Override
     public String getContainerConfigName() {
         return "pos-container";
     }
 
+    @Override
     public void configure(ContainerConfig.Container cc) throws ContainerException {
         XuiSession session = XuiContainer.getSession();
         GenericValue productStore = null;

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java Sun Jul  5 10:01:19 2009
@@ -41,6 +41,7 @@
         this.control = new jpos.CashDrawer();
     }
 
+    @Override
     protected void initialize() throws JposException {
         Debug.logInfo("CashDrawer [" + control.getPhysicalDeviceName() + "] Claimed : " + control.getClaimed(), module);
     }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java Sun Jul  5 10:01:19 2009
@@ -32,6 +32,7 @@
         this.control = new jpos.CheckScanner();
     }
 
+    @Override
     protected void initialize() throws JposException {
         throw new JposException(JposConst.JPOS_E_NOEXIST, "Device not yet implemented");
     }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java Sun Jul  5 10:01:19 2009
@@ -32,6 +32,7 @@
         this.control = new jpos.POSPrinter();
     }
 
+    @Override
     protected void initialize() throws JposException {
         throw new JposException(JposConst.JPOS_E_NOEXIST, "Device not yet implemented");
     }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java Sun Jul  5 10:01:19 2009
@@ -46,11 +46,13 @@
         this.control = new jpos.POSKeyboard();
     }
 
+    @Override
     protected void initialize() throws JposException {
         Debug.logInfo("Keyboard [" + control.getPhysicalDeviceName() + "] Claimed : " + control.getClaimed(), module);
         final jpos.POSKeyboard keyboard = (jpos.POSKeyboard) control;
 
         keyboard.addDataListener(new DataEventAdaptor() {
+            @Override
             public void dataOccurred(jpos.events.DataEvent event) {
                 Debug.log("POSKeyboard DataEvent - " + event.getWhen(), module);
                 try {

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java Sun Jul  5 10:01:19 2009
@@ -32,6 +32,7 @@
         this.control = new jpos.LineDisplay();
     }
 
+    @Override
     protected void initialize() throws JposException {
         throw new JposException(JposConst.JPOS_E_NOEXIST, "Device not yet implemented");
     }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java Sun Jul  5 10:01:19 2009
@@ -42,6 +42,7 @@
         this.control = new jpos.MSR();
     }
 
+    @Override
     protected void initialize() throws JposException {
         Debug.logInfo("MSR [" + control.getPhysicalDeviceName() + "] Claimed : " + control.getClaimed(), module);
         final jpos.MSR msr = (jpos.MSR) control;
@@ -51,6 +52,7 @@
         // create the data listner
         msr.addDataListener(new DataEventAdaptor() {
 
+            @Override
             public void dataOccurred(jpos.events.DataEvent event) {
                 String[] decodedData = new String[7];
                 byte[] track1 = null;
@@ -97,6 +99,7 @@
         // create the error listener
         msr.addErrorListener(new ErrorEventAdaptor() {
 
+            @Override
             public void errorOccurred(jpos.events.ErrorEvent event) {
                 Debug.log("Error Occurred : " + event.getErrorCodeExtended(), module);
                 PosScreen.currentScreen.showDialog("dialog/error/cardreaderror");

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java Sun Jul  5 10:01:19 2009
@@ -32,6 +32,7 @@
         this.control = new jpos.PINPad();
     }
 
+    @Override
     public void initialize() throws JposException {
         throw new JposException(JposConst.JPOS_E_NOEXIST, "Device not yet implemented");
     }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java Sun Jul  5 10:01:19 2009
@@ -27,7 +27,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.List;
 
@@ -37,7 +36,6 @@
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilFormatOut;
-import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilURL;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
@@ -83,6 +81,7 @@
         this.control = new jpos.POSPrinter();
     }
 
+    @Override
     protected void initialize() throws JposException {
         Debug.logInfo("Receipt [" + control.getPhysicalDeviceName() + "] Claimed : " + control.getClaimed(), module);
         // set map mode to metric - all dimensions specified in 1/100mm units
@@ -258,44 +257,44 @@
                     String[] code = line.trim().split("\\=");
                     if ("#description.length".equals(code[0])) {
                         try {
-                            this.descLength[type] = Integer.parseInt(code[1]);
+                            Receipt.descLength[type] = Integer.parseInt(code[1]);
                         } catch (NumberFormatException e) {
                             Debug.logWarning(e, module);
                         }
                     } else if ("#productId.length".equals(code[0])) {
                         try {
-                            this.pridLength[type] = Integer.parseInt(code[1]);
+                            Receipt.pridLength[type] = Integer.parseInt(code[1]);
                         } catch (NumberFormatException e) {
                             Debug.logWarning(e, module);
                         }
                     } else if ("#price.length".equals(code[0])) {
                         try {
-                            this.priceLength[type] = Integer.parseInt(code[1]);
+                            Receipt.priceLength[type] = Integer.parseInt(code[1]);
                         } catch (NumberFormatException e) {
                             Debug.logWarning(e, module);
                         }
                     } else if ("#quantity.length".equals(code[0])) {
                         try {
-                            this.qtyLength[type] = Integer.parseInt(code[1]);
+                            qtyLength[type] = Integer.parseInt(code[1]);
                         } catch (NumberFormatException e) {
                             Debug.logWarning(e, module);
                         }
                     } else if ("#infoString.length".equals(code[0])) {
                         try {
-                            this.infoLength[type] = Integer.parseInt(code[1]);
+                            Receipt.infoLength[type] = Integer.parseInt(code[1]);
                         } catch (NumberFormatException e) {
                             Debug.logWarning(e, module);
                         }
                     } else if ("#dateFormat".equals(code[0])) {
-                        this.dateFmtStr[type] = code[1];
+                        Receipt.dateFmtStr[type] = code[1];
                     } else if ("#configPadding.length".equals(code[0])) {
                         try {
-                            this.configPaddingLength[type] = Integer.parseInt(code[1]);
+                            Receipt.configPaddingLength[type] = Integer.parseInt(code[1]);
                             StringBuffer spaces = new StringBuffer();
-                            for (int i=0; i < this.configPaddingLength[type]; i+=1) {
+                            for (int i=0; i < Receipt.configPaddingLength[type]; i+=1) {
                                 spaces.append(" ");
                             }
-                            this.configPadding[type] = spaces.toString();
+                            Receipt.configPadding[type] = spaces.toString();
                         } catch (NumberFormatException e) {
                             Debug.logWarning(e, module);
                         }
@@ -339,7 +338,7 @@
             dateFormat = new SimpleDateFormat[3];
         }
         if (dateFormat[type] == null) {
-            dateFormat[type] = new SimpleDateFormat(this.dateFmtStr[type]);
+            dateFormat[type] = new SimpleDateFormat(Receipt.dateFmtStr[type]);
         }
         return dateFormat[type];
     }
@@ -401,7 +400,7 @@
                     expandMap.putAll(map);
                     // adjust the padding
                     expandMap.put("configDescription",
-                        UtilFormatOut.padString(this.configPadding[type] + (String) expandMap.get("configDescription"), descLength[type], true, ' '));
+                        UtilFormatOut.padString(Receipt.configPadding[type] + (String) expandMap.get("configDescription"), descLength[type], true, ' '));
                     expandMap.put("productId", UtilFormatOut.padString((String) expandMap.get("productId"), pridLength[type], true, ' '));
                     expandMap.put("configBasePrice", UtilFormatOut.padString((String) expandMap.get("configBasePrice"), priceLength[type], false, ' '));
                     expandMap.put("configQuantity", UtilFormatOut.padString((String) expandMap.get("configQuantity"), qtyLength[type], false, ' '));

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java Sun Jul  5 10:01:19 2009
@@ -41,6 +41,7 @@
         this.control = new jpos.Scanner();
     }
 
+    @Override
     protected void initialize() throws JposException {
         Debug.logInfo("Scanner [" + control.getPhysicalDeviceName() + "] Claimed : " + control.getClaimed(), module);
         final jpos.Scanner scanner = (jpos.Scanner) control;
@@ -51,6 +52,7 @@
         // create the new listner
         scanner.addDataListener(new DataEventAdaptor() {
 
+            @Override
             public void dataOccurred(jpos.events.DataEvent event) {
                 byte[] scanData = null;
                 int dataType = ScannerConst.SCAN_SDT_UNKNOWN;

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java Sun Jul  5 10:01:19 2009
@@ -32,6 +32,7 @@
         this.control = new jpos.SignatureCapture();
     }
 
+    @Override
     protected void initialize() throws JposException {
         throw new JposException(JposConst.JPOS_E_NOEXIST, "Device not yet implemented");
     }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java Sun Jul  5 10:01:19 2009
@@ -54,6 +54,7 @@
         KeyboardAdaptor.getInstance(this, KeyboardAdaptor.KEYBOARD_DATA);
     }
 
+    @Override
     public void open(String deviceName, EventCallbacks ecb) throws JposException {
         super.open(deviceName, ecb);
 
@@ -265,6 +266,7 @@
             return mappedCode;
         }
 
+        @Override
         public int hashCode() {
             int code = this.keyCode;
             if (shift) code += KeyEvent.SHIFT_DOWN_MASK;

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java Sun Jul  5 10:01:19 2009
@@ -36,6 +36,7 @@
     public void waitForDrawerClose(int i, int i1, int i2, int i3) throws JposException {
     }
 
+    @Override
     public int getDeviceServiceVersion() throws JposException {
         return 1002000;
     }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java Sun Jul  5 10:01:19 2009
@@ -29,6 +29,7 @@
 
     private StringBuffer printerBuffer = new StringBuffer();
 
+    @Override
     public int getDeviceServiceVersion() throws JposException {
         return 1002000;
     }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java Sun Jul  5 10:01:19 2009
@@ -62,6 +62,7 @@
         KeyboardAdaptor.getInstance(this, KeyboardAdaptor.SCANNER_DATA);
     }
 
+    @Override
     public void open(String deviceName, EventCallbacks ecb) throws JposException {
         super.open(deviceName, ecb);
         this.readCodeMap();

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java Sun Jul  5 10:01:19 2009
@@ -82,6 +82,7 @@
         this.addFocusListener(this);
     }
 
+    @Override
     public void pageCreated() {
         super.pageCreated();
 
@@ -130,6 +131,7 @@
         KeyboardAdaptor.attachComponents(this);
     }
 
+    @Override
     public void pageActivated() {
         super.pageActivated();
 
@@ -149,6 +151,7 @@
         this.refresh();
     }
 
+    @Override
     public void pageDeactivated() {
         super.pageDeactivated();
 
@@ -295,6 +298,7 @@
     }
 
     // generic page display methods - extends those in XPage
+    @Override
     public PosScreen showPage(String pageName) {
         return this.showPage(pageName, true);
     }

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java Sun Jul  5 10:01:19 2009
@@ -301,6 +301,7 @@
         runtime = -1;
     }
 
+    @Override
     public void exec() {
         try {
             if (startActivityId != null)

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java Sun Jul  5 10:01:19 2009
@@ -55,6 +55,7 @@
     /**
      * @see org.ofbiz.service.job.Job#exec()
      */
+    @Override
     public void exec() {
         try {
             Debug.logVerbose("Executing job now : " + activity, module);

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java Sun Jul  5 10:01:19 2009
@@ -400,6 +400,7 @@
     /**
      * @see org.ofbiz.workflow.WfExecutionObject#resume()
      */
+    @Override
     public void resume() throws WfException, CannotResume, NotRunning, NotSuspended {
         super.resume();
         try {
@@ -413,6 +414,7 @@
     /**
      * @see org.ofbiz.workflow.WfExecutionObject#abort()
      */
+    @Override
     public void abort() throws WfException, CannotStop, NotRunning {
         super.abort();
 
@@ -501,6 +503,7 @@
     /**
      * @see org.ofbiz.workflow.impl.WfExecutionObjectImpl#executionObjectType()
      */
+    @Override
     public String executionObjectType() {
         return "WfActivity";
     }

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityLoopImplementation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityLoopImplementation.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityLoopImplementation.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityLoopImplementation.java Sun Jul  5 10:01:19 2009
@@ -36,5 +36,6 @@
      * To be implemented.
      * @see org.ofbiz.workflow.impl.WfActivityAbstractImplementation#run()
      */
+    @Override
     public void run() {}
 }

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityNoImplementation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityNoImplementation.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityNoImplementation.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityNoImplementation.java Sun Jul  5 10:01:19 2009
@@ -32,5 +32,6 @@
     /**
      * @see org.ofbiz.workflow.impl.WfActivityAbstractImplementation#run()
      */
+    @Override
     public void run() {}
 }

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityRouteImplementation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityRouteImplementation.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityRouteImplementation.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityRouteImplementation.java Sun Jul  5 10:01:19 2009
@@ -32,6 +32,7 @@
     /**
      * @see org.ofbiz.workflow.impl.WfActivityAbstractImplementation#run()
      */
+    @Override
     public void run() {
         setComplete(true);
     }

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java Sun Jul  5 10:01:19 2009
@@ -40,6 +40,7 @@
     /**
      * @see org.ofbiz.workflow.impl.WfActivityAbstractImplementation#run()
      */
+    @Override
     public void run() throws WfException {
         GenericValue subFlow = null;
         try {

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java Sun Jul  5 10:01:19 2009
@@ -47,6 +47,7 @@
     /**
      * @see org.ofbiz.workflow.impl.WfActivityAbstractImplementation#run()
      */
+    @Override
     public void run() throws WfException {
         Collection tools = null;
         //Linea agregada por Oswin Ondarza

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java Sun Jul  5 10:01:19 2009
@@ -113,6 +113,7 @@
     /**
      * @see org.ofbiz.workflow.WfExecutionObject#abort()
      */
+    @Override
     public void abort() throws WfException, CannotStop, NotRunning {
         super.abort();
 
@@ -278,6 +279,7 @@
     /**
      * @see org.ofbiz.workflow.impl.WfExecutionObjectImpl#executionObjectType()
      */
+    @Override
     public String executionObjectType() {
         return "WfProcess";
     }