svn commit: r484974 - in /incubator/ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/ applications/content/src/org/ofbiz/content/data/ applications/content/src/org...

Author: jleroux
Date: Sat Dec  9 04:15:39 2006
New Revision: 484974

URL: http://svn.apache.org/viewvc?view=rev&rev=484974
Log:
A patch from Stefan Huehner "Code-Cleanup: remove superflous new String and .toString() calls" (https://issues.apache.org/jira/browse/OFBIZ-533).
This files was missing because I had to revert them to resolve previous conflict

Modified:
    incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
    incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
    incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
    incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java
    incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
    incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
    incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
    incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
    incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
    incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java
    incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
    incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
    incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java
    incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
    incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java
    incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java
    incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
    incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java
    incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java

Modified: incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Sat Dec  9 04:15:39 2006
@@ -2007,7 +2007,7 @@
             context.put("useHighestAmount","Y");
         }
 
-        String defaultInvoiceProcessing = UtilProperties.getPropertyValue("AccountingConfig","invoiceProcessing").toString();
+        String defaultInvoiceProcessing = UtilProperties.getPropertyValue("AccountingConfig","invoiceProcessing");
         
         boolean debug = true; // show processing messages in the log..or not....
 
@@ -2038,7 +2038,7 @@
                 " amountApplied: " + amountApplied +
                 " TaxAuthGeoId: " + taxAuthGeoId, module);
 
-        if (changeProcessing == null) changeProcessing = new String("N");    // not provided, so no change
+        if (changeProcessing == null) changeProcessing = "N";    // not provided, so no change
         
         boolean invoiceProcessing = true;
         if (defaultInvoiceProcessing.equals("YY")) invoiceProcessing = true;
