svn commit: r670108 - in /ofbiz/trunk: applications/accounting/widget/BillingAccountForms.xml framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java

[le...@apache.org]

Author: lektran
Date: Fri Jun 20 17:53:09 2008
New Revision: 670108

URL: http://svn.apache.org/viewvc?rev=670108&view=rev
Log:
Fix an NPE, some typos and a label

Modified:
    ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=670108&r1=670107&r2=670108&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Fri Jun 20 17:53:09 2008
@@ -46,7 +46,7 @@
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
         <field name="partyId"><display/></field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
+        <field name="roleTypeId" title="${uiLabelMap.AccountingRoleType}"><display-entity entity-name="RoleType"/></field>
     </form>
 
     <form name="ListBillingAccountInvoices" type="list" list-name="billingAccountInvoices" paginate-target="BillingAccountInvoices" default-entity-name="Invoice"
@@ -100,7 +100,7 @@
     <form name="EditBillingAccount" type="single" target="updateBillingAccount" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
-            <set field="availableBalance" value="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount)}" type="BigDecimal"/>
+            <set field="availableBalance" value="${bsh:billingAccount != null ? org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/>
         </actions>
         <alt-target use-when="billingAccount==null" target="createBillingAccount"/>
         <auto-fields-service service-name="updateBillingAccount" map-name="billingAccount"/>

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=670108&r1=670107&r2=670108&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/string/FlexibleStringExpander.java Fri Jun 20 17:53:09 2008
@@ -290,10 +290,10 @@
                         buffer.append(scriptResult);
                     }
                 } else {
-                    Debug.logWarning("BSH scriplet evaluated to null [" + scriptlet + "], got no return so inserting nothing.", module);
+                    Debug.logWarning("BSH scriptlet evaluated to null [" + scriptlet + "], got no return so inserting nothing.", module);
                 }
             } catch (EvalError e) {
-                Debug.logWarning(e, "Error evaluating BSH scriplet [" + scriptlet + "], inserting nothing; error was: " + e.toString(), module);
+                Debug.logWarning(e, "Error evaluating BSH scriptlet [" + scriptlet + "], inserting nothing; error was: " + e.toString(), module);
             }
         }
     }
@@ -407,7 +407,7 @@
         }
 
         public void handleBsh(String original, int start, int end) {
-            //run the scriplet and append the result
+            //run the scriptlet and append the result
             String scriptlet = original.substring(start, end);
             try {
                 Object scriptResult = BshUtil.eval(scriptlet, UtilMisc.makeMapWritable(context));
@@ -418,10 +418,10 @@
                         targetBuffer.append(scriptResult);
                     }
                 } else {
-                    Debug.logWarning("BSH scriplet evaluated to null [" + scriptlet + "], got no return so inserting nothing.", module);
+                    Debug.logWarning("BSH scriptlet evaluated to null [" + scriptlet + "], got no return so inserting nothing.", module);
                 }
             } catch (EvalError e) {
-                Debug.logWarning(e, "Error evaluating BSH scriplet [" + scriptlet + "], inserting nothing; error was: " + e.toString(), module);
+                Debug.logWarning(e, "Error evaluating BSH scriptlet [" + scriptlet + "], inserting nothing; error was: " + e.toString(), module);
             }
         }
     }