svn commit: r519584 - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/content/src/ applications/content/src/org/ofbiz/content/content/ applications/order/src/org/ofbiz/order/shoppingcart/ specialpurpose/pos/src/o...

[lektran]

Author: lektran
Date: Sun Mar 18 03:06:49 2007
New Revision: 519584

URL: http://svn.apache.org/viewvc?view=rev&rev=519584
Log:
Applied patch from Stefan Huehner (OFBIZ-776), fixes a couple of misc. assignment bugs

Modified:
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
    ofbiz/trunk/applications/content/src/ControlApplet.java
    ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?view=diff&rev=519584&r1=519583&r2=519584
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Sun Mar 18 03:06:49 2007
@@ -2955,7 +2955,7 @@
                 }
             }
         }
-        successMessage.concat(UtilProperties.getMessage(resource, "AccountingSuccessFull",locale));
+        successMessage = successMessage.concat(UtilProperties.getMessage(resource, "AccountingSuccessFull",locale));
         return results;
     }
 

Modified: ofbiz/trunk/applications/content/src/ControlApplet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/ControlApplet.java?view=diff&rev=519584&r1=519583&r2=519584
==============================================================================
--- ofbiz/trunk/applications/content/src/ControlApplet.java (original)
+++ ofbiz/trunk/applications/content/src/ControlApplet.java Sun Mar 18 03:06:49 2007
@@ -193,7 +193,7 @@
         String responseStr = in.readLine();
         in.close();
         if (responseStr != null)
-            responseStr.trim();  
+            responseStr = responseStr.trim();
         if (debug != null && debug.equalsIgnoreCase("true"))
             System.out.println("Receive response: " + responseStr);                    
         return responseStr;                

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?view=diff&rev=519584&r1=519583&r2=519584
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Sun Mar 18 03:06:49 2007
@@ -695,7 +695,7 @@
         List contentList = new ArrayList();
         String contentIdName = "contentId";
         if (linkDir != null && linkDir.equalsIgnoreCase("TO")) {
-            contentIdName.concat("To");
+            contentIdName = contentIdName.concat("To");
         }
         GenericValue assoc = null;
         GenericValue content = null;
@@ -729,8 +729,8 @@
         String contentIdName = "contentId";
         String contentAssocViewName = "contentAssocView";
         if (linkDir != null && linkDir.equalsIgnoreCase("TO")) {
-            contentIdName.concat("To");
-            contentAssocViewName.concat("To");
+            contentIdName = contentIdName.concat("To");
+            contentAssocViewName = contentAssocViewName.concat("To");
         }
         EntityExpr expr = new EntityExpr(contentIdName, EntityOperator.EQUALS, origContentId);
         exprListAnd.add(expr);

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?view=diff&rev=519584&r1=519583&r2=519584
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Sun Mar 18 03:06:49 2007
@@ -652,7 +652,7 @@
     }
 
     /** Creates new ShoppingCartItem object. */
-    protected ShoppingCartItem(GenericValue product, Map additionalProductFeatureAndAppls, Map attributes, String prodCatalogId, ProductConfigWrapper configWrapper, Locale locale, String itemType, ShoppingCart.ShoppingCartItemGroup itemGroupi, GenericValue parentProduct) {
+    protected ShoppingCartItem(GenericValue product, Map additionalProductFeatureAndAppls, Map attributes, String prodCatalogId, ProductConfigWrapper configWrapper, Locale locale, String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, GenericValue parentProduct) {
         this._product = product;
         this.productId = _product.getString("productId");
         this._parentProduct = parentProduct;

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?view=diff&rev=519584&r1=519583&r2=519584
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Sun Mar 18 03:06:49 2007
@@ -313,7 +313,7 @@
                     Debug.logError(e, module);
                 }
                 String nameOnCard = cc.getString("firstNameOnCard") + " " + cc.getString("lastNameOnCard");
-                nameOnCard.trim();
+                nameOnCard = nameOnCard.trim();
                 payInfo.put("nameOnCard", nameOnCard);
 
                 String cardNum = cc.getString("cardNumber");