svn commit: r899812 [4/8] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/finaccount/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/or...

[doogie-3]

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Fri Jan 15 21:00:23 2010
@@ -266,7 +266,7 @@
      * 14 - First Class Mail International Flats
      * 15 - First Class Mail International Parcels
      * 16 - Priority Mail Small Flat Rate Box
-     * 21 - PostCards
+     * 21 - PostCards
      */
     public static Map<String, Object> uspsInternationalRateInquire(DispatchContext dctx, Map<String, ? extends Object> context) {
 
@@ -355,7 +355,7 @@
 
             UtilXml.addChildElementValue(packageElement, "Machinable", "False", requestDocument);
             UtilXml.addChildElementValue(packageElement, "MailType", "Package", requestDocument);
-            
+
             // TODO: Add package value so that an insurance fee can be returned
 
             UtilXml.addChildElementValue(packageElement, "Country", destinationCountry, requestDocument);
@@ -1501,7 +1501,7 @@
             certify = true;
         }
         Element rootElement = requestDocument.getDocumentElement();
-        
+
         // Retrieve from/to address and package details
         GenericValue originAddress = null;
         GenericValue originTelecomNumber = null;
@@ -1562,7 +1562,7 @@
         String toPhoneNumber = destinationTelecomNumber.getString("countryCode") + destinationTelecomNumber.getString("areaCode") + destinationTelecomNumber.getString("contactNumber");
         UtilXml.addChildElementValue(rootElement, "ToPhone", toPhoneNumber, requestDocument);
         UtilXml.addChildElementValue(rootElement, "NonDeliveryOption", "RETURN", requestDocument);
-        
+
         for (GenericValue shipmentPackageRouteSeg : shipmentPackageRouteSegs) {
             Document packageDocument = (Document) requestDocument.cloneNode(true);
             Element packageRootElement = requestDocument.getDocumentElement();
@@ -1570,7 +1570,7 @@
             String fromCustomsReference = shipmentRouteSegment.getString("shipmentId") + ":" + shipmentRouteSegment.getString("shipmentRouteSegmentId");
             fromCustomsReference = StringUtils.join(
                     UtilMisc.toList(
-                            shipmentRouteSegment.get("shipmentId"),
+                            shipmentRouteSegment.get("shipmentId"),
                             shipmentPackageRouteSeg.get("shipmentPackageSeqId"),
                             shipmentRouteSegment.get("shipmentRouteSegementId")
                    ), ':');
@@ -1611,7 +1611,7 @@
             */
             // According to the docs sending an empty postage tag will cause the postage to be calculated
             UtilXml.addChildElementValue(rootElement, "Postage", "", packageDocument);
-            
+
             BigDecimal packageWeight = shipmentPackage.getBigDecimal("weight");
             String weightUomId = shipmentPackage.getString("weightUomId");
             BigDecimal packageWeightPounds = UomWorker.convertUom(packageWeight, weightUomId, "WT_lb", dispatcher);
@@ -1625,7 +1625,7 @@
             // TODO: Try the different layouts
             UtilXml.addChildElementValue(rootElement, "ImageType", "ALLINONEFILE", packageDocument);
             UtilXml.addChildElementValue(rootElement, "CustomerRefNo", fromCustomsReference, packageDocument);
-            
+
             // Add the shipping contents
             Element shippingContents = UtilXml.addChildElement(rootElement, "ShippingContents", packageDocument);
             for (GenericValue shipmentPackageContent : shipmentPackageContents) {
@@ -1651,7 +1651,7 @@
                 UtilXml.addChildElementValue(itemDetail, "HSTariffNumber", "", packageDocument);
                 UtilXml.addChildElementValue(itemDetail, "CountryOfOrigin", originGeo.getString("geoName"), packageDocument);
             }
-            
+
             // Send the request
             Document responseDocument = null;
             String api = certify ? "PriorityMailIntlCertify" : "PriorityMailIntl";
@@ -1683,7 +1683,7 @@
             } catch (GenericEntityException e) {
                 Debug.logError(e, module);
             }
-            
+
         }
         return ServiceUtil.returnSuccess();
     }