@@ -2497,27 +2497,27 @@
         // show the maximumus what can be added in the payment application file.
         String toMessage = null;  // prepare for success message
         if (debug) {
-            String extra = new String("");
+            String extra = "";
             if (invoiceItemSeqId != null) {
-                extra = new String(" Invoice item(" + invoiceItemSeqId + ") amount not yet applied: " + newInvoiceItemApplyAvailable);
+                extra = " Invoice item(" + invoiceItemSeqId + ") amount not yet applied: " + newInvoiceItemApplyAvailable;
             }
             Debug.logInfo("checking finished, start processing with the following data... ", module);
             if (invoiceId != null) {
                 Debug.logInfo(" Invoice(" + invoiceId + ") amount not yet applied: " + newInvoiceApplyAvailable + extra + " Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable +  " Requested amount to apply:" + amountApplied, module);
-                toMessage = new String(UtilProperties.getMessage(resource, "AccountingApplicationToInvoice",UtilMisc.toMap("invoiceId",invoiceId),locale));
-                if(extra.length() > 0) toMessage = new String(UtilProperties.getMessage(resource, "AccountingApplicationToInvoiceItem",UtilMisc.toMap("invoiceId",invoiceId,"invoiceItemSeqId",invoiceItemSeqId),locale));
+                toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToInvoice",UtilMisc.toMap("invoiceId",invoiceId),locale);
+                if(extra.length() > 0) toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToInvoiceItem",UtilMisc.toMap("invoiceId",invoiceId,"invoiceItemSeqId",invoiceItemSeqId),locale);
             }
             if (toPaymentId != null) {
                 Debug.logInfo(" toPayment(" + toPaymentId + ") amount not yet applied: " + newToPaymentApplyAvailable + " Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable + " Requested amount to apply:" + amountApplied, module);
-                toMessage = new String(UtilProperties.getMessage(resource, "AccountingApplicationToPayment",UtilMisc.toMap("paymentId",toPaymentId),locale));
+                toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToPayment",UtilMisc.toMap("paymentId",toPaymentId),locale);
             }
             if (billingAccountId != null) {
                 Debug.logInfo(" billingAccount(" + billingAccountId + ") amount not yet applied: " + newBillingAccountApplyAvailable + " Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable + " Requested amount to apply:" + amountApplied, module);
-                toMessage = new String(UtilProperties.getMessage(resource, "AccountingApplicationToBillingAccount",UtilMisc.toMap("billingAccountId",billingAccountId),locale));
+                toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToBillingAccount",UtilMisc.toMap("billingAccountId",billingAccountId),locale);
             }
             if (taxAuthGeoId != null) {
                 Debug.logInfo(" taxAuthGeoId(" + taxAuthGeoId + ")  Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable + " Requested amount to apply:" + amountApplied, module);
-                toMessage = new String(UtilProperties.getMessage(resource, "AccountingApplicationToTax",UtilMisc.toMap("taxAuthGeoId",taxAuthGeoId),locale));
+                toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToTax",UtilMisc.toMap("taxAuthGeoId",taxAuthGeoId),locale);
             }
         }
         // if the amount to apply was not provided or was zero fill it with the maximum possible and provide information to the user
@@ -2525,11 +2525,11 @@
             amountApplied = newPaymentApplyAvailable;
             if (invoiceId != null && newInvoiceApplyAvailable.compareTo(amountApplied) < 0) {
                 amountApplied = newInvoiceApplyAvailable;
-                toMessage = new String(UtilProperties.getMessage(resource, "AccountingApplicationToInvoice",UtilMisc.toMap("invoiceId",invoiceId),locale));
+                toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToInvoice",UtilMisc.toMap("invoiceId",invoiceId),locale);
             }
             if (toPaymentId != null && newToPaymentApplyAvailable.compareTo(amountApplied) == 1) {
                 amountApplied = newToPaymentApplyAvailable;
-                toMessage = new String(UtilProperties.getMessage(resource, "AccountingApplicationToPayment",UtilMisc.toMap("paymentId",toPaymentId),locale));
+                toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToPayment",UtilMisc.toMap("paymentId",toPaymentId),locale);
             }
         }
         
@@ -2537,7 +2537,7 @@
             errorMessageList.add(UtilProperties.getMessage(resource, "AccountingNoAmount",locale));
         }
         else {
-            successMessage = new String(UtilProperties.getMessage(resource, "AccountingApplicationSuccess",UtilMisc.toMap("amountApplied",amountApplied,"paymentId",paymentId,"isoCode", payment.getString("currencyUomId"),"toMessage",toMessage),locale));
+            successMessage = UtilProperties.getMessage(resource, "AccountingApplicationSuccess",UtilMisc.toMap("amountApplied",amountApplied,"paymentId",paymentId,"isoCode", payment.getString("currencyUomId"),"toMessage",toMessage),locale);
         }
         
         // report error messages if any

Modified: incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java (original)
+++ incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java Sat Dec  9 04:15:39 2006
@@ -218,7 +218,7 @@
             if (invoice.getString("invoiceTypeId").equals("SALES_INVOICE"))
                 destinationPartyId = invoice.getString("partyId");
             if (invoice.getString("invoiceTypeId").equals("PURCHASE_INVOICE"))
-                destinationPartyId = new String("partyFrom");
+                destinationPartyId = "partyFrom";
             try {
                 locations = EntityUtil.filterByDate(delegator.findByAnd("PartyContactMechPurpose",
                         UtilMisc.toMap("partyId", destinationPartyId, "contactMechPurposeTypeId", contactMechPurposeTypeId)));

Modified: incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original)
+++ incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Sat Dec  9 04:15:39 2006
@@ -431,7 +431,7 @@
         GenericDelegator delegator = paymentPreference.getDelegator();
 
         // create the PaymentGatewayResponse
-        String responseId = delegator.getNextSeqId("PaymentGatewayResponse").toString();
+        String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
         GenericValue response = delegator.makeValue("PaymentGatewayResponse", null);
         response.set("paymentGatewayResponseId", responseId);
         response.set("paymentServiceTypeEnumId", "PRDS_PAY_EXTERNAL");

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java Sat Dec  9 04:15:39 2006
@@ -102,7 +102,7 @@
             // If textData exists, then create DataResource and return dataResourceId
             String dataResourceId = (String) context.get("dataResourceId");
             if (UtilValidate.isEmpty(dataResourceId))
-                dataResourceId = delegator.getNextSeqId("DataResource").toString();
+                dataResourceId = delegator.getNextSeqId("DataResource");
             if (Debug.infoOn()) Debug.logInfo("in createDataResourceMethod, dataResourceId:" + dataResourceId, module);
             GenericValue dataResource = delegator.makeValue("DataResource", UtilMisc.toMap("dataResourceId", dataResourceId));
             dataResource.setNonPKFields(context);

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Sat Dec  9 04:15:39 2006
@@ -341,7 +341,7 @@
             newContent = delegator.makeValue("Content", content);
             Debug.logVerbose("in cloneLayout, newContent:" + newContent, "");
             String oldName = (String)content.get("contentName");
-            newId = delegator.getNextSeqId("Content").toString();
+            newId = delegator.getNextSeqId("Content");
             newContent.set("contentId", newId);
             String dataResourceId = (String)content.get("dataResourceId");
             GenericValue dataResource = delegator.findByPrimaryKey("DataResource",
@@ -351,7 +351,7 @@
                 Debug.logVerbose("in cloneLayout, newDataResource:" + newDataResource, "");
                 String dataResourceName = "Copy:" + (String)dataResource.get("dataResourceName");
                 newDataResource.set("dataResourceName", dataResourceName);
-                newDataResourceId = delegator.getNextSeqId("DataResource").toString();
+                newDataResourceId = delegator.getNextSeqId("DataResource");
                 newDataResource.set("dataResourceId", newDataResourceId);
                 newDataResource.set("createdDate", UtilDateTime.nowTimestamp());
                 newDataResource.set("lastModifiedDate", UtilDateTime.nowTimestamp());

Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java Sat Dec  9 04:15:39 2006
@@ -190,7 +190,7 @@
 
                     // create the OrderPaymentPreference
                     // TODO: this should be done with a service
-                    Map prefFields = UtilMisc.toMap("orderPaymentPreferenceId", delegator.getNextSeqId("OrderPaymentPreference").toString());
+                    Map prefFields = UtilMisc.toMap("orderPaymentPreferenceId", delegator.getNextSeqId("OrderPaymentPreference"));
                     GenericValue paymentPreference = delegator.makeValue("OrderPaymentPreference", prefFields);
                     paymentPreference.set("paymentMethodTypeId", paymentMethodType.getString("paymentMethodTypeId"));
                     paymentPreference.set("maxAmount", new Double(paymentTypeAmount));

Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Sat Dec  9 04:15:39 2006
@@ -523,7 +523,7 @@
                 toStore.add(returnHeader);
 
                 // create the status change history and set it to be stored
-                String returnStatusId = delegator.getNextSeqId("ReturnStatus").toString();
+                String returnStatusId = delegator.getNextSeqId("ReturnStatus");
                 GenericValue returnStatus = delegator.makeValue("ReturnStatus", UtilMisc.toMap("returnStatusId", returnStatusId));
                 returnStatus.set("statusId", "RETURN_COMPLETED");
                 returnStatus.set("returnId", returnId);
@@ -617,7 +617,7 @@
             // create a Payment record for this credit; will look just like a normal payment
             // However, since this payment is not a DISBURSEMENT or RECEIPT but really a matter of internal record
             // it is of type "Other (Non-posting)"
-            String paymentId = delegator.getNextSeqId("Payment").toString();
+            String paymentId = delegator.getNextSeqId("Payment");
             GenericValue payment = delegator.makeValue("Payment", UtilMisc.toMap("paymentId", paymentId));
             payment.set("paymentTypeId", "CUSTOMER_REFUND");
             payment.set("paymentMethodTypeId", "EXT_BILLACT");
@@ -665,7 +665,7 @@
                 toBeStored.add(item);
 
                 // create the status change history and set it to be stored
-                String returnStatusId = delegator.getNextSeqId("ReturnStatus").toString();
+                String returnStatusId = delegator.getNextSeqId("ReturnStatus");
                 GenericValue returnStatus = delegator.makeValue("ReturnStatus", UtilMisc.toMap("returnStatusId", returnStatusId));
                 returnStatus.set("statusId", item.get("statusId"));
                 returnStatus.set("returnId", item.get("returnId"));
@@ -683,7 +683,7 @@
             }
 
             // create the PaymentApplication for the billing account
-            String paId = delegator.getNextSeqId("PaymentApplication").toString();
+            String paId = delegator.getNextSeqId("PaymentApplication");
             GenericValue pa = delegator.makeValue("PaymentApplication", UtilMisc.toMap("paymentApplicationId", paId));
             pa.set("paymentId", paymentId);
             pa.set("billingAccountId", billingAccountId);

Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Sat Dec  9 04:15:39 2006
@@ -198,7 +198,7 @@
                 // only normalize items with a product associated (ignore non-product items)
                 if (normalizedItemQuantities.get(currentProductId) == null) {
                     normalizedItemQuantities.put(currentProductId, new Double(orderItem.getDouble("quantity").doubleValue()));
-                    normalizedItemNames.put(currentProductId, new String(orderItem.getString("itemDescription")));
+                    normalizedItemNames.put(currentProductId, orderItem.getString("itemDescription"));
                 } else {
                     Double currentQuantity = (Double) normalizedItemQuantities.get(currentProductId);
                     normalizedItemQuantities.put(currentProductId, new Double(currentQuantity.doubleValue() + orderItem.getDouble("quantity").doubleValue()));
@@ -599,7 +599,7 @@
                 if(techDataCalendar == null ) {
                     techDataCalendar = delegator.makeValue("TechDataCalendar", null);
                     Debug.logInfo("create techdata calendar because it does not exist",module);
-                    String calendarId = delegator.getNextSeqId("techDataCalendar").toString();
+                    String calendarId = delegator.getNextSeqId("techDataCalendar");
                     techDataCalendar.set("calendarId", calendarId);
                     toBeStored.add(techDataCalendar);
                     Debug.logInfo("update fixed Asset",module);
@@ -609,7 +609,7 @@
                 // then create the workEffort and the workOrderItemFulfillment to connect to the order and orderItem
                 workOrderItemFulfillment.set("orderItemSeqId", workEffort.get("workEffortId").toString()); // orderItemSeqNo is stored here so save first
                 // workeffort
-                String workEffortId = delegator.getNextSeqId("WorkEffort").toString(); // find next available workEffortId
+                String workEffortId = delegator.getNextSeqId("WorkEffort"); // find next available workEffortId
                 workEffort.set("workEffortId", workEffortId);
                 workEffort.set("workEffortTypeId", "ASSET_USAGE");
                 toBeStored.add(workEffort);  // store workeffort before workOrderItemFulfillment because of workEffortId key constraint
@@ -916,7 +916,7 @@
                 valueObj.set("orderId", orderId);
                 if ("OrderPaymentPreference".equals(valueObj.getEntityName())) {
                     if (valueObj.get("orderPaymentPreferenceId") == null) {
-                        valueObj.set("orderPaymentPreferenceId", delegator.getNextSeqId("OrderPaymentPreference").toString());
+                        valueObj.set("orderPaymentPreferenceId", delegator.getNextSeqId("OrderPaymentPreference"));
                         valueObj.set("createdDate", UtilDateTime.nowTimestamp());
                         valueObj.set("createdByUserLogin", userLogin.getString("userLoginId"));
                     }
@@ -1470,7 +1470,7 @@
                 if ((shippingTotal != null) && (shippingTotal.doubleValue() != currentShipping)) {
                     // place the difference as a new shipping adjustment
                     Double adjustmentAmount = new Double(shippingTotal.doubleValue() - currentShipping);
-                    String adjSeqId = delegator.getNextSeqId("OrderAdjustment").toString();
+                    String adjSeqId = delegator.getNextSeqId("OrderAdjustment");
                     GenericValue orderAdjustment = delegator.makeValue("OrderAdjustment", UtilMisc.toMap("orderAdjustmentId", adjSeqId));
                     orderAdjustment.set("orderAdjustmentTypeId", "SHIPPING_CHARGES");
                     orderAdjustment.set("amount", adjustmentAmount);
@@ -1789,7 +1789,7 @@
                 }
                 // now create a status change
                 Map changeFields = new HashMap();
-                changeFields.put("orderStatusId", delegator.getNextSeqId("OrderStatus").toString());
+                changeFields.put("orderStatusId", delegator.getNextSeqId("OrderStatus"));
                 changeFields.put("statusId", statusId);
                 changeFields.put("orderId", orderId);
                 changeFields.put("orderItemSeqId", orderItem.getString("orderItemSeqId"));

Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Sat Dec  9 04:15:39 2006
@@ -654,7 +654,7 @@
         Iterator eli = emailList.iterator();
         while (eli.hasNext()) {
             String email = (String) eli.next();
-            String contactMechId = this.delegator.getNextSeqId("ContactMech").toString();
+            String contactMechId = this.delegator.getNextSeqId("ContactMech");
             GenericValue contactMech = this.delegator.makeValue("ContactMech",
                     UtilMisc.toMap("contactMechId", contactMechId, "contactMechTypeId", "EMAIL_ADDRESS", "infoString", email));
 

Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Sat Dec  9 04:15:39 2006
@@ -435,7 +435,7 @@
             String isAvailable = checkAvailability(product.getString("productId"), quantity, reservStart, reservLength, cart);
             if(isAvailable.compareTo("OK") != 0) {
                 Map messageMap = UtilMisc.toMap("productId", product.getString("productId"),
-                                                "availableMessage", isAvailable.toString());
+                                                "availableMessage", isAvailable);
                 String excMsg = UtilProperties.getMessage(resource, "item.product_not_available",
                                               messageMap, cart.getLocale() );                
                 Debug.logInfo(excMsg, module);

Modified: incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java (original)
+++ incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java Sat Dec  9 04:15:39 2006
@@ -83,11 +83,11 @@
             return ServiceUtil.returnError(errMsg);
         }
 
-        GenericValue tempContactMech = delegator.makeValue("ContactMech", UtilMisc.toMap("contactMechId", newCmId.toString(), "contactMechTypeId", contactMechTypeId));
+        GenericValue tempContactMech = delegator.makeValue("ContactMech", UtilMisc.toMap("contactMechId", newCmId, "contactMechTypeId", contactMechTypeId));
         toBeStored.add(tempContactMech);
 
         if (!partyId.equals("_NA_")) {
-            toBeStored.add(delegator.makeValue("PartyContactMech", UtilMisc.toMap("partyId", partyId, "contactMechId", newCmId.toString(),
+            toBeStored.add(delegator.makeValue("PartyContactMech", UtilMisc.toMap("partyId", partyId, "contactMechId", newCmId,
                     "fromDate", now, "roleTypeId", context.get("roleTypeId"), "allowSolicitation", context.get("allowSolicitation"), "extension", context.get("extension"))));
         }
 
@@ -110,7 +110,7 @@
             return ServiceUtil.returnError(errMsg);
         }
 
-        result.put("contactMechId", newCmId.toString());
+        result.put("contactMechId", newCmId);
         result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
         return result;
     }
@@ -207,8 +207,8 @@
         if (isModified) {
             if (relatedEntityToSet != null) toBeStored.add(relatedEntityToSet);
 
-            newContactMech.set("contactMechId", newCmId.toString());
-            newPartyContactMech.set("contactMechId", newCmId.toString());
+            newContactMech.set("contactMechId", newCmId);
+            newPartyContactMech.set("contactMechId", newCmId);
             newPartyContactMech.set("fromDate", now);
             newPartyContactMech.set("thruDate", null);
 
@@ -218,7 +218,7 @@
                 while (partyContactMechPurposes != null && partyContactMechPurposes.hasNext()) {
                     GenericValue tempVal = GenericValue.create((GenericValue) partyContactMechPurposes.next());
 
-                    tempVal.set("contactMechId", newCmId.toString());
+                    tempVal.set("contactMechId", newCmId);
                     toBeStored.add(tempVal);
                 }
             } catch (GenericEntityException e) {
@@ -245,7 +245,7 @@
             return result;
         }
 
-        result.put("newContactMechId", newCmId.toString());
+        result.put("newContactMechId", newCmId);
         result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
         return result;
     }
@@ -339,20 +339,20 @@
             return ServiceUtil.returnError(errMsg);
         }
 
-        GenericValue tempContactMech = delegator.makeValue("ContactMech", UtilMisc.toMap("contactMechId", newCmId.toString(), "contactMechTypeId", contactMechTypeId));
+        GenericValue tempContactMech = delegator.makeValue("ContactMech", UtilMisc.toMap("contactMechId", newCmId, "contactMechTypeId", contactMechTypeId));
         toBeStored.add(tempContactMech);
 
         // don't create a PartyContactMech if there is no party; we define no party as sending _NA_ as partyId
         if (!partyId.equals("_NA_")) {
             toBeStored.add(delegator.makeValue("PartyContactMech",
-                    UtilMisc.toMap("partyId", partyId, "contactMechId", newCmId.toString(),
+                    UtilMisc.toMap("partyId", partyId, "contactMechId", newCmId,
                         "fromDate", now, "roleTypeId", context.get("roleTypeId"), "allowSolicitation",
                         context.get("allowSolicitation"), "extension", context.get("extension"))));
         }
 
         GenericValue newAddr = delegator.makeValue("PostalAddress", null);
 
-        newAddr.set("contactMechId", newCmId.toString());
+        newAddr.set("contactMechId", newCmId);
         newAddr.set("toName", context.get("toName"));
         newAddr.set("attnName", context.get("attnName"));
         newAddr.set("address1", context.get("address1"));
@@ -375,7 +375,7 @@
             return ServiceUtil.returnError(errMsg);
         }
 
-        result.put("contactMechId", newCmId.toString());
+        result.put("contactMechId", newCmId);
         result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
         return result;
     }
@@ -476,7 +476,7 @@
             if (addr == null || !relatedEntityToSet.equals(addr)) {
                 isModified = true;
             }
-            relatedEntityToSet.set("contactMechId", newCmId.toString());
+            relatedEntityToSet.set("contactMechId", newCmId);
         } else {
             Map messageMap = UtilMisc.toMap("contactMechTypeId", contactMech.getString("contactMechTypeId"));
             errMsg = UtilProperties.getMessage(resource,"contactmechservices.could_not_update_contact_as_POSTAL_ADDRESS_specified", messageMap, locale);
@@ -498,9 +498,9 @@
         if (isModified) {
             if (relatedEntityToSet != null) toBeStored.add(relatedEntityToSet);
 
-            newContactMech.set("contactMechId", newCmId.toString());
+            newContactMech.set("contactMechId", newCmId);
             if (newPartyContactMech != null) {
-                newPartyContactMech.set("contactMechId", newCmId.toString());
+                newPartyContactMech.set("contactMechId", newCmId);
                 newPartyContactMech.set("fromDate", now);
                 newPartyContactMech.set("thruDate", null);
 
@@ -510,7 +510,7 @@
                     while (partyContactMechPurposes != null && partyContactMechPurposes.hasNext()) {
                         GenericValue tempVal = GenericValue.create((GenericValue) partyContactMechPurposes.next());
 
-                        tempVal.set("contactMechId", newCmId.toString());
+                        tempVal.set("contactMechId", newCmId);
                         toBeStored.add(tempVal);
                     }
                 } catch (GenericEntityException e) {
@@ -539,7 +539,7 @@
             return result;
         }
 
-        result.put("newContactMechId", newCmId.toString());
+        result.put("newContactMechId", newCmId);
         result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
         return result;
     }
@@ -579,13 +579,13 @@
             return ServiceUtil.returnError(errMsg);
         }
 
-        GenericValue tempContactMech = delegator.makeValue("ContactMech", UtilMisc.toMap("contactMechId", newCmId.toString(), "contactMechTypeId", contactMechTypeId));
+        GenericValue tempContactMech = delegator.makeValue("ContactMech", UtilMisc.toMap("contactMechId", newCmId, "contactMechTypeId", contactMechTypeId));
         toBeStored.add(tempContactMech);
 
-        toBeStored.add(delegator.makeValue("PartyContactMech", UtilMisc.toMap("partyId", partyId, "contactMechId", newCmId.toString(),
+        toBeStored.add(delegator.makeValue("PartyContactMech", UtilMisc.toMap("partyId", partyId, "contactMechId", newCmId,
                     "fromDate", now, "roleTypeId", context.get("roleTypeId"), "allowSolicitation", context.get("allowSolicitation"), "extension", context.get("extension"))));
 
-        toBeStored.add(delegator.makeValue("TelecomNumber", UtilMisc.toMap("contactMechId", newCmId.toString(),
+        toBeStored.add(delegator.makeValue("TelecomNumber", UtilMisc.toMap("contactMechId", newCmId,
                     "countryCode", context.get("countryCode"), "areaCode", context.get("areaCode"), "contactNumber", context.get("contactNumber"))));
 
         try {
@@ -597,7 +597,7 @@
             return ServiceUtil.returnError(errMsg);
         }
 
-        result.put("contactMechId", newCmId.toString());
+        result.put("contactMechId", newCmId);
         result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
         return result;
     }
@@ -680,7 +680,7 @@
             if (telNum == null || !relatedEntityToSet.equals(telNum)) {
                 isModified = true;
             }
-            relatedEntityToSet.set("contactMechId", newCmId.toString());
+            relatedEntityToSet.set("contactMechId", newCmId);
             newPartyContactMech.set("extension", context.get("extension"));
         } else {
             Map messageMap = UtilMisc.toMap("contactMechTypeId", contactMech.getString("contactMechTypeId"));
@@ -700,8 +700,8 @@
         if (isModified) {
             if (relatedEntityToSet != null) toBeStored.add(relatedEntityToSet);
 
-            newContactMech.set("contactMechId", newCmId.toString());
-            newPartyContactMech.set("contactMechId", newCmId.toString());
+            newContactMech.set("contactMechId", newCmId);
+            newPartyContactMech.set("contactMechId", newCmId);
             newPartyContactMech.set("fromDate", now);
             newPartyContactMech.set("thruDate", null);
 
@@ -711,7 +711,7 @@
                 while (partyContactMechPurposes != null && partyContactMechPurposes.hasNext()) {
                     GenericValue tempVal = GenericValue.create((GenericValue) partyContactMechPurposes.next());
 
-                    tempVal.set("contactMechId", newCmId.toString());
+                    tempVal.set("contactMechId", newCmId);
                     toBeStored.add(tempVal);
                 }
             } catch (GenericEntityException e) {
@@ -738,7 +738,7 @@
             return result;
         }
 
-        result.put("newContactMechId", newCmId.toString());
+        result.put("newContactMechId", newCmId);
         result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
         return result;
     }

Modified: incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java (original)
+++ incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java Sat Dec  9 04:15:39 2006
@@ -822,7 +822,7 @@
                 productFeatureId = existingProductFeature.getString("productFeatureId");
             } else {
                 // doesn't exist, so create it
-                productFeatureId = delegator.getNextSeqId("ProductFeature").toString();
+                productFeatureId = delegator.getNextSeqId("ProductFeature");
                 GenericValue prodFeature = delegator.makeValue("ProductFeature", UtilMisc.toMap("productFeatureId", productFeatureId, "productFeatureTypeId", productFeatureTypeId));
                 if (uomId != null) {
                     prodFeature.set("uomId", uomId);
@@ -989,7 +989,7 @@
                 productFeatureId = existingProductFeature.getString("productFeatureId");
             } else {
                 // doesn't exist, so create it
-                productFeatureId = delegator.getNextSeqId("ProductFeature").toString();
+                productFeatureId = delegator.getNextSeqId("ProductFeature");
                 GenericValue newProductFeature = delegator.makeValue("ProductFeature",
                         UtilMisc.toMap("productFeatureId", productFeatureId,
                                 "productFeatureTypeId", productFeatureTypeId,

Modified: incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
+++ incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Sat Dec  9 04:15:39 2006
@@ -295,7 +295,7 @@
 
         for (int i = 0; i < count; i++ ) {
             GenericValue v = delegator.makeValue("Visit", null);
-            String seqId = delegator.getNextSeqId("Visit").toString();
+            String seqId = delegator.getNextSeqId("Visit");
 
             v.set("visitId", seqId);
             v.set("userCreated", "N");

Modified: incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Sat Dec  9 04:15:39 2006
@@ -88,7 +88,7 @@
         } else {
             relatedRoleGetter = new StdRelatedRoleGetter(relatedRoleElement);  
         }
-        String targetOperationString = new String(element.getAttribute("target-operation"));
+        String targetOperationString = element.getAttribute("target-operation");
         if (UtilValidate.isNotEmpty(targetOperationString)) {
             List operationsFromString = StringUtil.split(targetOperationString, "|");
             if (targetOperationList == null) {

Modified: incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java (original)
+++ incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java Sat Dec  9 04:15:39 2006
@@ -293,7 +293,7 @@
         try {
             RecurrenceRule r = RecurrenceRule.makeRule(delegator, frequency, interval, count, endTime);
             String ruleId = r.primaryKey();
-            String infoId = delegator.getNextSeqId("RecurrenceInfo").toString();
+            String infoId = delegator.getNextSeqId("RecurrenceInfo");
             GenericValue value = delegator.makeValue("RecurrenceInfo", UtilMisc.toMap("recurrenceInfoId", infoId));
 
             value.set("recurrenceRuleId", ruleId);

Modified: incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java (original)
+++ incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java Sat Dec  9 04:15:39 2006
@@ -650,7 +650,7 @@
         String freqStr = freq[frequency];
 
         try {
-            String ruleId = delegator.getNextSeqId("RecurrenceRule").toString();
+            String ruleId = delegator.getNextSeqId("RecurrenceRule");
             GenericValue value = delegator.makeValue("RecurrenceRule", UtilMisc.toMap("recurrenceRuleId", ruleId));
 
             value.set("frequency", freqStr);

Modified: incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java (original)
+++ incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java Sat Dec  9 04:15:39 2006
@@ -95,8 +95,8 @@
                 toBeStored.add(runtimeData);
 
                 // Create the job info
-                String jobId = dispatcher.getDelegator().getNextSeqId("JobSandbox").toString();
-                String jobName = new String(new Long((new Date().getTime())).toString());
+                String jobId = dispatcher.getDelegator().getNextSeqId("JobSandbox");
+                String jobName = new Long((new Date().getTime())).toString();
 
 
                 Map jFields = UtilMisc.toMap("jobId", jobId, "jobName", jobName, "runTime", UtilDateTime.nowTimestamp());

Modified: incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java (original)
+++ incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java Sat Dec  9 04:15:39 2006
@@ -220,7 +220,7 @@
                         // only re-schedule if there is no new recurrences since last run
                         Debug.log("Scheduling Job : " + job, module);
 
-                        String newJobId = job.getDelegator().getNextSeqId("JobSandbox").toString();
+                        String newJobId = job.getDelegator().getNextSeqId("JobSandbox");
                         String pJobId = job.getString("parentJobId");
                         if (pJobId == null) {
                             pJobId = job.getString("jobId");
@@ -334,7 +334,7 @@
         // persist the context
         String dataId = null;
         try {
-            dataId = delegator.getNextSeqId("RuntimeData").toString();
+            dataId = delegator.getNextSeqId("RuntimeData");
             GenericValue runtimeData = delegator.makeValue("RuntimeData", UtilMisc.toMap("runtimeDataId", dataId));
 
             runtimeData.set("runtimeInfo", XmlSerializer.serialize(context));
@@ -394,9 +394,9 @@
 
         // set the persisted fields
         if (UtilValidate.isEmpty(jobName)) {
-            jobName = new String(new Long((new Date().getTime())).toString());
+            jobName = new Long((new Date().getTime())).toString();
         }
-        String jobId = delegator.getNextSeqId("JobSandbox").toString();
+        String jobId = delegator.getNextSeqId("JobSandbox");
         Map jFields = UtilMisc.toMap("jobId", jobId, "jobName", jobName, "runTime", new java.sql.Timestamp(startTime),
                 "serviceName", serviceName, "recurrenceInfoId", infoId, "runtimeDataId", dataId);
 

Modified: incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Sat Dec  9 04:15:39 2006
@@ -127,7 +127,7 @@
                 String newUrl = RequestHandler.makeUrl(request, response, urlBuf.toString());
                 if (newUrl.toUpperCase().startsWith("HTTPS")) {
                     // if we are supposed to be secure, redirect secure.
-                    callRedirect(newUrl.toString(), response, request);
+                    callRedirect(newUrl, response, request);
                 }
             }
 

Modified: incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java (original)
+++ incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java Sat Dec  9 04:15:39 2006
@@ -175,10 +175,10 @@
     private static String insertAppSandbox(GenericDelegator delegator, String workEffortId, String partyId,
             String roleTypeId, Timestamp fromDate, Map context) throws GenericServiceException {
         String dataId = null;
-        String applicationId = new String(new Long((new Date().getTime())).toString());
+        String applicationId = new Long((new Date().getTime())).toString();
         
         try {
-            dataId = delegator.getNextSeqId("RuntimeData").toString();
+            dataId = delegator.getNextSeqId("RuntimeData");
             GenericValue runtimeData = delegator.makeValue("RuntimeData", UtilMisc.toMap("runtimeDataId", dataId));
             runtimeData.set("runtimeInfo", XmlSerializer.serialize(context));
             delegator.create(runtimeData);

Modified: incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java?view=diff&rev=484974&r1=484973&r2=484974
==============================================================================
--- incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java (original)
+++ incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java Sat Dec  9 04:15:39 2006
@@ -107,7 +107,7 @@
         GenericValue valueObject = getDefinitionObject();
         GenericValue dataObject = null;
 
-        workEffortId = getDelegator().getNextSeqId("WorkEffort").toString();
+        workEffortId = getDelegator().getNextSeqId("WorkEffort");
         Map dataMap = new HashMap();
         String weType = activityId != null ? "ACTIVITY" : "WORK_FLOW";
 
@@ -558,7 +558,7 @@
 
         try {
             if (dataObject.get("runtimeDataId") == null) {
-                String seqId = getDelegator().getNextSeqId("RuntimeData").toString();
+                String seqId = getDelegator().getNextSeqId("RuntimeData");
 
                 runtimeData = getDelegator().makeValue("RuntimeData",
                             UtilMisc.toMap("runtimeDataId", seqId));