svn commit: r804895 [7/7] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/agreement/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org...

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

svn commit: r804895 [7/7] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/agreement/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org...

jleroux@apache.org
Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java Mon Aug 17 08:20:38 2009
@@ -1305,13 +1305,13 @@
                 // TODO:  The following comparison does not consider the To Name or Attn: lines of the address.
                 //
                 // now compare values.  If all fields match, that's our shipping address.  Return the related contact mech id.
-                if (    parameters.get("shippingAddressStreet1").toString().equals((postalAddress.get("address1").toString())) &&
+                if (   parameters.get("shippingAddressStreet1").toString().equals((postalAddress.get("address1").toString())) &&
                         parameters.get("shippingAddressStreet2").toString().equals((postalAddress.get("address2").toString())) &&
                         parameters.get("city").toString().equals((postalAddress.get("city").toString())) &&
                         parameters.get("stateProvinceGeoId").toString().equals((postalAddress.get("stateProvinceGeoId").toString())) &&
                         parameters.get("countryGeoId").toString().equals((postalAddress.get("countryGeoId").toString())) &&
                         parameters.get("shippingAddressPostalCode").toString().equals((postalAddress.get("postalCode").toString()))
-                        ) { // this is an exact address match!!
+                       ) { // this is an exact address match!!
                     return contactMechId;
                 }
             } catch (Exception e) {

Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Mon Aug 17 08:20:38 2009
@@ -241,7 +241,7 @@
 
         // handle the adjustments
         OrderAdjustment adjustment = info.getOrderAdjustment();
-        if (adjustment != null){
+        if (adjustment != null) {
             addAdjustments(cart, adjustment);
             // ship group info
             Shipping shipping = info.getOrderAdjustment().getShipping();
@@ -501,7 +501,7 @@
 
  protected String getAddressType(int addrType) {
     String contactMechPurposeTypeId = "GENERAL_LOCATION";
-        switch(addrType) {
+        switch (addrType) {
             case SHIPPING_ADDRESS:
                 contactMechPurposeTypeId = "SHIPPING_LOCATION";
                 break;

Modified: ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java Mon Aug 17 08:20:38 2009
@@ -87,10 +87,10 @@
         Iterator invItemListIter = invItemList.iterator();
         while (invItemListIter.hasNext()) {
             GenericValue invItem = (GenericValue)invItemListIter.next();
-            if ( invItem != null) {
+            if (invItem != null) {
                 int qoh = ((Double)invItem.get("quantityOnHandTotal")).intValue();
 
-                if ( qoh < 0 ) {
+                if (qoh < 0) {
                     // Got a negative qoh so lets balance if off to zero.
                     Map contextInput = UtilMisc.toMap("userLogin", userLogin, "inventoryItemId", invItem.get("inventoryItemId"),
                             "varianceReasonId", "VAR_LOST", "availableToPromiseVar", new Double(qoh*-1),
@@ -117,12 +117,12 @@
         String locationSeqId = (String) context.get("locationSeqId");
         String locationSeqIdNew = (String) context.get("locationSeqIdNew");
         Double quantity = (Double) context.get("quantity");
-        if ( UtilValidate.isEmpty(productId) || UtilValidate.isEmpty(facilityId) ) {
+        if (UtilValidate.isEmpty(productId) || UtilValidate.isEmpty(facilityId)) {
             return ServiceUtil.returnError("productId or facilityId not found");
         }
 
         // First identify the location and get a list of inventoryItemIds for that location.
-        if ( UtilValidate.isEmpty(locationSeqId) ) {
+        if (UtilValidate.isEmpty(locationSeqId)) {
             // Assume this is the null field version
             locationSeqId = "nullField";
         }
@@ -138,7 +138,7 @@
         }
         int atp = ((Double)invAvailability.get("availableToPromiseTotal")).intValue();
         int qoh = ((Double)invAvailability.get("quantityOnHandTotal")).intValue();
-        if ( quantity.intValue() == qoh ) {
+        if (quantity.intValue() == qoh) {
             // No change required.
             Debug.logInfo("updateProductStocktake No change required quantity("+quantity+") = qoh("+qoh+")", module);
             return ServiceUtil.returnSuccess();
@@ -159,7 +159,7 @@
             GenericValue invItem = (GenericValue)invItemListIter.next();
             String locationFound = invItem.getString("locationSeqId");
             Debug.logInfo("updateProductStocktake: InvItemId("+invItem.getString("inventoryItemId")+")", module);
-            if ( locationFound == null ) {
+            if (locationFound == null) {
                 locationFound = "nullField";
             }
         }

Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Mon Aug 17 08:20:38 2009
@@ -528,7 +528,7 @@
                     String invItemStatus = UtilXml.childElementValue(receiptLnElement, "of:DISPOSITN");
                     if (invItemStatus.equals("ReceivedTOAvailable") || invItemStatus.equals("NotAvailableTOAvailable")) {
                         ripCtx.put("statusId","INV_AVAILABLE");
-                    } else if (invItemStatus.equals("ReceivedTONotAvailable") || invItemStatus.equals("AvailableTONotAvailable") ) {
+                    } else if (invItemStatus.equals("ReceivedTONotAvailable") || invItemStatus.equals("AvailableTONotAvailable")) {
                         ripCtx.put("statusId","INV_ON_HOLD");
                     }
                     */

Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Mon Aug 17 08:20:38 2009
@@ -226,7 +226,7 @@
                 String carrierCode = UtilXml.childElementValue(shipUnitElement, "of:CARRIER"); // of
                 if (UtilValidate.isNotEmpty(carrierCode)) {
                     String carrierPartyId = null;
-                    if ( carrierCode.startsWith("F") || carrierCode.startsWith("f")) {
+                    if (carrierCode.startsWith("F") || carrierCode.startsWith("f")) {
                         carrierPartyId = "FEDEX";
                     } else if (carrierCode.startsWith("U")|| carrierCode.startsWith("u")) {
                         carrierPartyId = "UPS";
@@ -810,7 +810,7 @@
             EntityCondition findShipmentCondition = EntityCondition.makeCondition(UtilMisc.toList(
                     EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, orderId),
                     EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "SHIPMENT_CANCELLED")
-                    ), EntityOperator.AND);
+                   ), EntityOperator.AND);
             List shipmentList = delegator.findList("Shipment", findShipmentCondition, null, null, null, false);
             GenericValue shipment = EntityUtil.getFirst(shipmentList);
 

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=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Mon Aug 17 08:20:38 2009
@@ -201,7 +201,7 @@
     }
 
     public List lookupItem(String sku) throws GeneralException {
-        return ProductWorker.findProductsById( session.getDelegator(), sku, null);
+        return ProductWorker.findProductsById(session.getDelegator(), sku, null);
     }
 
     public String getOrderId() {
@@ -443,9 +443,9 @@
         return pcw;
     }
 
-    public ProductConfigWrapper getProductConfigWrapper(String productId, String cartIndex ) {
+    public ProductConfigWrapper getProductConfigWrapper(String productId, String cartIndex) {
         // Get a PCW for a pre-configured product
-         trace("get Product Config Wrapper", productId + "/" + cartIndex );
+         trace("get Product Config Wrapper", productId + "/" + cartIndex);
          ProductConfigWrapper pcw = null;
          try {
             int index = Integer.parseInt(cartIndex);
@@ -490,7 +490,7 @@
 
     public void addItem(String productId, ProductConfigWrapper pcw)
         throws ItemNotFoundException, CartItemModifyException {
-        trace("add item with ProductConfigWrapper", productId );
+        trace("add item with ProductConfigWrapper", productId);
         try {
             cart.addOrIncreaseItem(productId, null, BigDecimal.ONE, null, null, null, null, null, null, null, null, pcw, null, null, null, session.getDispatcher());
         } catch (ItemNotFoundException e) {
@@ -507,7 +507,7 @@
 
     public void modifyConfig(String productId, ProductConfigWrapper pcw, String cartIndex)
         throws CartItemModifyException, ItemNotFoundException {
-        trace("modify item config", cartIndex );
+        trace("modify item config", cartIndex);
         try {
             int cartIndexInt = Integer.parseInt(cartIndex);
             ShoppingCartItem cartItem = cart.findCartItem(cartIndexInt);
@@ -1380,7 +1380,7 @@
     }
 
     public void saveOrder(String shoppingListName, PosScreen pos) {
-        if (cart.size() == 0 ) {
+        if (cart.size() == 0) {
             pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale));
             return;
         }
@@ -1409,7 +1409,7 @@
     }
 
     public void saveSale(String  shoppingListName, PosScreen pos) {
-        if (cart.size() == 0 ) {
+        if (cart.size() == 0) {
             pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale));
             return;
         }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java Mon Aug 17 08:20:38 2009
@@ -73,7 +73,7 @@
 
     public void setFunction(String function, String value) throws IllegalArgumentException {
         if (isValidFunction(function)) {
-            this.functionStack.push( new String[] { function, value });
+            this.functionStack.push(new String[] { function, value });
             input.setText("");
         } else {
             throw new IllegalArgumentException();

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java Mon Aug 17 08:20:38 2009
@@ -26,25 +26,25 @@
     protected javax.swing.JTextField savedInput;
     protected XPassword password = null;
 
-    public InputWithPassword( PosScreen page) {
-        super( page);
+    public InputWithPassword(PosScreen page) {
+        super(page);
         this.savedInput = super.input;
         this.password = (XPassword)page.findComponent("pos_inputpassword");
-        if ( this.password == null) {
+        if (this.password == null) {
             this.password = new XPassword();
         }
         this.password.setVisible(false);
         this.password.setFocusable(false);
     }
     public void setPasswordInput(boolean isPasswordInput) {
-        if ( isPasswordInput) {
+        if (isPasswordInput) {
             this.savedInput.setVisible(false);
             this.password.setText("");
-            this.password.setVisible( true);
+            this.password.setVisible(true);
             super.input = this.password;
         } else {
             this.password.setVisible(false);
-            this.savedInput.setVisible( true);
+            this.savedInput.setVisible(true);
             super.input = this.savedInput;
         }
     }

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=804895&r1=804894&r2=804895&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 Mon Aug 17 08:20:38 2009
@@ -75,7 +75,7 @@
         // some settings needed for XUI 3.2rc2b update
         jtable.setRowHeight(30); // Better to catch the line on a touch screen (minimal height I think)
         XStyle style = currentProject.getStyleManager().getStyle("journalBorder");
-        Color borderColor = style.getStyleAsColor(XStyle.COLOR_FORE );
+        Color borderColor = style.getStyleAsColor(XStyle.COLOR_FORE);
         jtable.setGridColor(borderColor); // jtable.setBorderStyle("journalBorder"); above is not working anymore
         style = currentProject.getStyleManager().getStyle("journalData");
         Color backgoundColor = style.getStyleAsColor(XStyle.COLOR_BACK);
@@ -201,7 +201,7 @@
     private String getModelText(XModel model)
     {
         StringWriter sw = new StringWriter();
-        XDataSource.outputModel( sw, model );
+        XDataSource.outputModel(sw, model);
         return "<Datasets>" + sw.toString() + "</Datasets>";
     }
 }
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Mon Aug 17 08:20:38 2009
@@ -154,7 +154,7 @@
                     input.clearInput();
                     pos.showDialog("dialog/error/invalidcardnumber");
                 }
-            } else if (msrInfo == null && (securityCodeInfo == null) ) {
+            } else if (msrInfo == null && (securityCodeInfo == null)) {
                 // test expiration date
                 if (UtilValidate.isNotEmpty(input.value()) && (input.value().length() == 4)) {
                     // ask for Security Code, put in SECURITYCODE
@@ -168,7 +168,7 @@
                     input.clearInput();
                     pos.showDialog("dialog/error/invalidexpirationdate");
                 }
-            } else if (msrInfo == null && (postalCodeInfo == null) ) {
+            } else if (msrInfo == null && (postalCodeInfo == null)) {
                 // test security code - allow blank for illegible cards
                 if (UtilValidate.isEmpty(input.value()) ||
                         (UtilValidate.isNotEmpty(input.value()) && (input.value().length() <= 4))) {

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java Mon Aug 17 08:20:38 2009
@@ -89,13 +89,13 @@
             if (UtilValidate.isEmpty(func[1]) && UtilValidate.isEmpty(text)) {
                 output.print(UtilProperties.getMessage(PosTransaction.resource,"PosULogin",Locale.getDefault()));
                 input.setFunction(loginFunc);
-                input.setPasswordInput( false);
+                input.setPasswordInput(false);
             } else if (UtilValidate.isEmpty(func[1])) {
                 output.print(UtilProperties.getMessage(PosTransaction.resource,"PosUPassw",Locale.getDefault()));
                 input.setFunction(loginFunc);
-                input.setPasswordInput( true);
+                input.setPasswordInput(true);
             } else {
-                input.setPasswordInput( false);
+                input.setPasswordInput(false);
                 String username = func[1];
                 String password = text;
                 if (!mgr) {

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=804895&r1=804894&r2=804895&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 Mon Aug 17 08:20:38 2009
@@ -481,7 +481,7 @@
 
     private void printALine(String s) {
         printerBuffer = printerBuffer.append(s);
-        if ( s.indexOf(NullPosPrinter.PAPER_CUT) > 0 ) {
+        if (s.indexOf(NullPosPrinter.PAPER_CUT) > 0) {
             Debug.log(printerBuffer.toString(), module);
             printerBuffer = new StringBuffer();
         }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java Mon Aug 17 08:20:38 2009
@@ -191,7 +191,7 @@
             while (iter.hasNext()) {
                 Question buttonQuestion = qf.get((ConfigItem)iter.next());
                 XButton button = (XButton)buttons.next();
-                questionHashMap.put(button.getName(), buttonQuestion );
+                questionHashMap.put(button.getName(), buttonQuestion);
                 buttonQuestion.setupButton(button);
                 if (buttonQuestion instanceof ListQuestion) {
                     ((ListQuestion)buttonQuestion).setupListPane(m_optionListPane);
@@ -204,7 +204,7 @@
 
     private void getButtons() {
         ArrayList buttonList = new ArrayList();
-        for(String[] buttonSingleArray : buttonArray ) {
+        for(String[] buttonSingleArray : buttonArray) {
             for(String buttonName : buttonSingleArray) {
                 //Debug.logInfo("ButtonName: "+buttonName, module);
                 XButton button = (XButton) m_dialog.findComponent(buttonName);

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java Mon Aug 17 08:20:38 2009
@@ -55,8 +55,8 @@
         originalText = getText();
 //      XuiUtilities.getMaxCoordinates(m_dialog);
 //      Panel m_panel = m_dialog.PANEL;
-//      pageHelper.componentFactory.setParentComponent( this );
-//      contentPanel = ( XPanel )pageHelper.componentFactory.addComponent( XPage.PANEL, 0, 0, 800, 600 );
+//      pageHelper.componentFactory.setParentComponent(this);
+//      contentPanel = (XPanel)pageHelper.componentFactory.addComponent(XPage.PANEL, 0, 0, 800, 600);
 //      FIXME XUI dialog boxes are hardcoded to a 800*600 max ! https://issues.apache.org/jira/browse/OFBIZ-1606?focusedCommentId=12614469#action_12614469
 //      actually maxi seem to be 808*628 certainly due to margins(?)
         m_dialog.pack();

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java Mon Aug 17 08:20:38 2009
@@ -302,7 +302,7 @@
         Point size = this.getMaxCoordinates(contentPane);
         size.x += 2 * padding + 2;
         size.y += 2 * padding + 4 + 2;
-        if ( size.x != wSize.width || size.y != wSize.height ) {
+        if (size.x != wSize.width || size.y != wSize.height) {
             this.pack();
         }
     }
@@ -343,7 +343,7 @@
                   dialog.setVisible(posDialogVisible);
               }
           }
-      );
+     );
     }
 
 }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java Mon Aug 17 08:20:38 2009
@@ -43,22 +43,22 @@
 //        SwingUtilities.invokeLater(
 //            new Runnable() {
 //                public void run() {
-//                    Debug.logInfo( "isEditable in setFocus :" + m_focused.isEditable(), "======================================" );
-//                    Debug.logInfo( "isEnabled in setFocus: " + m_focused.isEnabled(), "======================================" );
-//                    Debug.logInfo( "isFocusable in setFocus :" + m_focused.isFocusable(), "======================================" );
+//                    Debug.logInfo("isEditable in setFocus :" + m_focused.isEditable(), "======================================");
+//                    Debug.logInfo("isEnabled in setFocus: " + m_focused.isEnabled(), "======================================");
+//                    Debug.logInfo("isFocusable in setFocus :" + m_focused.isFocusable(), "======================================");
 //                    m_focused.requestFocusInWindow();
 //                }
 //            }
-//        );
+//       );
 //    }
 //
 //    /**
 //     * @param m_focused the m_focused to set
 //     */
 //    public void setM_focused(XEdit focused) {
-//        Debug.logInfo( "isEditable in setM_focused :" + focused.isEditable(), "======================================" );
-//        Debug.logInfo( "isEnabled in setM_focused :" + focused.isEnabled(), "======================================" );
-//        Debug.logInfo( "isFocusable in setM_focused :" + focused.isFocusable(), "======================================" );
+//        Debug.logInfo("isEditable in setM_focused :" + focused.isEditable(), "======================================");
+//        Debug.logInfo("isEnabled in setM_focused :" + focused.isEnabled(), "======================================");
+//        Debug.logInfo("isFocusable in setM_focused :" + focused.isFocusable(), "======================================");
 //        this.m_focused = focused;
 //    }
 }

Modified: ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java Mon Aug 17 08:20:38 2009
@@ -48,7 +48,7 @@
                     GenericValue assoc = (GenericValue) a.next();
                     GenericValue nextTask = assoc.getRelatedOne("ToWorkEffort");
                       Timestamp newStartDate = task.getTimestamp("estimatedCompletionDate"); // start of next task the next day
-                      if (nextTask.get("estimatedStartDate") == null || nextTask.getTimestamp("estimatedStartDate").before(newStartDate) ) {
+                      if (nextTask.get("estimatedStartDate") == null || nextTask.getTimestamp("estimatedStartDate").before(newStartDate)) {
                             nextTask.put("estimatedStartDate", UtilDateTime.addDaysToTimestamp(task.getTimestamp("estimatedCompletionDate"), 1)); // start of next task the next day
                              nextTask.put("estimatedCompletionDate", calculateCompletionDate(nextTask, task.getTimestamp("estimatedCompletionDate")));
                              nextTask.store();

Modified: ofbiz/trunk/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java Mon Aug 17 08:20:38 2009
@@ -187,7 +187,7 @@
                                     XMLUtil.getPackage(app).getId(),
                                        ((isProcessApp)? cOwn.get("Id").toValue() : null),
                                     applicationId
-                                   );
+                                  );
                SharkUtilities.commitMappingTransaction(t);
             } catch (RootException e) {
                SharkUtilities.rollbackMappingTransaction(t,e);

Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java Mon Aug 17 08:20:38 2009
@@ -142,7 +142,7 @@
             if (iiopHost != null && iiopHost.value != null && iiopHost.value.length() > 0) {
                 if (iiopPort != null && iiopPort.value != null && iiopPort.value.length() > 0) {
                        try {
-                            p = Runtime.getRuntime().exec( java_home + "\\" + "bin\\tnameserv"
+                            p = Runtime.getRuntime().exec(java_home + "\\" + "bin\\tnameserv"
                                      + " -ORBInitialPort "
                                      +  iiopPort.value);
                             Thread.sleep(5000);

Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Mon Aug 17 08:20:38 2009
@@ -1045,7 +1045,7 @@
                     ProcessId = (String)st.nextElement();
                     strtoc = new StringTokenizer(ProcessId, "\'");
                     ProcessId = strtoc.nextToken();
-                } else if ( element.equals("ActivityStates"))
+                } else if (element.equals("ActivityStates"))
                 {
                     st.nextElement();
                     st.nextElement();

Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java Mon Aug 17 08:20:38 2009
@@ -144,14 +144,14 @@
     }
 
     public boolean equalsByKeys(ApplicationMap applicationMap) {
-        if (applicationMap == null ) return false;
+        if (applicationMap == null) return false;
 
         if ((applicationMap.getPackageId() != null && this.getPackageId() != null))
             if (!(applicationMap.getPackageId().equals(this.getPackageId())))
                 return false;
 
         if ((applicationMap.getProcessDefinitionId() != null && this.getProcessDefinitionId() != null))
-            if ( !(applicationMap.getProcessDefinitionId().equals(this.getProcessDefinitionId())))
+            if (!(applicationMap.getProcessDefinitionId().equals(this.getProcessDefinitionId())))
                 return false;
 
         if ((applicationMap.getApplicationDefinitionId() != null && this.getApplicationDefinitionId() != null))

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=804895&r1=804894&r2=804895&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 Mon Aug 17 08:20:38 2009
@@ -720,7 +720,7 @@
             throw new WfException(e.getMessage(), e);
         }
         if (Debug.verboseOn()) {
-            Debug.logVerbose("[WfActivity.setLimitService]: Set limit service (" + limitService + " ) to run at " + startTime, module);
+            Debug.logVerbose("[WfActivity.setLimitService]: Set limit service (" + limitService + ") to run at " + startTime, module);
         }
     }