@@ -1775,7 +1775,7 @@
     }
 
     /*
-     * Converts decimal pounds to pounds and ounces as an Integer array, ounces are rounded up to the nearest whole number
+     * Converts decimal pounds to pounds and ounces as an Integer array, ounces are rounded up to the nearest whole number
      */
     public static Integer[] convertPoundsToPoundsOunces(BigDecimal decimalPounds) {
         if (decimalPounds == null) return null;

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java Fri Jan 15 21:00:23 2010
@@ -273,9 +273,9 @@
 
     public VerifyPickSessionRow getPickRow(String orderId, String orderItemSeqId, String shipGroupSeqId, String productId, String inventoryItemId) {
         for (VerifyPickSessionRow line : this.getPickRows(orderId)) {
-            if (orderItemSeqId.equals(line.getOrderItemSeqId()) && shipGroupSeqId.equals(line.getShipGroupSeqId())
+            if (orderItemSeqId.equals(line.getOrderItemSeqId()) && shipGroupSeqId.equals(line.getShipGroupSeqId())
                     && productId.equals(line.getProductId()) && inventoryItemId.equals(line.getInventoryItemId())) {
-                return line;
+                return line;
             }
         }
         return null;
@@ -398,7 +398,7 @@
         if (UtilValidate.isNotEmpty(orderRoleShipTo)) {
             newShipment.put("partyIdTo", orderRoleShipTo.getString("partyId"));
         }
-        String partyIdFrom = null;
+        String partyIdFrom = null;
         GenericValue orderItemShipGroup = EntityUtil.getFirst(delegator.findByAnd("OrderItemShipGroup", UtilMisc.toMap("orderId", orderId, "shipGroupSeqId", line.getShipGroupSeqId())));
         if (UtilValidate.isNotEmpty(orderItemShipGroup.getString("vendorPartyId"))) {
             partyIdFrom = orderItemShipGroup.getString("vendorPartyId");

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java Fri Jan 15 21:00:23 2010
@@ -192,7 +192,7 @@
     public String getDimensionUomId() {
         return dimensionUomId;
     }
-    
+
     public void setCarrierPartyId(String carrierPartyId) {
         this.carrierPartyId = carrierPartyId;
     }
@@ -303,7 +303,7 @@
         this.createPackages(orderId);
         // calculate the actual shipping charges according to package(s) weight and dimensions
         BigDecimal actualShippingCost = ZERO;
-        // Check if UPS integration is done
+        // Check if UPS integration is done
         if ("UPS".equals(this.carrierPartyId) && "Y".equals(calculateOnlineShippingRateFromUps)) {
             // call upsShipmentConfirm service, it will calculate the online shipping rate from UPS and save in ShipmentRouteSegment entity in actualCost field
             actualShippingCost = this.upsShipmentConfirm();
@@ -331,7 +331,7 @@
     }
 
     public boolean completeShipment(String orderId, String calculateOnlineShippingRateFromUps) throws GeneralException {
-        // Check if UPS integration is done
+        // Check if UPS integration is done
         if ("UPS".equals(this.carrierPartyId) && "Y".equals(calculateOnlineShippingRateFromUps)) {
             // call upsShipmentAccept service, it will made record(s) in ShipmentPackageRouteSeg entity
             this.upsShipmentAccept();
@@ -528,7 +528,7 @@
     protected void savePackagesInfo(String orderId, String calculateOnlineShippingRateFromUps) throws GeneralException {
         //create the package(s)
         this.createPackages(orderId);
-        // Check if UPS integration is done
+        // Check if UPS integration is done
         if ("UPS".equals(this.carrierPartyId) && "Y".equals(calculateOnlineShippingRateFromUps)) {
             // call upsShipmentConfirm service, it will calculate the online shipping rate from UPS and save in ShipmentRouteSegment entity in actualCost field
             this.upsShipmentConfirm();

Modified: ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java (original)
+++ ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java Fri Jan 15 21:00:23 2010
@@ -35,8 +35,8 @@
     private static final String module = ServiceDaHandler.class.getName();
     protected LocalDispatcher dispatcher;
     protected Delegator delegator;
-    
-    public String getPattern() {        
+
+    public String getPattern() {
         return "^service:(.*)$";
     }
 
@@ -46,7 +46,7 @@
         serviceContext.put("permission", permission);
         serviceContext.put("accessString", accessString);
         serviceContext.put("permissionContext", context);
-        
+
         String serviceName = accessString.substring(8);
         Map<String, Object> result;
         try {
@@ -55,7 +55,7 @@
             Debug.logError(e, module);
             return false;
         }
-        
+
         if (result != null && !ServiceUtil.isError(result)) {
             Boolean reply = (Boolean) result.get("permissionGranted");
             if (reply == null) {

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java Fri Jan 15 21:00:23 2010
@@ -100,7 +100,7 @@
 import org.ofbiz.workeffort.workeffort.ICalWorker.ResponseProperties;
 
 /** iCalendar converter class. This class uses the <a href="http://ical4j.sourceforge.net/index.html">
- * iCal4J</a> library.
+ * iCal4J</a> library.
  */
 public class ICalConverter {
 
@@ -111,7 +111,7 @@
     protected static final String uidPrefix = "ORG-APACHE-OFBIZ-WE-";
     protected static final String workEffortIdXPropName = "X-ORG-APACHE-OFBIZ-WORKEFFORT-ID";
     protected static final String reminderXPropName = "X-ORG-APACHE-OFBIZ-REMINDER-ID";
-    protected static final Map<String, String> fromStatusMap = UtilMisc.toMap("TENTATIVE", "CAL_TENTATIVE",
+    protected static final Map<String, String> fromStatusMap = UtilMisc.toMap("TENTATIVE", "CAL_TENTATIVE",
             "CONFIRMED", "CAL_CONFIRMED", "CANCELLED", "CAL_CANCELLED", "NEEDS-ACTION", "CAL_NEEDS_ACTION",
             "COMPLETED", "CAL_COMPLETED", "IN-PROCESS", "CAL_ACCEPTED");
     protected static final Map<String, Status> toStatusMap = UtilMisc.toMap("CAL_TENTATIVE", Status.VEVENT_TENTATIVE,
@@ -122,7 +122,7 @@
             "PRTYASGN_OFFERED", PartStat.TENTATIVE, "PRTYASGN_ASSIGNED", PartStat.ACCEPTED);
     protected static final Map<String, String> fromPartStatusMap = UtilMisc.toMap(
             "TENTATIVE", "PRTYASGN_OFFERED", "ACCEPTED", "PRTYASGN_ASSIGNED");
-    protected static final Map<String, String> fromRoleMap = UtilMisc.toMap("ATTENDEE", "CAL_ATTENDEE",
+    protected static final Map<String, String> fromRoleMap = UtilMisc.toMap("ATTENDEE", "CAL_ATTENDEE",
             "CONTACT", "CONTACT", "ORGANIZER", "CAL_ORGANIZER");
 
     protected static VAlarm createAlarm(GenericValue workEffortEventReminder) {
@@ -278,7 +278,7 @@
         }
         return fromStatusMap.get(iCalObj.getValue());
     }
-    
+
     protected static String fromSummary(PropertyList propertyList) {
         Summary iCalObj = (Summary) propertyList.getProperty(Summary.SUMMARY);
         if (iCalObj == null) {
@@ -378,7 +378,7 @@
         }
     }
 
-    /** Returns a calendar derived from a Work Effort calendar publish point.
+    /** Returns a calendar derived from a Work Effort calendar publish point.
      * @param workEffortId ID of a work effort with <code>workEffortTypeId</code> equal to
      * <code>PUBLISH_PROPS</code>.
      * @param context The conversion context

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java Fri Jan 15 21:00:23 2010
@@ -38,9 +38,9 @@
  */
 @SuppressWarnings("serial")
 public class ICalHandlerFactory implements RequestHandlerFactory {
-    
+
     public static final String module = ICalHandlerFactory.class.getName();
-    
+
     protected final Map<String, RequestHandler> handlerMap;
     protected final RequestHandler invalidMethodHandler = new InvalidMethodHandler();
     protected final RequestHandler doNothingHandler = new DoNothingHandler();

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java Fri Jan 15 21:00:23 2010
@@ -89,7 +89,7 @@
      * response when a user is logged in, but they don't have the basic CRUD
      * permissions to perform an action. Returning a Forbidden status will
      * prevent the client from trying the operation again.
-     *
+     *
      * @param statusMessage Optional status message - usually <code>null</code>
      * for security reasons
      * @return
@@ -102,7 +102,7 @@
      * response when a user is not logged in, and basic CRUD permissions are
      * needed to perform an action. Returning an Unauthorized status will
      * force the client to authenticate the user, then try the operation again.
-     *
+     *
      * @param statusMessage Optional status message - usually <code>null</code>
      * for security reasons
      * @return
@@ -121,7 +121,7 @@
 
     /** Create an HTTP Partial Content response. The calendar converter will use this
      * response when a calendar is only partially updated.
-     *
+     *
      * @param statusMessage A message describing which calendar components were
      * not updated
      * @return

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Fri Jan 15 21:00:23 2010
@@ -361,7 +361,7 @@
                     EntityCondition.makeCondition("scopeEnumId", EntityOperator.EQUALS, "WES_PUBLIC"),
                     EntityCondition.makeCondition("parentTypeId", EntityOperator.EQUALS, "EVENT")
                     );
-            
+
             if (cancelledCheckAndList != null) {
                 publicEvents.addAll(cancelledCheckAndList);
             }
@@ -436,9 +436,9 @@
      * </ul>
      * </ul>
      */
-  
+
     public static Map<String, Object> getWorkEffortEventsByPeriod(DispatchContext ctx, Map<String, ? extends Object> context) {
-        
+
         /*
          To create testdata for  this function for  fixedasset/facility
 
@@ -447,10 +447,10 @@
         2) enter as productId "PROD_MANUF", quantity 1, start date tomorrow and press the submit button
     `    3) in the next screen, click on the "Confirm" link (top part of the sccreen)
 
-        Now you have a confirmed production run (starting tomorrow) happening in facility "WebStoreWarehouse",
+        Now you have a confirmed production run (starting tomorrow) happening in facility "WebStoreWarehouse",
         with a task happening in fixed asset "WORKCENTER_COST"
 
-        In the calendars screen, selecting the proper facility you should see the work effort associated to the production run;
+        In the calendars screen, selecting the proper facility you should see the work effort associated to the production run;
         if you select the proper fixed asset you should see the task.
 
          */
@@ -517,7 +517,7 @@
         List<EntityCondition> cancelledCheckAndList = UtilMisc.<EntityCondition>toList(
                 EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "EVENT_CANCELLED"),
                 EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_CANCELLED"));
-        
+
 
         List<EntityCondition> entityExprList = UtilGenerics.checkList(context.get("entityExprList"));
         if (entityExprList == null) {
@@ -526,13 +526,13 @@
 
         // should have at least a start date
         EntityCondition startDateRequired = EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList(
-                EntityCondition.makeCondition("estimatedStartDate", EntityOperator.NOT_EQUAL, null),                                
-                EntityCondition.makeCondition("actualStartDate", EntityOperator.NOT_EQUAL, null)                                
+                EntityCondition.makeCondition("estimatedStartDate", EntityOperator.NOT_EQUAL, null),
+                EntityCondition.makeCondition("actualStartDate", EntityOperator.NOT_EQUAL, null)
         ), EntityJoinOperator.OR);
-        
+
         List<EntityCondition> periodCheckAndlList = UtilMisc.<EntityCondition>toList(
                 startDateRequired,
-                // the startdate should be less than the period end
+                // the startdate should be less than the period end
                 EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList(
                         EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList(
                                 EntityCondition.makeCondition("actualStartDate", EntityOperator.EQUALS, null),
@@ -544,7 +544,7 @@
                                 EntityCondition.makeCondition("actualStartDate", EntityOperator.LESS_THAN_EQUAL_TO, endStamp)
                         ), EntityJoinOperator.AND)
                 ), EntityJoinOperator.OR),
-                // if the completion date is not null then it should be larger than the period start
+                // if the completion date is not null then it should be larger than the period start
                 EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList(
                         // can also be empty
                         EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList(
@@ -563,7 +563,7 @@
                                 EntityCondition.makeCondition("actualCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, startStamp)
                         ), EntityJoinOperator.AND)
                 ), EntityJoinOperator.OR));
-        
+
         entityExprList.addAll(periodCheckAndlList);
 
         // (non cancelled) recurring events
@@ -576,7 +576,7 @@
                 EntityCondition.makeCondition(entityExprList, EntityJoinOperator.AND),
                 EntityCondition.makeCondition(recurringEvents, EntityJoinOperator.AND)
                 ), EntityJoinOperator.OR);
-        
+
         List<String> orderByList = UtilMisc.toList("estimatedStartDate");
         if (partyIdsToUse.size() > 0 || UtilValidate.isNotEmpty(facilityId) || UtilValidate.isNotEmpty(fixedAssetId)) {
             try {
@@ -585,7 +585,7 @@
                     // Debug.log("=====conditions for party: " + eclTotal);
                     tempWorkEfforts = EntityUtil.filterByDate(delegator.findList("WorkEffortAndPartyAssignAndType", eclTotal, null, orderByList, null, false));
                 } else if (UtilValidate.isNotEmpty(fixedAssetId)) {
-                    EntityConditionList<EntityCondition> ecl =
+                    EntityConditionList<EntityCondition> ecl =
                         EntityCondition.makeCondition(UtilMisc.toList(
                             eclTotal,
                             EntityCondition.makeCondition("fixedAssetId", EntityOperator.EQUALS, fixedAssetId)
@@ -595,7 +595,7 @@
                     tempWorkEfforts = delegator.findList("WorkEffort", ecl, null, orderByList, null, false);
                     tempWorkEfforts.addAll(EntityUtil.filterByDate(delegator.findList("WorkEffortAndFixedAssetAssign", ecl, null, orderByList, null, false)));
                 } else {
-                    EntityConditionList<EntityCondition> ecl =
+                    EntityConditionList<EntityCondition> ecl =
                         EntityCondition.makeCondition(UtilMisc.toList(
                             eclTotal,
                             EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId)

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java Fri Jan 15 21:00:23 2010
@@ -167,17 +167,17 @@
     }
 
     public static List<GenericValue> getLowestLevelWorkEfforts(Delegator delegator, String workEffortId, String workEffortAssocTypeId) {
-     return getLowestLevelWorkEfforts(delegator, workEffortId, workEffortAssocTypeId, "workEffortIdFrom", "workEffortIdTo");
+        return getLowestLevelWorkEfforts(delegator, workEffortId, workEffortAssocTypeId, "workEffortIdFrom", "workEffortIdTo");
     }
-    
+
     public static List<GenericValue> getLowestLevelWorkEfforts(Delegator delegator, String workEffortId, String workEffortAssocTypeId, String left, String right) {
-     if (left == null) {
-     left = "workEffortIdFrom";
-     }
-     if (right == null) {
-     right = "workEffortIdTo";
-     }
-    
+        if (left == null) {
+            left = "workEffortIdFrom";
+        }
+        if (right == null) {
+            right = "workEffortIdTo";
+        }
+
         List<GenericValue> workEfforts = FastList.newInstance();
         try {
             EntityConditionList exprsLevelFirst = EntityCondition.makeCondition(UtilMisc.toList(

Modified: ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java (original)
+++ ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java Fri Jan 15 21:00:23 2010
@@ -486,11 +486,11 @@
             try {
                 if (writer != null) {
                     writer.flush();
-                    writer.close();                    
+                    writer.close();
                 }
             } catch (IOException e) {
                 throw new ContainerException(e);
-            }            
+            }
         }
 
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java Fri Jan 15 21:00:23 2010
@@ -20,7 +20,7 @@
 
 /** Converter loader interface. Applications implement this
  * interface to load their Java object converters.
- *
+ *
  */
 public interface ConverterLoader {
     /** Create and register converters with the Java object type

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java Fri Jan 15 21:00:23 2010
@@ -42,7 +42,7 @@
     /** Null converter used when the source and target java object
      * types are the same. The <code>convert</code> method returns the
      * source object.
-     *
+     *
      */
     public static final Converter<Object, Object> nullConverter = new NullConverter();
 
@@ -150,7 +150,7 @@
     /** Null converter used when the source and target java object
      * types are the same. The <code>convert</code> method returns the
      * source object.
-     *
+     *
      */
     protected static class NullConverter implements Converter<Object, Object> {
         public NullConverter() {

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java Fri Jan 15 21:00:23 2010
@@ -756,19 +756,19 @@
     @SuppressWarnings("unchecked")
     public static boolean isEmpty(Object value) {
         if (value == null) return true;
-        
+
         if (value instanceof String) return UtilValidate.isEmpty((String) value);
         if (value instanceof Collection) return UtilValidate.isEmpty((Collection<? extends Object>) value);
         if (value instanceof Map) return UtilValidate.isEmpty((Map<? extends Object, ? extends Object>) value);
         if (value instanceof CharSequence) return UtilValidate.isEmpty((CharSequence) value);
-        
+
         // These types would flood the log
         // Number covers: BigDecimal, BigInteger, Byte, Double, Float, Integer, Long, Short
-        if (value instanceof Boolean) return false;        
-        if (value instanceof Number) return false;        
-        if (value instanceof Character) return false;        
-        if (value instanceof java.sql.Timestamp) return false;        
-        
+        if (value instanceof Boolean) return false;
+        if (value instanceof Number) return false;
+        if (value instanceof Character) return false;
+        if (value instanceof java.sql.Timestamp) return false;
+
         if (Debug.verboseOn()) {
             Debug.logVerbose("In ObjectType.isEmpty(Object value) returning false for " + value.getClass() + " Object.", module);
         }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java Fri Jan 15 21:00:23 2010
@@ -39,7 +39,7 @@
         }
     }
 
-    // ------------------- price format handlers -------------------    
+    // ------------------- price format handlers -------------------
     static DecimalFormat priceDecimalFormat = new DecimalFormat(UtilProperties.getPropertyValue("general.properties", "currency.decimal.format", "#,##0.00"));
 
     /** Formats a Double representing a price into a string

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java Fri Jan 15 21:00:23 2010
@@ -65,34 +65,34 @@
      */
     public static String renderTemplate(String template, String data)
     throws TransformerException {
- String result = null;
-     TransformerFactory tfactory = TransformerFactory.newInstance();
-     if (tfactory.getFeature(SAXSource.FEATURE)) {
-     // setup for xml data file preprocessing to be able to xinclude
-     SAXParserFactory pfactory= SAXParserFactory.newInstance();
-     pfactory.setNamespaceAware(true);
-     pfactory.setValidating(false);
-     pfactory.setXIncludeAware(true);
-     XMLReader reader = null;
-     try {
-     reader = pfactory.newSAXParser().getXMLReader();
+        String result = null;
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        if (tfactory.getFeature(SAXSource.FEATURE)) {
+            // setup for xml data file preprocessing to be able to xinclude
+            SAXParserFactory pfactory= SAXParserFactory.newInstance();
+            pfactory.setNamespaceAware(true);
+            pfactory.setValidating(false);
+            pfactory.setXIncludeAware(true);
+            XMLReader reader = null;
+            try {
+                reader = pfactory.newSAXParser().getXMLReader();
             } catch (Exception e) {
                 throw new TransformerException("Error creating SAX parser/reader", e);
             }
             // do the actual preprocessing
-     SAXSource source = new SAXSource(reader, new InputSource(data));
-     // compile the xsl template
-     Transformer transformer = tfactory.newTransformer(new StreamSource(template));
-     // and apply the xsl template to the source document and save in a result string
-   StringWriter sw = new StringWriter();
-   StreamResult sr = new StreamResult(sw);
-   transformer.transform(source, sr);
-   result = sw.toString();
-     } else {
-     Debug.logError("tfactory does not support SAX features!", module);
-     }
-     return result;
-   }
+            SAXSource source = new SAXSource(reader, new InputSource(data));
+            // compile the xsl template
+            Transformer transformer = tfactory.newTransformer(new StreamSource(template));
+            // and apply the xsl template to the source document and save in a result string
+            StringWriter sw = new StringWriter();
+            StreamResult sr = new StreamResult(sw);
+            transformer.transform(source, sr);
+            result = sw.toString();
+        } else {
+            Debug.logError("tfactory does not support SAX features!", module);
+        }
+        return result;
+    }
 
     /*
      *  it does not look like the rest of this file is working or used..........better set it to depreciated

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java Fri Jan 15 21:00:23 2010
@@ -42,17 +42,17 @@
 import org.ofbiz.entity.jdbc.ConnectionFactory;
 
 public class BirtWorker {
-    
+
     public final static String module = BirtWorker.class.getName();
-    
+
     public final static String BIRT_PARAMETERS = "birtParameters";
     public final static String REPORT_ENGINE = "reportEngine";
     public final static String BIRT_LOCALE = "birtLocale";
     public final static String BIRT_IMAGE_DIRECTORY = "birtImageDirectory";
     public final static String BIRT_CONTENT_TYPE = "birtContentType";
-    
+
     private static HTMLServerImageHandler imageHandler = new HTMLServerImageHandler();
-    
+
     /**
      * export report
      * @param design
@@ -65,7 +65,7 @@
      */
     public static void exportReport(IReportRunnable design, Map<String, ? extends Object> context, String contentType, OutputStream output)
         throws EngineException, GeneralException, SQLException {
-    
+
         Locale birtLocale = (Locale)context.get(BIRT_LOCALE);
         String birtImageDirectory = (String)context.get(BIRT_IMAGE_DIRECTORY);
 
@@ -77,7 +77,7 @@
         }
         Debug.logInfo("Get report engine", module);
         IReportEngine engine = BirtContainer.getReportEngine();
-    
+
         /*
         --- DISABLE JDBC FEATURE
         // set the jdbc connection
@@ -85,23 +85,23 @@
         Delegator delegator = BirtContainer.getDelegator();
         Debug.logInfo("Get the JDBC connection from group helper's name:" + delegatorGroupHelperName, module);
         String helperName = delegator.getGroupHelperName(delegatorGroupHelperName);    // gets the helper (localderby, localmysql, localpostgres, etc.) for your entity group org.ofbiz
-        Connection connection = ConnectionFactory.getConnection(helperName);
+        Connection connection = ConnectionFactory.getConnection(helperName);
         engine.getConfig().getAppContext().put("OdaJDBCDriverPassInConnection", connection);
         */
-        
+
         IRunAndRenderTask task = engine.createRunAndRenderTask(design);
         if (birtLocale != null) {
             Debug.logInfo("Set birt locale:" + birtLocale, module);
             task.setLocale(birtLocale);
         }
-        
+
         // set parameters if exists
         Map<String, Object> parameters = UtilGenerics.cast(context.get(BirtWorker.BIRT_PARAMETERS));
         if (parameters != null) {
             Debug.logInfo("Set birt parameters:" + parameters, module);
             task.setParameterValues(parameters);
         }
-        
+
         // set output options
         RenderOption options = new RenderOption();
         if ("text/html".equalsIgnoreCase(contentType)) {
@@ -117,7 +117,7 @@
         } else {
             throw new GeneralException("Unknown content type : " + contentType);
         }
-        
+
         if (options.getOutputFormat().equalsIgnoreCase(RenderOption.OUTPUT_FORMAT_HTML)) {
             // set html render options
             HTMLRenderOption htmlOptions = new HTMLRenderOption(options);
@@ -131,10 +131,10 @@
         } else if (options.getOutputFormat().equalsIgnoreCase("xls")) {
             // set excel render options
             EXCELRenderOption excelOptions = new EXCELRenderOption(options);
-        }
+        }
         options.setOutputStream(output);
         task.setRenderOption(options);
-        
+
         // run report
         Debug.logInfo("Birt's locale is: " + task.getLocale(), module);
         Debug.logInfo("Run report's task", module);

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java Fri Jan 15 21:00:23 2010
@@ -48,14 +48,14 @@
 import org.ofbiz.service.LocalDispatcher;
 
 public class BirtContainer implements Container {
-    
+
     public static final String module = BirtContainer.class.getName();
-    
+
     public final static String CONFIG_FILE = "birt.properties";
-    
+
     protected EngineConfig config;
     protected String configFile;
-    
+
     private static IReportEngine engine;
     private static String delegatorGroupHelperName;
     private static String delegatorName;
@@ -74,9 +74,9 @@
      */
     public boolean start() throws ContainerException {
         // TODO Auto-generated method stub
-        
+
         Debug.logInfo("Start birt container", module);
-        
+
         // make sure the subclass sets the config name
         if (this.getContainerConfigName() == null) {
             throw new ContainerException("Unknown container config name");
@@ -88,18 +88,18 @@
         }
 
         config = new EngineConfig();
-        
+
         // set osgi config
         Map<String, String> osgiConfig = FastMap.newInstance();
         osgiConfig.put("osgi.configuration.area", new File(System.getProperty("ofbiz.home"), "runtime" + File.separator + "tempfiles").getPath());
         config.setOSGiConfig(osgiConfig);
-        
+
         HashMap<String, Object> context = UtilGenerics.cast(config.getAppContext());
-        
+
         // set delegator, dispatcher and security objects to report
-        
+
         delegatorGroupHelperName = ContainerConfig.getPropertyValue(cc, "delegator-group-helper-name", "org.ofbiz");
-        
+
         // get the delegator
         delegatorName = ContainerConfig.getPropertyValue(cc, "delegator-name", "default");
         try {
@@ -107,25 +107,25 @@
         } catch (ClassNotFoundException e) {
             Debug.logError(e, module);
         }
-        
+
         // get the dispatcher
         dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator);
-        
+
         context.put("delegator", delegator);
         context.put("dispatcher", dispatcher);
-        
+
         // set classloader for engine
         context.put(EngineConstants.APPCONTEXT_CLASSLOADER_KEY, BirtContainer.class.getClassLoader());
         context.put(EngineConstants.WEBAPP_CLASSPATH_KEY, BirtContainer.class.getClassLoader());
-        
+
         // set log config to show all level in console
         config.setLogConfig(null, Level.ALL);
-        
+
         // set engine home
         String reportEnginePath = FileUtil.getFile("component://birt/lib/platform").getPath();
         config.setEngineHome(reportEnginePath);
         config.setBIRTHome(reportEnginePath);
-        
+
         // set OSGi arguments specific in properties
         String argumentsString = UtilProperties.getPropertyValue(BirtContainer.CONFIG_FILE, "birt.osgi.arguments");
         config.setOSGiArguments(argumentsString.split(","));
@@ -133,7 +133,7 @@
         // set platform file context
         config.setPlatformContext(new PlatformFileContext(config));
         config.setAppContext(context);
-        
+
         // startup platform
         try {
             Debug.logInfo("Startup birt platform", module);
@@ -163,28 +163,28 @@
         Debug.logInfo("BIRT supported formats: " + formatList, module);
         return false;
     }
-    
+
     public void stop() throws ContainerException {
         // TODO Auto-generated method stub
-        
+
     }
-    
+
     public String getContainerConfigName() {
         return "birt-container";
     }
-    
+
     public static IReportEngine getReportEngine() throws GenericEntityException, SQLException {
         return engine;
     }
-    
+
     public static String getDelegatorGroupHelperName() {
         return delegatorGroupHelperName;
     }
-    
+
     public static String getDelegatorName() {
         return delegatorName;
     }
-    
+
     public static String getDispatcherName() {
         return dispatcherName;
     }
@@ -192,7 +192,7 @@
     public static Delegator getDelegator() {
         return delegator;
     }
-    
+
     public static LocalDispatcher getDispatcher() {
         return dispatcher;
     }

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java Fri Jan 15 21:00:23 2010
@@ -55,14 +55,14 @@
 import org.xml.sax.SAXException;
 
 public class BirtEmailServices {
-    
+
     public static final String module = BirtEmailServices.class.getName();
-    
+
     protected static final HtmlScreenRenderer htmlScreenRenderer = new HtmlScreenRenderer();
-    
+
     /**
      * send birt mail
-     *
+     *
      * @param ctx
      * @param context
      * @return
@@ -127,9 +127,9 @@
                 return ServiceUtil.returnError(errMsg);
             }
         }
-        
+
         boolean isMultiPart = false;
-        
+
         // check if attachment screen location passed in
         if (UtilValidate.isNotEmpty(birtReportLocation)) {
             isMultiPart = true;
@@ -137,7 +137,7 @@
             try {
                 // create the output stream for the generation
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                
+
                 Map<String, Object> birtContext = FastMap.newInstance();
                 if (birtLocale == null) {
                     birtLocale = locale;
@@ -218,7 +218,7 @@
                 serviceContext.put("contentType", "text/html");
             }
         }
-        
+
         // also expand the subject at this point, just in case it has the FlexibleStringExpander syntax in it...
         String subject = (String) serviceContext.remove("subject");
         subject = FlexibleStringExpander.expandString(subject, screenContext, locale);
@@ -238,7 +238,7 @@
             String errMsg = "Error send email :" + e.toString();
             Debug.logError(e, errMsg, module);
             return ServiceUtil.returnError(errMsg);
-        }
+        }
         result.put("body", bodyWriter.toString());
         return result;
     }

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java Fri Jan 15 21:00:23 2010
@@ -34,13 +34,13 @@
 import org.ofbiz.base.location.FlexibleLocation;
 
 public class BirtViewerAttributeBean extends ViewerAttributeBean {
-    
+
     public final static String module = BirtViewerAttributeBean.class.getName();
 
     public BirtViewerAttributeBean(HttpServletRequest request) {
         super(request);
     }
-    
+
     protected void __init( HttpServletRequest request ) throws Exception
     {
         String reportParam = DataUtil.trimString( ParameterAccessor.getParameter( request, ParameterAccessor.PARAM_REPORT ));
@@ -63,7 +63,7 @@
         if ( this.reportDesignHandle == null )
             throw new ViewerException(
                     ResourceConstants.GENERAL_EXCEPTION_NO_REPORT_DESIGN );
-        
+
         // Initialize report parameters.
         __initParameters( request );
     }

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java Fri Jan 15 21:00:23 2010
@@ -26,7 +26,7 @@
 import org.eclipse.birt.report.context.ViewerAttributeBean;
 
 public class OFBizBirtContext extends BirtContext {
-    
+
     public final static String module = OFBizBirtContext.class.getName();
 
     public OFBizBirtContext(HttpServletRequest request,

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java Fri Jan 15 21:00:23 2010
@@ -56,19 +56,19 @@
 import org.ofbiz.entity.jdbc.ConnectionFactory;
 
 public class OFBizBirtViewerReportService extends BirtViewerReportService {
-    
+
     public final static String module = OFBizBirtViewerReportService.class.getName();
 
     public OFBizBirtViewerReportService(ServletContext servletContext) {
         super(servletContext);
         // TODO Auto-generated constructor stub
     }
-    
+
     public String runReport(IViewerReportDesignHandle design,
             String outputDocName, InputOptions runOptions, Map parameters,
             Map displayTexts, List<Exception> errorList) throws ReportServiceException {
         // TODO Auto-generated method stub
-        
+
         if ( design == null || design.getDesignObject( ) == null )
             throw new ReportServiceException( BirtResources.getMessage( ResourceConstants.GENERAL_EXCEPTION_NO_REPORT_DESIGN ) );
 
@@ -99,7 +99,7 @@
             if ( ParameterAccessor.isReportParameterExist( request,
                     ParameterAccessor.PARAM_MAXROWS ) )
                 maxRows = Integer.valueOf( ParameterAccessor.getMaxRows( request ) );
-            
+
             try {
                 // put all app context from Birt Container to Report Engine Service
                 ReportEngineService.getInstance().getEngineConfig().getAppContext().putAll(
@@ -139,12 +139,12 @@
         }
         return outputDocName;
     }
-    
+
     /**
      * Run report.
-     *
+     *
      * @param request
-     *
+     *
      * @param runnable
      * @param archive
      * @param documentName
@@ -170,7 +170,7 @@
             throwDummyException(e);
         }
         runTask.setLocale( locale );
-        
+
         com.ibm.icu.util.TimeZone tz = BirtUtility.toICUTimeZone( timeZone );
         if ( tz != null )
         {
@@ -237,7 +237,7 @@
         }
         return null;
     }
-    
+
     /**
      * @see org.eclipse.birt.report.service.api.IViewerReportService#runAndRenderReport(org.eclipse.birt.report.service.api.IViewerReportDesignHandle,
      *      java.lang.String, org.eclipse.birt.report.service.api.InputOptions,
@@ -293,7 +293,7 @@
             throwReportServiceException( e );
         }
     }
-    
+
     /**
      * get connection
      */
@@ -312,7 +312,7 @@
         }
         return connection;
     }
-    
+
     /**
      * @param e
      * @throws DummyRemoteException
@@ -330,7 +330,7 @@
                 .getLocalizedMessage( ), e ) );
         }
     }
-    
+
     /**
      * Temporary method for extracting the exception from the
      * DummyRemoteException and throwing it.

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java Fri Jan 15 21:00:23 2010
@@ -38,7 +38,7 @@
 import org.ofbiz.birt.report.service.OFBizBirtViewerReportService;
 
 public class BirtEngineServlet extends org.eclipse.birt.report.servlet.BirtEngineServlet {
-    
+
     public final static String module = BirtEngineServlet.class.getName();
 
     protected void __init( ServletConfig config )

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java Fri Jan 15 21:00:23 2010
@@ -39,13 +39,13 @@
 import org.ofbiz.birt.report.service.OFBizBirtViewerReportService;
 
 public class BirtViewerServlet extends ViewerServlet {
-    
+
     public final static String module = BirtViewerServlet.class.getName();
-    
+
     protected void __init(ServletConfig config) {
         BirtReportServiceFactory.init( new OFBizBirtViewerReportService( config
                 .getServletContext( ) ) );
-        
+
         // handle 'frameset' pattern
         viewer = new FramesetFragment( );
         viewer.buildComposite( );

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java Fri Jan 15 21:00:23 2010
@@ -48,13 +48,13 @@
 import org.xml.sax.SAXException;
 
 public class BirtViewHandler implements ViewHandler {
-    
+
     public static final String module = BirtViewHandler.class.getName();
 
     protected ServletContext servletContext = null;
 
     private String name = "birt";
-    
+
     public void init(ServletContext context) throws ViewHandlerException {
         // TODO Auto-generated method stub
         this.servletContext = context;
@@ -84,7 +84,7 @@
             } else {
                 design = engine.openReportDesign(servletContext.getRealPath(page));
             }
-            
+
              Map<String, Object> context = FastMap.newInstance();
             // set parameters from request
              Map<String, Object> parameters = UtilGenerics.cast(request.getAttribute(BirtWorker.BIRT_PARAMETERS));

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java Fri Jan 15 21:00:23 2010
@@ -30,9 +30,9 @@
 import org.xml.sax.SAXException;
 
 public class BirtFactory {
-    
+
     public static final String module = BirtFactory.class.getName();
-    
+
     /**
      * get report inport stream from location
      * @param resourceName
@@ -43,7 +43,7 @@
      */
     public static InputStream getReportInputStreamFromLocation(String resourceName)
         throws IOException, SAXException, ParserConfigurationException{
-        
+
         InputStream reportInputStream = null;
         synchronized (BirtFactory.class) {
             long startTime = System.currentTimeMillis();
@@ -60,7 +60,7 @@
             double totalSeconds = (System.currentTimeMillis() - startTime)/1000.0;
             Debug.logInfo("Got report in " + totalSeconds + "s from: " + reportFileUrl.toExternalForm(), module);
         }
-        
+
         if (reportInputStream == null) {
             throw new IllegalArgumentException("Could not find report file with location [" + resourceName + "]");
         }

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Fri Jan 15 21:00:23 2010
@@ -536,7 +536,7 @@
         } else {
             sessionMgr = new StandardManager();
         }
-        
+
         // create the web application context
         StandardContext context = (StandardContext) embedded.createContext(mount, location);
         context.setJ2EEApplication(J2EE_APP);

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Fri Jan 15 21:00:23 2010
@@ -97,7 +97,7 @@
         System.out.println("----- SVC: " + dctx.getName() + " -----");
         return response;
     }
-    
+
     /**
      * Generic Test SOAP Service
      *@param dctx The DispatchContext that this service is operating in

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java Fri Jan 15 21:00:23 2010
@@ -52,14 +52,14 @@
                 Debug.logError(e, "Cannot lookup Geo", module);
             }
         }
-                
+
         List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("geoTypeId", EntityOperator.EQUALS, "COUNTRY"));
-        List<String> countriesAvailable = StringUtil.split(UtilProperties.getPropertyValue("general.properties", "countries.geo.id.available"), ",");              
+        List<String> countriesAvailable = StringUtil.split(UtilProperties.getPropertyValue("general.properties", "countries.geo.id.available"), ",");
         if (UtilValidate.isNotEmpty(countriesAvailable)) {
             // only available countries (we don't verify the list of geoId in countries.geo.id.available)
             exprs.add(EntityCondition.makeCondition("geoId", EntityOperator.IN, countriesAvailable));
         }
-        
+
         List<GenericValue> countriesList = FastList.newInstance();
         try {
             countriesList = delegator.findList("Geo", EntityCondition.makeCondition(exprs), null, UtilMisc.toList("geoName"), null, true);
@@ -76,7 +76,7 @@
                     }
                 }
             }
-            if (removeDefaultGeo) {
+            if (removeDefaultGeo) {
                 geoList.remove(0); // Remove default country to avoid double rows in drop-down, from 1st place to keep alphabetical order
             }
             geoList.addAll(countriesList);
@@ -103,7 +103,7 @@
     public static List<GenericValue> getAssociatedStateList(Delegator delegator, String country) {
         return getAssociatedStateList(delegator, country, null);
     }
-    
+
     /**
      * Returns a list of regional geo associations.
      */
@@ -119,7 +119,7 @@
                         EntityCondition.makeCondition("geoTypeId", "STATE"),
                         EntityCondition.makeCondition("geoTypeId", "PROVINCE"),
                         EntityCondition.makeCondition("geoTypeId", "COUNTY")));
-        
+
         if (UtilValidate.isEmpty(listOrderBy)) {
             listOrderBy = "geoId";
         }
@@ -134,11 +134,11 @@
 
         return geoList;
     }
-    
+
     /**
      * A generic method to be used on Type enities, e.g. ProductType.  Recurse to the root level in the type hierarchy
      * and checks if the specified type childType has parentType as its parent somewhere in the hierarchy.
-     *
+     *
      * @param delegator       The Delegator object.
      * @param entityName      Name of the Type entity on which check is performed.
      * @param primaryKey      Primary Key field of the Type entity.
@@ -165,7 +165,7 @@
                 }
             }
         }
-        
+
         return false;
     }
 }

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java Fri Jan 15 21:00:23 2010
@@ -303,7 +303,7 @@
                 }
                 cond = EntityCondition.makeCondition(fieldName, fieldOp, fieldObject);
             }
-            
+
             if (EntityOperator.NOT_EQUAL.equals(fieldOp) && fieldObject != null) {
                 tmpOrList = FastList.newInstance();
                 tmpOrList.add(cond);
@@ -384,10 +384,10 @@
     public static Map<String, Object> performFindList(DispatchContext dctx, Map<String, Object> context) {
         Integer viewSize = (Integer) context.get("viewSize");
         if (viewSize == null) viewSize = Integer.valueOf(20);       // default
- context.put("viewSize", viewSize);
+        context.put("viewSize", viewSize);
         Integer viewIndex = (Integer) context.get("viewIndex");
         if (viewIndex == null)  viewIndex = Integer.valueOf(0);  // default
- context.put("viewIndex", viewIndex);
+        context.put("viewIndex", viewIndex);
 
         Map<String, Object> result = performFind(dctx,context);
 
@@ -449,9 +449,9 @@
 
         Map<String, Object> prepareResult = null;
         try {
-            prepareResult = dispatcher.runSync("prepareFind", UtilMisc.toMap("entityName", entityName, "orderBy", orderBy,
+            prepareResult = dispatcher.runSync("prepareFind", UtilMisc.toMap("entityName", entityName, "orderBy", orderBy,
                                                "inputFields", inputFields, "filterByDate", filterByDate,
-                                               "filterByDateValue", filterByDateValue, "userLogin", userLogin,
+                                               "filterByDateValue", filterByDateValue, "userLogin", userLogin,
                                                "locale", context.get("locale"), "timeZone", context.get("timeZone")));
         } catch (GenericServiceException gse) {
             return ServiceUtil.returnError("Error preparing conditions: " + gse.getMessage());
@@ -461,9 +461,9 @@
 
         Map<String, Object> executeResult = null;
         try {
-            executeResult = dispatcher.runSync("executeFind", UtilMisc.toMap("entityName", entityName, "orderByList", orderByList,
-                                                                             "fieldList", fieldList, "entityConditionList", exprList,
-                                                                             "noConditionFind", noConditionFind, "distinct", distinct,
+            executeResult = dispatcher.runSync("executeFind", UtilMisc.toMap("entityName", entityName, "orderByList", orderByList,
+                                                                             "fieldList", fieldList, "entityConditionList", exprList,
+                                                                             "noConditionFind", noConditionFind, "distinct", distinct,
                                                                              "locale", context.get("locale"), "timeZone", context.get("timeZone"),
                                                                              "maxRows", maxRows));
         } catch (GenericServiceException gse) {

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java Fri Jan 15 21:00:23 2010
@@ -74,14 +74,14 @@
     public static void updatePassword(String username, String password, String newPassword) throws AuthenticatorException {
         if (!authenticatorsLoaded) throw new AuthenticatorException("Authenticators never loaded; be sure to call AuthHelper.loadAuthenticators()");
         for (Authenticator auth : authenticators) {
-            auth.updatePassword(username, password, newPassword);            
+            auth.updatePassword(username, password, newPassword);
         }
     }
 
     public static boolean authenticatorsLoaded() {
         return authenticatorsLoaded;
     }
-    
+
     public static void loadAuthenticators(LocalDispatcher dispatcher) {
         if (!authenticatorsLoaded) {
             loadAuthenticators_internal(dispatcher);
@@ -95,7 +95,7 @@
                 try {
                     Authenticator auth = it.next();
                     if (auth.isEnabled()) {
-                        auth.initialize(dispatcher);                    
+                        auth.initialize(dispatcher);
                         authenticators.add(auth);
                     }
                 } catch (ClassCastException e) {

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java Fri Jan 15 21:00:23 2010
@@ -61,7 +61,7 @@
      *         second.
      * @throws ClassCastException if the arguments' types prevent them from
      *                            being compared by this Comparator.
-     */    
+     */
     public int compare(Authenticator a1, Authenticator a2) {
         if (a1.getWeight() < a2.getWeight()) {
             return -1;

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java Fri Jan 15 21:00:23 2010
@@ -78,13 +78,13 @@
     public float getWeight();
 
     /**
-     * Is the user synchronized back to OFBiz
+     * Is the user synchronized back to OFBiz
      * @return true if the user record is copied to the OFB database
      */
     public boolean isUserSynchronized();
 
     /**
-     * Is this expected to be the only authenticator, if so errors will be thrown when users cannot be found
+     * Is this expected to be the only authenticator, if so errors will be thrown when users cannot be found
      * @return true if this is expected to be the only Authenticator
      */
     public boolean isSingleAuthenticator();

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/AuthenticatorException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/AuthenticatorException.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/AuthenticatorException.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/AuthenticatorException.java Fri Jan 15 21:00:23 2010
@@ -27,7 +27,7 @@
  * AuthenticatorException
  */
 public class AuthenticatorException extends GeneralException {
-    
+
     private static final long serialVersionUID = 2836939874682240962L;
 
     /**

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java Fri Jan 15 21:00:23 2010
@@ -104,7 +104,7 @@
         Map<String, Object> results = ServiceUtil.returnSuccess();
         String subject = (String) context.get("subject");
         subject = FlexibleStringExpander.expandString(subject, context);
-        
+
         String partyId = (String) context.get("partyId");
         String body = (String) context.get("body");
         List<Map<String, Object>> bodyParts = UtilGenerics.checkList(context.get("bodyParts"));
@@ -301,7 +301,7 @@
             results.put("messageWrapper", new MimeMessageWrapper(session, mail));
             return results;
         }
-        
+
         Transport trans = null;
         try {
             trans = session.getTransport("smtp");
@@ -356,14 +356,14 @@
      *@param rcontext Map containing the input parameters
      *@return Map with the result of the service, the output parameters
      */
-    public static Map<String, Object> sendMailFromUrl(DispatchContext ctx, Map<String, ? extends Object> rcontext) {        
+    public static Map<String, Object> sendMailFromUrl(DispatchContext ctx, Map<String, ? extends Object> rcontext) {
         // pretty simple, get the content and then call the sendMail method below
         Map<String, Object> sendMailContext = UtilMisc.makeMapWritable(rcontext);
         String bodyUrl = (String) sendMailContext.remove("bodyUrl");
         Map<String, Object> bodyUrlParameters = UtilGenerics.checkMap(sendMailContext.remove("bodyUrlParameters"));
 
         LocalDispatcher dispatcher = ctx.getDispatcher();
-        
+
         URL url = null;
 
         try {
@@ -382,7 +382,7 @@
             Debug.logWarning(e, module);
             return ServiceUtil.returnError("Error getting content: " + e.toString());
         }
-                
+
         sendMailContext.put("body", body);
         Map<String, Object> sendMailResult;
         try {
@@ -391,7 +391,7 @@
             Debug.logError(e, module);
             return ServiceUtil.returnError(e.getMessage());
         }
-        
+
         // just return the same result; it contains all necessary information
         return sendMailResult;
     }
@@ -576,7 +576,7 @@
         if (ServiceUtil.isError(sendMailResult)) {
             return ServiceUtil.returnError(ServiceUtil.getErrorMessage(sendMailResult));
         }
-        
+
         result.put("messageWrapper", sendMailResult.get("messageWrapper"));
         result.put("body", bodyWriter.toString());
         result.put("subject", subject);

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java Fri Jan 15 21:00:23 2010
@@ -172,7 +172,7 @@
 
         // scale original image with new size
         Image newImg = bufImg.getScaledInstance((int) (imgWidth * scaleFactor), (int) (imgHeight * scaleFactor), Image.SCALE_SMOOTH);
-        
+
         bufNewImg = ImageTransform.toBufferedImage(newImg, bufImgType);
 
         result.put("responseMessage", "success");
@@ -251,7 +251,7 @@
         return result;
 
     }
-    
+
     /**
      * toBufferedImage
      * <p>
@@ -263,7 +263,7 @@
     public static BufferedImage toBufferedImage(Image image) {
         return ImageTransform.toBufferedImage(image, BufferedImage.TYPE_INT_ARGB_PRE);
     }
-    
+
     public static BufferedImage toBufferedImage(Image image, int bufImgType) {
         /** Check if the image isn't already a BufferedImage instance */
         if( image instanceof BufferedImage ) {
@@ -271,18 +271,18 @@
         } else {
                 /** Full image loading */
                 image = new ImageIcon(image).getImage();
-                
+
                 /** new BufferedImage creation */
                 BufferedImage bufferedImage = new BufferedImage(
                             image.getWidth(null),
                             image.getHeight(null),
                             bufImgType);
-                
+
                 Graphics2D g = bufferedImage.createGraphics();
                 g.drawImage(image,0,0,null);
                 g.dispose();
-                
+
                 return( bufferedImage );
-        }
+        }
     }
 }

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java Fri Jan 15 21:00:23 2010
@@ -150,7 +150,7 @@
                 }
             }
         }
-        
+
         Map<String, Object> result = ServiceUtil.returnSuccess();
         result.put("userPrefMap", userPrefMap);
         return result;

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java Fri Jan 15 21:00:23 2010
@@ -98,7 +98,7 @@
     public static BigDecimal convertUom(BigDecimal originalValue, String uomId, String uomIdTo, LocalDispatcher dispatcher) {
         if (originalValue == null || uomId == null || uomIdTo == null) return null;
         if (uomId.equals(uomIdTo)) return originalValue;
-        
+
         Map<String, Object> svcInMap = FastMap.newInstance();
         svcInMap.put("originalValue", originalValue);
         svcInMap.put("uomId", uomId);

Modified: ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java (original)
+++ ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java Fri Jan 15 21:00:23 2010
@@ -269,9 +269,9 @@
         else if (fieldType.equals("java.lang.String") || fieldType.equals("String"))
             if (field.format.equals("EncryptedString")) {
                 String hashType = LoginServices.getHashType();
-                set(name, HashCrypt.getDigestHash(value, hashType));        
+                set(name, HashCrypt.getDigestHash(value, hashType));
             } else {
-         set(name, value);
+                set(name, value);
             }
         else if (fieldType.equals("NullTerminatedString")) {
             int terminate = value.indexOf(0x0);

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java Fri Jan 15 21:00:23 2010
@@ -284,26 +284,26 @@
             throw new IllegalArgumentException("Type " + curField.getType() + " not found for entity [" + modelEntity.getEntityName() + "]; probably because there is no datasource (helper) setup for the entity group that this entity is in: [" + delegator.getEntityGroupName(modelEntity.getEntityName()) + "]");
         }
         if (value instanceof EntityConditionSubSelect){
-         ModelFieldType valueType = null;
-         try {
-         ModelEntity valueModelEntity= ((EntityConditionSubSelect) value).getModelEntity();
-         valueType = delegator.getEntityFieldType(valueModelEntity,  valueModelEntity.getField(((EntityConditionSubSelect) value).getKeyFieldName()).getType());
-             } catch (GenericEntityException e) {
-                 Debug.logWarning(e, module);
-             }
+            ModelFieldType valueType = null;
+            try {
+                ModelEntity valueModelEntity= ((EntityConditionSubSelect) value).getModelEntity();
+                valueType = delegator.getEntityFieldType(valueModelEntity,  valueModelEntity.getField(((EntityConditionSubSelect) value).getKeyFieldName()).getType());
+            } catch (GenericEntityException e) {
+                Debug.logWarning(e, module);
+            }
           // make sure the type of keyFieldName of EntityConditionSubSelect  matches the field Java type
-             if (!ObjectType.instanceOf(valueType.getJavaType(), type.getJavaType())) {
-             String errMsg = "Warning using ["+ value.getClass().getName() + "] and entity field [" + modelEntity.getEntityName() + "." + curField.getName() + "]. The Java type of keyFieldName : [" + valueType.getJavaType()+ "] is not compatible with the Java type of the field [" + type.getJavaType() + "]";
- // eventually we should do this, but for now we'll do a "soft" failure: throw new IllegalArgumentException(errMsg);
- Debug.logWarning(new Exception("Location of database type warning"), "=-=-=-=-=-=-=-=-= Database type warning in EntityExpr =-=-=-=-=-=-=-=-= " + errMsg, module);
+            if (!ObjectType.instanceOf(valueType.getJavaType(), type.getJavaType())) {
+                String errMsg = "Warning using ["+ value.getClass().getName() + "] and entity field [" + modelEntity.getEntityName() + "." + curField.getName() + "]. The Java type of keyFieldName : [" + valueType.getJavaType()+ "] is not compatible with the Java type of the field [" + type.getJavaType() + "]";
+                // eventually we should do this, but for now we'll do a "soft" failure: throw new IllegalArgumentException(errMsg);
+                Debug.logWarning(new Exception("Location of database type warning"), "=-=-=-=-=-=-=-=-= Database type warning in EntityExpr =-=-=-=-=-=-=-=-= " + errMsg, module);
              }
         } else {
         // make sure the type matches the field Java type
-         if (!ObjectType.instanceOf(value, type.getJavaType())) {
- String errMsg = "In entity field [" + modelEntity.getEntityName() + "." + curField.getName() + "] set the value passed in [" + value.getClass().getName() + "] is not compatible with the Java type of the field [" + type.getJavaType() + "]";
- // eventually we should do this, but for now we'll do a "soft" failure: throw new IllegalArgumentException(errMsg);
- Debug.logWarning(new Exception("Location of database type warning"), "=-=-=-=-=-=-=-=-= Database type warning in EntityExpr =-=-=-=-=-=-=-=-= " + errMsg, module);
- }
+            if (!ObjectType.instanceOf(value, type.getJavaType())) {
+                String errMsg = "In entity field [" + modelEntity.getEntityName() + "." + curField.getName() + "] set the value passed in [" + value.getClass().getName() + "] is not compatible with the Java type of the field [" + type.getJavaType() + "]";
+                // eventually we should do this, but for now we'll do a "soft" failure: throw new IllegalArgumentException(errMsg);
+                Debug.logWarning(new Exception("Location of database type warning"), "=-=-=-=-=-=-=-=-= Database type warning in EntityExpr =-=-=-=-=-=-=-=-= " + errMsg, module);
+            }
         }
     }
 

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java Fri Jan 15 21:00:23 2010
@@ -971,7 +971,7 @@
     public long selectCountByCondition(ModelEntity modelEntity, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, EntityFindOptions findOptions) throws GenericEntityException {
         return selectCountByCondition(modelEntity, whereEntityCondition, havingEntityCondition, null, findOptions);
     }
-    
+
     public long selectCountByCondition(ModelEntity modelEntity, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, List<ModelField> selectFields, EntityFindOptions findOptions) throws GenericEntityException {
         if (modelEntity == null) {
             return 0;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java Fri Jan 15 21:00:23 2010
@@ -363,7 +363,7 @@
                             Element mapKeyElement = UtilXml.firstChildElement(curElement, "map-Key");
                             Element keyElement = null;
                             Node tempNode = mapKeyElement.getFirstChild();
-                            
+
                             while (tempNode != null) {
                                 if (tempNode.getNodeType() == Node.ELEMENT_NODE) {
                                     keyElement = (Element) tempNode;

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=899812&r1=899811&r2=899812&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Fri Jan 15 21:00:23 2010
@@ -148,15 +148,15 @@
                     }
                 } else if ("drop-pks".equalsIgnoreCase(argumentName)) {
                     if (UtilValidate.isEmpty(argumentVal) || "true".equalsIgnoreCase(argumentVal)) {
-                        dropPks = true;                        
+                        dropPks = true;
                     }
                 } else if ("create-pks".equalsIgnoreCase(argumentName)) {
                     if (UtilValidate.isEmpty(argumentVal) || "true".equalsIgnoreCase(argumentVal)) {
                         createPks = true;
-                    }
+                    }
                 } else if ("drop-constraints".equalsIgnoreCase(argumentName)) {
                     if (UtilValidate.isEmpty(argumentVal) || "true".equalsIgnoreCase(argumentVal)) {
-                        dropConstraints = true;                      
+                        dropConstraints = true;
                     }
                 } else if ("create-constraints".equalsIgnoreCase(argumentName)) {
                     if (UtilValidate.isEmpty(argumentVal) || "true".equalsIgnoreCase(argumentVal)) {
@@ -243,13 +243,13 @@
             modelEntities = delegator.getModelEntityMapByGroup(groupNameToUse);
         } catch (GenericEntityException e) {
             throw new ContainerException(e.getMessage(), e);
-        }        
-        TreeSet<String> modelEntityNames = new TreeSet<String>(modelEntities.keySet());    
-        
+        }
+        TreeSet<String> modelEntityNames = new TreeSet<String>(modelEntities.keySet());
+
         // check for drop index/fks
-        if (dropConstraints) {                  
+        if (dropConstraints) {
             List<String> messages = FastList.newInstance();
-            
+
             Debug.logImportant("Dropping foreign key indcies...", module);
             for (String entityName : modelEntityNames) {
                 ModelEntity modelEntity = modelEntities.get(entityName);
@@ -257,7 +257,7 @@
                     dbUtil.deleteForeignKeyIndices(modelEntity, messages);
                 }
             }
-            
+
             Debug.logImportant("Dropping declared indices...", module);
             for (String entityName : modelEntityNames) {
                 ModelEntity modelEntity = modelEntities.get(entityName);
@@ -265,7 +265,7 @@
                     dbUtil.deleteDeclaredIndices(modelEntity, messages);
                 }
             }
-            
+
             Debug.logImportant("Dropping foreign keys...", module);
             for (String entityName : modelEntityNames) {
                 ModelEntity modelEntity = modelEntities.get(entityName);
@@ -273,7 +273,7 @@
                     dbUtil.deleteForeignKeys(modelEntity, modelEntities, messages);
                 }
             }
-            
+
             if (messages.size() > 0) {
                 if (Debug.infoOn()) {
                     for (String message : messages) {
@@ -282,18 +282,18 @@
                 }
             }
         }
-        
+
         // drop pks
         if (dropPks) {
             List<String> messages = FastList.newInstance();
             Debug.logImportant("Dropping primary keys...", module);
             for (String entityName : modelEntityNames) {
-                ModelEntity modelEntity = modelEntities.get(entityName);
+                ModelEntity modelEntity = modelEntities.get(entityName);
                 if (modelEntity != null) {
                     dbUtil.deletePrimaryKey(modelEntity, messages);
                 }
             }
-            
+
             if (messages.size() > 0) {
                 if (Debug.infoOn()) {
                     for (String message : messages) {
@@ -302,7 +302,7 @@
                 }
             }
         }
-        
+
         // repair columns
         if (repairColumns) {
             List<String> fieldsToRepair = FastList.newInstance();
@@ -320,7 +320,7 @@
                 }
             }
         }
-        
+
         // get the reader name URLs first
         List<URL> urlList = null;
         if (readerNames != null) {
@@ -409,7 +409,7 @@
         // create primary keys
         if (createPks) {
             List<String> messages = FastList.newInstance();
-            
+
             Debug.logImportant("Creating primary keys...", module);
             for (String entityName : modelEntityNames) {
                 ModelEntity modelEntity = modelEntities.get(entityName);
@@ -425,11 +425,11 @@
                 }
             }
         }
-        
+
         // create constraints
-        if (createConstraints) {                  
+        if (createConstraints) {
             List<String> messages = FastList.newInstance();
-            
+
             Debug.logImportant("Creating foreign keys...", module);
             for (String entityName : modelEntityNames) {
                 ModelEntity modelEntity = modelEntities.get(entityName);
@@ -437,7 +437,7 @@
                     dbUtil.createForeignKeys(modelEntity, modelEntities, messages);
                 }
             }
-            
+
             Debug.logImportant("Creating foreign key indcies...", module);
             for (String entityName : modelEntityNames) {
                 ModelEntity modelEntity = modelEntities.get(entityName);
@@ -445,7 +445,7 @@
                     dbUtil.createForeignKeyIndices(modelEntity, messages);
                 }
             }
-            
+
             Debug.logImportant("Creating declared indices...", module);
             for (String entityName : modelEntityNames) {
                 ModelEntity modelEntity = modelEntities.get(entityName);
@@ -453,7 +453,7 @@
                     dbUtil.createDeclaredIndices(modelEntity, messages);
                 }
             }
-                                    
+
             if (messages.size() > 0) {
                 if (Debug.infoOn()) {
                     for (String message : messages) {
@@ -462,7 +462,7 @@
                 }
             }
         }
-        
+
         return true;
     }