svn commit: r804895 [3/7] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r804895 [3/7] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java Mon Aug 17 08:20:38 2009 @@ -60,22 +60,22 @@ List<EntityCondition> conditions = UtilMisc.toList( EntityCondition.makeCondition("requirementTypeId", EntityOperator.EQUALS, "PRODUCT_REQUIREMENT"), EntityUtil.getFilterByDateExpr() - ); + ); if (UtilValidate.isNotEmpty(statusIds)) { - conditions.add( EntityCondition.makeCondition("statusId", EntityOperator.IN, statusIds) ); + conditions.add(EntityCondition.makeCondition("statusId", EntityOperator.IN, statusIds)); } else { - conditions.add( EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "REQ_APPROVED") ); + conditions.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "REQ_APPROVED")); } if (requirementConditions != null) conditions.add(requirementConditions); // we're either getting the requirements for a given supplier, unassigned requirements, or requirements for all suppliers if (UtilValidate.isNotEmpty(partyId)) { - conditions.add( EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId) ); - conditions.add( EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "SUPPLIER") ); + conditions.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId)); + conditions.add(EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "SUPPLIER")); } else if (UtilValidate.isNotEmpty(unassignedRequirements)) { - conditions.add( EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, null) ); + conditions.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, null)); } else { - conditions.add( EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "SUPPLIER") ); + conditions.add(EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "SUPPLIER")); } EntityConditionList<EntityCondition> ecl = EntityCondition.makeCondition(conditions, EntityOperator.AND); @@ -97,7 +97,7 @@ // join in fields with extra data about the suppliers and products List requirements = FastList.newInstance(); - for (Iterator iter = requirementAndRoles.iterator(); iter.hasNext(); ) { + for (Iterator iter = requirementAndRoles.iterator(); iter.hasNext();) { Map union = FastMap.newInstance(); GenericValue requirement = (GenericValue) iter.next(); String productId = requirement.getString("productId"); @@ -114,7 +114,7 @@ EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId), EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId), EntityUtil.getFilterByDateExpr("availableFromDate", "availableThruDate") - ); + ); ecl = EntityCondition.makeCondition(conditions, EntityOperator.AND); List<GenericValue> supplierProducts = delegator.findList("SupplierProduct", ecl, null, UtilMisc.toList("minimumOrderQuantity", "lastPrice"), null, false); @@ -157,14 +157,14 @@ // how many of the products were sold (note this is for a fixed time period across all product stores) BigDecimal sold = (BigDecimal) productsSold.get(productId); if (sold == null) { - EntityCondition prodConditions = EntityCondition.makeCondition( UtilMisc.toList( + EntityCondition prodConditions = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId), EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, "SALES_ORDER"), EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_IN, UtilMisc.toList("ORDER_REJECTED", "ORDER_CANCELLED")), EntityCondition.makeCondition("orderItemStatusId", EntityOperator.NOT_IN, UtilMisc.toList("ITEM_REJECTED", "ITEM_CANCELLED")), EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, timePeriodStart) - ), EntityOperator.AND); - GenericValue count = EntityUtil.getFirst( delegator.findList("OrderItemQuantityReportGroupByProduct", prodConditions, UtilMisc.toSet("quantityOrdered"), null, null, false)); + ), EntityOperator.AND); + GenericValue count = EntityUtil.getFirst(delegator.findList("OrderItemQuantityReportGroupByProduct", prodConditions, UtilMisc.toSet("quantityOrdered"), null, null, false)); if (count != null) { sold = count.getBigDecimal("quantityOrdered"); if (sold != null) productsSold.put(productId, sold); @@ -211,7 +211,7 @@ GenericValue productStore = order.getRelatedOneCache("ProductStore"); String facilityId = productStore.getString("inventoryFacilityId"); List orderItems = order.getRelated("OrderItem"); - for (Iterator iter = orderItems.iterator(); iter.hasNext(); ) { + for (Iterator iter = orderItems.iterator(); iter.hasNext();) { GenericValue item = (GenericValue) iter.next(); GenericValue product = item.getRelatedOne("Product"); if (product == null) continue; @@ -265,7 +265,7 @@ GenericValue productStore = order.getRelatedOneCache("ProductStore"); String facilityId = productStore.getString("inventoryFacilityId"); List orderItems = order.getRelated("OrderItem"); - for (Iterator iter = orderItems.iterator(); iter.hasNext(); ) { + for (Iterator iter = orderItems.iterator(); iter.hasNext();) { GenericValue item = (GenericValue) iter.next(); GenericValue product = item.getRelatedOne("Product"); if (product == null) continue; @@ -296,7 +296,7 @@ EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "REQ_REJECTED")), EntityOperator.AND); List requirements = delegator.findList("Requirement", ecl, null, null, null, false); - for (Iterator riter = requirements.iterator(); riter.hasNext(); ) { + for (Iterator riter = requirements.iterator(); riter.hasNext();) { GenericValue requirement = (GenericValue) riter.next(); pendingRequirements = pendingRequirements.add(requirement.get("quantity") == null ? BigDecimal.ZERO : requirement.getBigDecimal("quantity")); } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Mon Aug 17 08:20:38 2009 @@ -126,7 +126,7 @@ } public Map setCheckOutShippingOptions(String shippingMethod, String shippingInstructions, - String orderAdditionalEmails, String maySplit, String giftMessage, String isGift, String internalCode, String shipBeforeDate, String shipAfterDate ) { + String orderAdditionalEmails, String maySplit, String giftMessage, String isGift, String internalCode, String shipBeforeDate, String shipAfterDate) { List errorMessages = new ArrayList(); Map result; String errMsg = null; @@ -151,7 +151,7 @@ } private List setCheckOutShippingOptionsInternal(String shippingMethod, String shippingInstructions, String orderAdditionalEmails, - String maySplit, String giftMessage, String isGift, String internalCode, String shipBeforeDate, String shipAfterDate ) { + String maySplit, String giftMessage, String isGift, String internalCode, String shipBeforeDate, String shipAfterDate) { List errorMessages = new ArrayList(); String errMsg = null; @@ -956,7 +956,7 @@ List<EntityExpr> payPalExprs = UtilMisc.toList( EntityCondition.makeCondition("paymentMethodId", EntityOperator.NOT_EQUAL, null), EntityCondition.makeCondition("paymentMethodTypeId", "EXT_PAYPAL") - ); + ); List<GenericValue> payPalPaymentPrefs = EntityUtil.filterByAnd(allPaymentPreferences, payPalExprs); if (UtilValidate.isNotEmpty(payPalPaymentPrefs)) { GenericValue payPalPaymentPref = EntityUtil.getFirst(payPalPaymentPrefs); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Mon Aug 17 08:20:38 2009 @@ -495,7 +495,7 @@ String isAvailable = ShoppingCartItem.checkAvailability(productId, newQuantity, reservStart, reservLength, this); if (isAvailable.compareTo("OK") != 0) { Map messageMap = UtilMisc.toMap("productId", productId, "availableMessage", isAvailable); - String excMsg = UtilProperties.getMessage(ShoppingCartItem.resource, "item.product_not_available", messageMap, this.getLocale() ); + String excMsg = UtilProperties.getMessage(ShoppingCartItem.resource, "item.product_not_available", messageMap, this.getLocale()); Debug.logInfo(excMsg, module); throw new CartItemModifyException(isAvailable); } @@ -592,7 +592,7 @@ return addItemToEnd(ShoppingCartItem.makeItem(null, productId, amount, quantity, unitPrice, reservStart, reservLength, reservPersons, null, null, features, attributes, prodCatalogId, configWrapper, itemType, null, dispatcher, this, triggerExternalOps, triggerPriceRules, null, skipInventoryChecks, skipProductChecks)); } - /** Add an accommodation(rental )item to the shopping cart. */ + /** Add an accommodation(rental)item to the shopping cart. */ public int addItemToEnd(String productId, BigDecimal amount, BigDecimal quantity, BigDecimal unitPrice, Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, String accommodationMapId, String accommodationSpotId, HashMap features, HashMap attributes, String prodCatalogId, String itemType, LocalDispatcher dispatcher, Boolean triggerExternalOps, Boolean triggerPriceRules) throws CartItemModifyException, ItemNotFoundException { return addItemToEnd(ShoppingCartItem.makeItem(null, productId, amount, quantity, unitPrice, reservStart, reservLength, reservPersons, accommodationMapId, accommodationSpotId, null, null, features, attributes, prodCatalogId, null, itemType, null, dispatcher, this, triggerExternalOps, triggerPriceRules, null, Boolean.FALSE, Boolean.FALSE)); } @@ -1626,7 +1626,7 @@ /** remove all the paymentMethods based on the paymentMethodIds */ public void clearPaymentMethodsById(List paymentMethodIdsToRemove) { if (UtilValidate.isEmpty(paymentMethodIdsToRemove)) return; - for (Iterator iter = paymentInfo.iterator(); iter.hasNext(); ) { + for (Iterator iter = paymentInfo.iterator(); iter.hasNext();) { CartPaymentInfo info = (CartPaymentInfo) iter.next(); if (paymentMethodIdsToRemove.contains(info.paymentMethodId)) { iter.remove(); @@ -1642,7 +1642,7 @@ List declinedPaymentMethods = delegator.findByAnd("OrderPaymentPreference", UtilMisc.toMap("orderId", orderId, "statusId", "PAYMENT_DECLINED")); if (!UtilValidate.isEmpty(declinedPaymentMethods)) { List paymentMethodIdsToRemove = new ArrayList(); - for (Iterator iter = declinedPaymentMethods.iterator(); iter.hasNext(); ) { + for (Iterator iter = declinedPaymentMethods.iterator(); iter.hasNext();) { GenericValue opp = (GenericValue) iter.next(); paymentMethodIdsToRemove.add(opp.getString("paymentMethodId")); } @@ -1993,7 +1993,7 @@ Map shipGroups = this.getShipGroups(item); if ((shipGroups != null) && (shipGroups.keySet() != null)) { - for (Iterator shipGroupKeys = shipGroups.keySet().iterator(); shipGroupKeys.hasNext(); ) { + for (Iterator shipGroupKeys = shipGroups.keySet().iterator(); shipGroupKeys.hasNext();) { Integer shipGroup = (Integer) shipGroupKeys.next(); CartShipInfo cartShipInfo = this.getShipInfo(shipGroup.intValue()); @@ -2565,7 +2565,7 @@ public BigDecimal getOrderPaymentPreferenceTotalByType(String paymentMethodTypeId) { BigDecimal total = BigDecimal.ZERO; String thisPaymentMethodTypeId = null; - for (Iterator iter = paymentInfo.iterator(); iter.hasNext(); ) { + for (Iterator iter = paymentInfo.iterator(); iter.hasNext();) { CartPaymentInfo payment = (CartPaymentInfo) iter.next(); if (payment.amount == null) continue; if (payment.paymentMethodId != null) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Mon Aug 17 08:20:38 2009 @@ -634,7 +634,7 @@ } String orderId = request.getParameter("orderId_o_0"); // set the order id if supplied - if(UtilValidate.isNotEmpty(orderId)) { + if (UtilValidate.isNotEmpty(orderId)) { GenericValue thisOrder = null; try { thisOrder = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false); @@ -728,11 +728,11 @@ return "error"; } else { totalQuantity = (BigDecimal)result.get("totalQuantity"); - Map messageMap = UtilMisc.toMap("totalQuantity", UtilFormatOut.formatQuantity(totalQuantity.doubleValue()) ); + Map messageMap = UtilMisc.toMap("totalQuantity", UtilFormatOut.formatQuantity(totalQuantity.doubleValue())); request.setAttribute("_EVENT_MESSAGE_", UtilProperties.getMessage(resource_error, "cart.add_category_defaults", - messageMap, locale )); + messageMap, locale)); return "success"; } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Mon Aug 17 08:20:38 2009 @@ -183,10 +183,10 @@ } if (product == null) { - Map messageMap = UtilMisc.toMap("productId", productId ); + Map messageMap = UtilMisc.toMap("productId", productId); String excMsg = UtilProperties.getMessage(resource_error, "item.product_not_found", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new ItemNotFoundException(excMsg); @@ -199,7 +199,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_virtual", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -214,7 +214,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_not_configured_correctly", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -333,8 +333,8 @@ } if (product == null) { - Map messageMap = UtilMisc.toMap("productId", productId ); - String excMsg = UtilProperties.getMessage(resource_error, "item.product_not_found", messageMap , cart.getLocale() ); + Map messageMap = UtilMisc.toMap("productId", productId); + String excMsg = UtilProperties.getMessage(resource_error, "item.product_not_found", messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new ItemNotFoundException(excMsg); @@ -425,7 +425,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_virtual", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -440,7 +440,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_not_yet_available", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -452,7 +452,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_no_longer_available", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -467,7 +467,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_no_longer_available", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -481,7 +481,7 @@ Map messageMap = UtilMisc.toMap("productName", product.getString("productName"), "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_not_configured_correctly", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); } @@ -492,20 +492,20 @@ if ("ASSET_USAGE".equals(product.getString("productTypeId"))) { if (reservStart == null) { String excMsg = UtilProperties.getMessage(resource_error, "item.missing_reservation_starting_date", - cart.getLocale() ); + cart.getLocale()); throw new CartItemModifyException(excMsg); } if (reservStart.before(UtilDateTime.nowTimestamp())) { String excMsg = UtilProperties.getMessage(resource_error, "item.reservation_from_tomorrow", - cart.getLocale() ); + cart.getLocale()); throw new CartItemModifyException(excMsg); } newItem.setReservStart(reservStart); if (reservLength.compareTo(BigDecimal.ONE) < 0) { String excMsg = UtilProperties.getMessage(resource_error, "item.number_of_days", - cart.getLocale() ); + cart.getLocale()); throw new CartItemModifyException(excMsg); } newItem.setReservLength(reservLength); @@ -516,7 +516,7 @@ Map messageMap = UtilMisc.toMap("reservMaxPersons", product.getString("reservMaxPersons"), "reservPersons", reservPersons); String excMsg = UtilProperties.getMessage(resource_error, "item.maximum_number_of_person_renting", - messageMap, cart.getLocale() ); + messageMap, cart.getLocale()); Debug.logInfo(excMsg,module); throw new CartItemModifyException(excMsg); @@ -540,7 +540,7 @@ Map messageMap = UtilMisc.toMap("productId", product.getString("productId"), "availableMessage", isAvailable); String excMsg = UtilProperties.getMessage(resource_error, "item.product_not_available", - messageMap, cart.getLocale() ); + messageMap, cart.getLocale()); Debug.logInfo(excMsg, module); throw new CartItemModifyException(isAvailable); } @@ -921,7 +921,7 @@ } catch (GenericEntityException e) { Debug.logWarning(e, module); } - if (techDataCalendarExcDay == null ) { + if (techDataCalendarExcDay == null) { //Debug.logInfo(" No exception day record found, available: " + fixedAsset.getString("productionCapacity") + " Requested now: " + quantity, module); if (fixedAsset.get("productionCapacity") != null && fixedAsset.getBigDecimal("productionCapacity").compareTo(quantity) < 0) resultMessage = resultMessage.concat(exceptionDateStartTime.toString().substring(0, 10) + ", "); @@ -983,7 +983,7 @@ if (this.isPromo) { Map messageMap = UtilMisc.toMap("productName", this.getName(), "productId", productId); - String excMsg = UtilProperties.getMessage(resource, "OrderCannotChangeQuantityInPromotion", messageMap , cart.getLocale() ); + String excMsg = UtilProperties.getMessage(resource, "OrderCannotChangeQuantityInPromotion", messageMap , cart.getLocale()); throw new CartItemModifyException(excMsg); } @@ -997,7 +997,7 @@ Map messageMap = UtilMisc.toMap("requestedQuantity", UtilFormatOut.formatQuantity(quantity.doubleValue()), "productName", this.getName(), "productId", productId); - String excMsg = UtilProperties.getMessage(resource, "OrderDoNotHaveEnoughProducts", messageMap , cart.getLocale() ); + String excMsg = UtilProperties.getMessage(resource, "OrderDoNotHaveEnoughProducts", messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); } @@ -1846,7 +1846,7 @@ BigDecimal[] sizeInfo = { height, width, depth }; Arrays.sort(sizeInfo); - return ( sizeInfo[0].add(sizeInfo[0]) ).add( sizeInfo[1].add(sizeInfo[1]) ).add(sizeInfo[2]); + return (sizeInfo[0].add(sizeInfo[0])).add(sizeInfo[1].add(sizeInfo[1])).add(sizeInfo[2]); } else { // non-product items have 0 size return BigDecimal.ZERO; @@ -1970,7 +1970,7 @@ BigDecimal persons = this.getReservPersons(); BigDecimal rentalValue = BigDecimal.ZERO; if (persons.compareTo(BigDecimal.ONE) > 0) { - if (persons.compareTo(new BigDecimal("2")) > 0 ) { + if (persons.compareTo(new BigDecimal("2")) > 0) { persons = persons.subtract(new BigDecimal("2")); if (getReservNthPPPerc().compareTo(BigDecimal.ZERO) > 0) { rentalValue = persons.multiply(getReservNthPPPerc()); @@ -1984,7 +1984,7 @@ } } rentalValue = rentalValue.add(new BigDecimal("100")); // add final 100 percent for first person - // Debug.log("rental parameters....Nbr of persons:" + getReservPersons() + " extra% 2nd person:" + getReserv2ndPPPerc()+ " extra% Nth person:" + getReservNthPPPerc() + " total rental adjustment:" + rentalValue/100 * getReservLength() ); + // Debug.log("rental parameters....Nbr of persons:" + getReservPersons() + " extra% 2nd person:" + getReserv2ndPPPerc()+ " extra% Nth person:" + getReservNthPPPerc() + " total rental adjustment:" + rentalValue/100 * getReservLength()); return rentalValue.movePointLeft(2).multiply(getReservLength()); // return total rental adjustment } @@ -2326,8 +2326,8 @@ } if ((this.attributes != null && attributes != null) && - ( (this.attributes.size() != attributes.size()) || - !(this.attributes.equals(attributes)) )) { + ((this.attributes.size() != attributes.size()) || + !(this.attributes.equals(attributes)))) { return false; } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java Mon Aug 17 08:20:38 2009 @@ -293,7 +293,7 @@ serviceName = null; } } - if (( serviceName != null)) { + if ((serviceName != null)) { String configProps = storeShipMeth.getString("configProps"); if (UtilValidate.isNotEmpty(serviceName)) { // prepare the external service context @@ -335,7 +335,7 @@ EntityCondition.makeCondition("contactMechPurposeTypeId", EntityOperator.IN, UtilMisc.toList("SHIP_ORIG_LOCATION", "GENERAL_LOCATION")), EntityUtil.getFilterByDateExpr("contactFromDate", "contactThruDate"), EntityUtil.getFilterByDateExpr("purposeFromDate", "purposeThruDate") - ); + ); EntityConditionList<EntityCondition> ecl = EntityCondition.makeCondition(conditions, EntityOperator.AND); List<GenericValue> addresses = delegator.findList("PartyContactWithPurpose", ecl, null, UtilMisc.toList("contactMechPurposeTypeId DESC"), null, false); Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Mon Aug 17 08:20:38 2009 @@ -247,7 +247,7 @@ sendEmailToContactListContext.put("userLogin", userLogin); try { dispatcher.runAsync("sendEmailToContactList", sendEmailToContactListContext); - } catch ( GenericServiceException e ) { + } catch (GenericServiceException e) { String errMsg = UtilProperties.getMessage(resource, "commeventservices.errorCallingSendEmailToContactListService", locale); Debug.logError(e, errMsg, module); errorMessages.add(errMsg); @@ -779,7 +779,7 @@ } } - if (messageBody == null ) { + if (messageBody == null) { messageBody = wrapper.getMessageBody(); } Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java Mon Aug 17 08:20:38 2009 @@ -972,7 +972,7 @@ GenericDelegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String partyId = (String)context.get("partyId"); - if (UtilValidate.isEmpty(partyId) ) { + if (UtilValidate.isEmpty(partyId)) { if (userLogin != null) { partyId = userLogin.getString("partyId"); } else { @@ -983,7 +983,7 @@ boolean showOld = (bShowOld != null && bShowOld.booleanValue()) ? true : false; String contactMechTypeId = (String)context.get("contactMechTypeId"); List<Map<String, Object>> valueMaps = ContactMechWorker.getPartyContactMechValueMaps(delegator, partyId, showOld, contactMechTypeId); - result.put("valueMaps", valueMaps ); + result.put("valueMaps", valueMaps); return result; } Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java Mon Aug 17 08:20:38 2009 @@ -389,7 +389,7 @@ partyList.addAll(associatedParties); while (UtilValidate.isNotEmpty(associatedParties)) { List<GenericValue> currentAssociatedParties = FastList.newInstance(); - for (GenericValue associatedParty : associatedParties ) { + for (GenericValue associatedParty : associatedParties) { EntityConditionList innerExprs = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("partyIdFrom", associatedParty.get("partyIdTo")), EntityCondition.makeCondition("partyRelationshipTypeId", partyRelationshipTypeId)), EntityOperator.AND); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java Mon Aug 17 08:20:38 2009 @@ -470,7 +470,7 @@ catContentWrappers.put(productCategoryId, catContentWrapper); List<GenericValue> subCat = getRelatedCategoriesRet(request, "subCatList", productCategoryId, true); if (subCat != null) { - getCategoryContentWrappers(catContentWrappers, subCat, request ); + getCategoryContentWrappers(catContentWrappers, subCat, request); } } } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Mon Aug 17 08:20:38 2009 @@ -486,7 +486,7 @@ if (UtilValidate.isNotEmpty(defaultConfigOptionId)) { for(ConfigOption oneOption : getOptions()) { String currentConfigOptionId = oneOption.getId(); - if (defaultConfigOptionId.compareToIgnoreCase(currentConfigOptionId) == 0 ) { + if (defaultConfigOptionId.compareToIgnoreCase(currentConfigOptionId) == 0 ) { return oneOption; } } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Mon Aug 17 08:20:38 2009 @@ -919,7 +919,7 @@ EntityCondition.makeCondition("statusId", EntityOperator.IN, UtilMisc.toList("ORDER_COMPLETED", "ORDER_APPROVED", "ORDER_HELD")), EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, "SALES_ORDER"), EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, checkTime) - ), + ), EntityOperator.AND), null, null, null, null); } catch (GenericEntityException e2) { @@ -956,7 +956,7 @@ EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId), EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "PROD_ORDER_TASK"), EntityCondition.makeCondition("actualCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, checkTime) - ), + ), EntityOperator.AND), null, null, null, null); } catch (GenericEntityException e1) { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java Mon Aug 17 08:20:38 2009 @@ -112,7 +112,7 @@ EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_COMPLETED"), EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED"), EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED") - ); + ); if (productIds.size() > 0) { condList.add(EntityCondition.makeCondition("productId", EntityOperator.IN, productIds)); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java Mon Aug 17 08:20:38 2009 @@ -687,19 +687,19 @@ BigDecimal taxPercentage = (BigDecimal) calcTaxForDisplayResult.get("taxPercentage"); BigDecimal taxMultiplier = ONE_BASE.add(taxPercentage.divide(PERCENT_SCALE, taxCalcScale)); if (result.get("listPrice") != null) { - result.put("listPrice", ((BigDecimal) result.get("listPrice")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("listPrice", ((BigDecimal) result.get("listPrice")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } if (result.get("defaultPrice") != null) { - result.put("defaultPrice", ((BigDecimal) result.get("defaultPrice")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("defaultPrice", ((BigDecimal) result.get("defaultPrice")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } if (result.get("averageCost") != null) { - result.put("averageCost", ((BigDecimal) result.get("averageCost")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("averageCost", ((BigDecimal) result.get("averageCost")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } if (result.get("promoPrice") != null) { - result.put("promoPrice", ((BigDecimal) result.get("promoPrice")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("promoPrice", ((BigDecimal) result.get("promoPrice")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } if (result.get("competitivePrice") != null) { - result.put("competitivePrice", ((BigDecimal) result.get("competitivePrice")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("competitivePrice", ((BigDecimal) result.get("competitivePrice")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } } catch (GenericServiceException e) { String errMsg = "Error calculating VAT tax (with calcTaxForDisplay service): " + e.toString(); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java Mon Aug 17 08:20:38 2009 @@ -183,7 +183,7 @@ Map<String, String> messageMap = UtilMisc.toMap("numProds", Integer.toString(numProds)); messageMap.put("errProds", Integer.toString(errProds)); errMsg = UtilProperties.getMessage(resource,"productevents.keyword_creation_complete_for_products_with_errors", messageMap, UtilHttp.getLocale(request)); - request.setAttribute( "_ERROR_MESSAGE_", errMsg); + request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java Mon Aug 17 08:20:38 2009 @@ -80,7 +80,7 @@ GenericValue searchResultView = null; while ((searchResultView = eli.next()) != null) { String productId = searchResultView.getString("mainProductId"); - numRemoved += delegator.removeByAnd("ProductCategoryMember", UtilMisc.toMap("productCategoryId", productCategoryId, "productId", productId )) ; + numRemoved += delegator.removeByAnd("ProductCategoryMember", UtilMisc.toMap("productCategoryId", productCategoryId, "productId", productId)) ; } eli.close(); Map<String, String> messageMap = UtilMisc.toMap("numRemoved", Integer.toString(numRemoved)); @@ -143,7 +143,7 @@ while ((searchResultView = eli.next()) != null) { String productId = searchResultView.getString("mainProductId"); //get all tuples that match product and category - List<GenericValue> pcmList = delegator.findByAnd("ProductCategoryMember", UtilMisc.toMap("productCategoryId", productCategoryId, "productId", productId )); + List<GenericValue> pcmList = delegator.findByAnd("ProductCategoryMember", UtilMisc.toMap("productCategoryId", productCategoryId, "productId", productId)); //set those thrudate to that specificed maybe remove then add new one for (GenericValue pcm: pcmList) { @@ -413,14 +413,14 @@ String productId = searchResultView.getString("mainProductId"); productMap.put("productId", productId); - List<GenericValue> productFeaturesCustomRaw = delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId, "productFeatureTypeId", "HAZMAT") ); + List<GenericValue> productFeaturesCustomRaw = delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId, "productFeatureTypeId", "HAZMAT")); List<GenericValue> productFeaturesCustom = EntityUtil.filterByDate(productFeaturesCustomRaw); productMap.put("productFeatureCustom", EntityUtil.getFirst(productFeaturesCustom)); List<GenericValue> productCategoriesRaw = delegator.findByAnd("ProductCategoryAndMember", UtilMisc.toMap("productId", productId)); List<GenericValue> productCategories = EntityUtil.filterByDate(productCategoriesRaw); productMap.put("productCategories", productCategories); - List<GenericValue> productFeaturesRaw = delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId) ); + List<GenericValue> productFeaturesRaw = delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId)); List<GenericValue> productFeatures = EntityUtil.filterByDate(productFeaturesRaw); productMap.put("productFeatures", productFeatures); productExportList.add(productMap); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Mon Aug 17 08:20:38 2009 @@ -481,7 +481,7 @@ UtilMisc.toList( EntityCondition.makeCondition("productId", productId), EntityCondition.makeCondition("productIdTo", productId) - ), EntityJoinOperator.OR); + ), EntityJoinOperator.OR); cond = EntityCondition.makeCondition(cond, EntityCondition.makeCondition("productAssocTypeId", type)); productAssocs = delegator.findList("ProductAssoc", cond, null, orderBy, null, true); } else { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java Mon Aug 17 08:20:38 2009 @@ -70,7 +70,7 @@ EntityCondition.makeCondition("isVariant", EntityOperator.EQUALS, "Y"), EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.NOT_EQUAL, null), EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator eliOne = delegator.find("Product", conditionOne, null, null, null, null); GenericValue productOne = null; int numSoFarOne = 0; @@ -100,7 +100,7 @@ EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("isVirtual", EntityOperator.EQUALS, "Y"), EntityCondition.makeCondition(EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator eli = delegator.find("Product", condition, null, null, null, null); GenericValue product = null; int numSoFar = 0; @@ -138,7 +138,7 @@ EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.NOT_EQUAL, null), EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator eli = delegator.find("Product", condition, null, null, null, null); GenericValue product = null; int numSoFar = 0; @@ -186,7 +186,7 @@ EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN, nowTimestamp), EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityCondition havingCond = EntityCondition.makeCondition("productIdCount", EntityOperator.GREATER_THAN, Long.valueOf(1)); EntityListIterator eli = delegator.findListIteratorByCondition(dve, condition, havingCond, UtilMisc.toList("productId", "productCategoryId", "productIdCount"), null, null); GenericValue pcm = null; @@ -245,7 +245,7 @@ EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("productAssocTypeId", EntityOperator.EQUALS, "PRODUCT_VARIANT"), EntityCondition.makeCondition(EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityCondition havingCond = EntityCondition.makeCondition("productIdToCount", EntityOperator.EQUALS, Long.valueOf(1)); EntityListIterator eliOne = delegator.findListIteratorByCondition(dve, condition, havingCond, UtilMisc.toList("productId", "productIdToCount"), null, null); List<GenericValue> valueList = eliOne.getCompleteList(); @@ -281,7 +281,7 @@ EntityCondition.makeCondition(EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN, nowTimestamp)), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator eliMulti = delegator.findListIteratorByCondition(dve, conditionWithDates, havingCond, UtilMisc.toList("productId", "productIdToCount"), null, null); List<GenericValue> valueMultiList = eliMulti.getCompleteList(); eliMulti.close(); @@ -665,7 +665,7 @@ EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator productFeatureAndApplEli = delegator.find("ProductFeatureAndAppl", condition, null, null, null, null); GenericValue productFeatureAndAppl = null; while ((productFeatureAndAppl = (GenericValue) productFeatureAndApplEli.next()) != null) { @@ -715,7 +715,7 @@ EntityCondition.makeCondition("productFeatureGroupId", EntityOperator.EQUALS, productFeatureGroupId), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); if (delegator.findCountByCondition("ProductFeatureGroupAppl", condition, null, null) == 0) { // if no valid ones, create one GenericValue productFeatureGroupAppl = delegator.makeValue("ProductFeatureGroupAppl", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId, "productFeatureId", productFeatureId, "fromDate", nowTimestamp)); @@ -731,7 +731,7 @@ EntityCondition.makeCondition("productCategoryId", EntityOperator.EQUALS, subProductCategoryId), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator productFeatureCatGrpApplEli = delegator.find("ProductFeatureCatGrpAppl", condition, null, null, null, null); GenericValue productFeatureCatGrpAppl = null; while ((productFeatureCatGrpAppl = productFeatureCatGrpApplEli.next()) != null) { @@ -741,7 +741,7 @@ EntityCondition.makeCondition("productFeatureGroupId", EntityOperator.EQUALS, productFeatureGroupId), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); if (delegator.findCountByCondition("ProductFeatureCatGrpAppl", checkCondition, null, null) == 0) { // if no valid ones, create one GenericValue productFeatureGroupAppl = delegator.makeValue("ProductFeatureCatGrpAppl", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId, "productCategoryId", productCategoryId, "fromDate", nowTimestamp)); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java Mon Aug 17 08:20:38 2009 @@ -892,7 +892,7 @@ * @return * @throws GenericEntityException */ - public static List<GenericValue> findProductsById( GenericDelegator delegator, + public static List<GenericValue> findProductsById(GenericDelegator delegator, String idToFind, String goodIdentificationTypeId, boolean searchProductFirst, boolean searchAllId) throws GenericEntityException { @@ -927,7 +927,7 @@ return productsFound; } - public static List<GenericValue> findProductsById( GenericDelegator delegator, String idToFind, String goodIdentificationTypeId) + public static List<GenericValue> findProductsById(GenericDelegator delegator, String idToFind, String goodIdentificationTypeId) throws GenericEntityException { return findProductsById(delegator, idToFind, goodIdentificationTypeId, true, false); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java Mon Aug 17 08:20:38 2009 @@ -229,7 +229,7 @@ GenericValue orderHeader = null; try { List<GenericValue> orderRoleList = delegator.findByAnd("OrderRole", UtilMisc.toMap("orderId", orderId, "roleTypeId", "END_USER_CUSTOMER")); - if (orderRoleList.size() > 0 ) { + if (orderRoleList.size() > 0) { GenericValue orderRole = orderRoleList.get(0); String partyId = (String) orderRole.get("partyId"); subContext.put("partyId", partyId); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java Mon Aug 17 08:20:38 2009 @@ -53,7 +53,7 @@ String statusId = "IXF_REQUESTED"; String inventoryItemId = "9005"; ctx.put("inventoryItemId", inventoryItemId); - ctx.put("statusId", statusId ); + ctx.put("statusId", statusId); ctx.put("facilityId", "WebStoreWarehouse"); ctx.put("facilityIdTo", "WebStoreWarehouse"); ctx.put("receiveDate", UtilDateTime.nowTimestamp()); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java Mon Aug 17 08:20:38 2009 @@ -72,7 +72,7 @@ Map<String, Object> ppsmCtx = FastMap.newInstance(); ppsmCtx.put("productId", "GZ-2644"); ppsmCtx.put("facilityId", "WebStoreWarehouse"); - ppsmCtx.put("locationSeqId","TLTLTLUL01" ); + ppsmCtx.put("locationSeqId","TLTLTLUL01"); ppsmCtx.put("targetLocationSeqId", "TLTLTLLL01"); ppsmCtx.put("quantityMoved", new BigDecimal("5")); ppsmCtx.put("userLogin", userLogin); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Mon Aug 17 08:20:38 2009 @@ -413,7 +413,7 @@ } BigDecimal total = BigDecimal.ZERO; - if (productId != null ) { + if (productId != null) { for (PackingSessionLine line: this.getLines()) { if (productId.equals(line.getProductId())) { if (packageSeq == -1 || packageSeq == line.getPackageSeq()) { @@ -918,9 +918,9 @@ serviceContext.put("shippableTotal", shippableTotal); serviceResult = getDispatcher().runSync("calcShipmentCostEstimate", serviceContext); - } catch ( GenericEntityException e ) { + } catch (GenericEntityException e) { Debug.logError(e, module); - } catch ( GenericServiceException e ) { + } catch (GenericServiceException e) { Debug.logError(e, module); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Mon Aug 17 08:20:38 2009 @@ -184,7 +184,7 @@ } storeAll.add(0, weightBreak); } - catch ( Exception e ) { + catch (Exception e) { Debug.logError(e, module); } } @@ -284,7 +284,7 @@ Debug.logError(e, module); return ServiceUtil.returnError("Cannot get shipping address entity"); } - } else if ( shippingPostalCode != null) { + } else if (shippingPostalCode != null) { shipAddress = delegator.makeValue("PostalAddress"); shipAddress.set("countryGeoId", shippingCountryCode); shipAddress.set("postalCodeGeoId", shippingPostalCode); @@ -541,7 +541,7 @@ Debug.logError(e, "Unable to lookup feature/group" + fields, module); } if (appl != null) { - featureSurcharge = featureSurcharge.add( shippableTotal.multiply( featurePercent.movePointLeft(2) ).multiply(quantity) ); + featureSurcharge = featureSurcharge.add(shippableTotal.multiply(featurePercent.movePointLeft(2)).multiply(quantity)); featureSurcharge = featureSurcharge.add(featurePrice.multiply(quantity)); } } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java Mon Aug 17 08:20:38 2009 @@ -90,7 +90,7 @@ // xmlString should contain the auth document at the beginning // all documents require an <?xml version="1.0" encoding="UTF-8" ?> header - if (! xmlString.matches( "^(?s)<\\?xml\\s+version=\"1\\.0\"\\s+encoding=\"UTF-8\"\\s*\\?>.*")) { + if (! xmlString.matches("^(?s)<\\?xml\\s+version=\"1\\.0\"\\s+encoding=\"UTF-8\"\\s*\\?>.*")) { throw new FedexConnectException("XML header is malformed"); } @@ -115,7 +115,7 @@ String response = null; try { response = http.post(xmlString); - } catch ( HttpClientException e) { + } catch (HttpClientException e) { Debug.logError(e, "Problem connecting to Fedex server", module); throw new FedexConnectException("URL Connection problem", e); } @@ -133,7 +133,7 @@ /* * Register a Fedex account for shipping by obtaining the meter number */ - public static Map<String, Object> fedexSubscriptionRequest( DispatchContext dctx, Map<String, ? extends Object> context) { + public static Map<String, Object> fedexSubscriptionRequest(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); List<Object> errorList = FastList.newInstance(); @@ -332,11 +332,11 @@ try { fDXSubscriptionReplyDocument = UtilXml.readXmlDocument(fDXSubscriptionReplyString, false); Debug.log("Fedex response for FDXSubscriptionRequest:" + fDXSubscriptionReplyString); - } catch ( SAXException se) { + } catch (SAXException se) { String errorMessage = "Error parsing the FDXSubscriptionRequest response: " + se.toString(); Debug.logError(se, errorMessage, module); return ServiceUtil.returnError(errorMessage); - } catch ( ParserConfigurationException pce) { + } catch (ParserConfigurationException pce) { String errorMessage = "Error parsing the FDXSubscriptionRequest response: " + pce.toString(); Debug.logError(pce, errorMessage, module); return ServiceUtil.returnError(errorMessage); @@ -357,7 +357,7 @@ result.put("meterNumber", meterNumber); - } catch ( GenericEntityException e ) { + } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); } @@ -369,7 +369,7 @@ * * Send a FDXShipRequest via the Ship Manager Direct API */ - public static Map<String, Object> fedexShipRequest( DispatchContext dctx, Map<String, ? extends Object> context) { + public static Map<String, Object> fedexShipRequest(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); //GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -530,7 +530,7 @@ String originContactKey = "PERSON".equals(partyFrom.getString("partyTypeId")) ? "OriginContactPersonName" : "OriginContactCompanyName"; String originContactName = PartyHelper.getPartyName(partyFrom, false); if (UtilValidate.isEmpty(originContactName)) { - return ServiceUtil.returnError("partyIdFrom for shipmentId " + shipmentId + ", shipmentRouteSegmentId " + shipmentRouteSegmentId + " has no name (required for Fedex shipments)" ); + return ServiceUtil.returnError("partyIdFrom for shipmentId " + shipmentId + ", shipmentRouteSegmentId " + shipmentRouteSegmentId + " has no name (required for Fedex shipments)"); } // Get and validate destination postal address @@ -581,7 +581,7 @@ String destinationContactKey = "PERSON".equals(partyTo.getString("partyTypeId")) ? "DestinationContactPersonName" : "DestinationContactCompanyName"; String destinationContactName = PartyHelper.getPartyName(partyTo, false); if (UtilValidate.isEmpty(destinationContactName)) { - return ServiceUtil.returnError("partyTo for shipmentId " + shipmentId + ", shipmentRouteSegmentId " + shipmentRouteSegmentId + " has no name (required for Fedex shipments)" ); + return ServiceUtil.returnError("partyTo for shipmentId " + shipmentId + ", shipmentRouteSegmentId " + shipmentRouteSegmentId + " has no name (required for Fedex shipments)"); } String homeDeliveryType = null; @@ -808,7 +808,7 @@ if (UtilValidate.isNotEmpty(dimensionsUomId) && dimensionsLength != null && dimensionsLength.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 && dimensionsWidth != null && dimensionsWidth.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 && - dimensionsHeight != null && dimensionsHeight.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 ) { + dimensionsHeight != null && dimensionsHeight.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0) { shipRequestContext.put("DimensionsUnits", dimensionsUomId.equals("LEN_in") ? "IN" : "CM"); shipRequestContext.put("DimensionsLength", dimensionsLength.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); shipRequestContext.put("DimensionsWidth", dimensionsWidth.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); @@ -843,10 +843,10 @@ // Pass the reply to the handler method return handleFedexShipReply(fDXShipReplyString, shipmentRouteSegment, shipmentPackageRouteSegs); - } catch ( GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError("Error in fedexShipRequest service: " + e.toString()); - } catch ( GenericServiceException se) { + } catch (GenericServiceException se) { Debug.logError(se, module); return ServiceUtil.returnError("Error in fedexShipRequest service: " + se.toString()); } @@ -939,7 +939,7 @@ Element errorMessageElement = UtilXml.firstChildElement(errorElement, "Message"); if (errorCodeElement != null || errorMessageElement != null) { String errorCode = UtilXml.childElementValue(errorElement, "Code"); - String errorMessage = UtilXml.childElementValue( errorElement, "Message"); + String errorMessage = UtilXml.childElementValue(errorElement, "Message"); if (UtilValidate.isNotEmpty(errorCode) || UtilValidate.isNotEmpty(errorMessage)) { String errMsg = "An error occurred [code: " + errorCode + " [Description: " + errorMessage + "]."; errorList.add(errMsg); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Mon Aug 17 08:20:38 2009 @@ -1627,7 +1627,7 @@ GenericValue destCountryGeo = null; try { destCountryGeo = shipToAddress.getRelatedOne("CountryGeo"); - } catch ( GenericEntityException e ) { + } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); } @@ -1639,7 +1639,7 @@ cxt.put("carrierPartyId", context.get("carrierPartyId")); cxt.put("shipmentMethodTypeId", context.get("shipmentMethodTypeId")); cxt.put("shippingPostalCode", shipToAddress.getString("postalCode")); - cxt.put("shippingCountryCode",destCountryGeo.getString("geoCode") ); + cxt.put("shippingCountryCode",destCountryGeo.getString("geoCode")); cxt.put("packageWeights", context.get("packageWeights")); cxt.put("shippableItemInfo", context.get("shippableItemInfo")); cxt.put("shippableTotal", context.get("shippableTotal")); @@ -1695,7 +1695,7 @@ String productId = i.next(); Map<String, Object> productInfo = getProductItemInfo(shippableItemInfo, productId); if (productInfo.get("inShippingBox") != null && ((String) productInfo.get("inShippingBox")).equalsIgnoreCase("Y") - && productInfo.get("shippingDepth") !=null && productInfo.get("shippingWidth") !=null && productInfo.get("shippingHeight") !=null ) { + && productInfo.get("shippingDepth") !=null && productInfo.get("shippingWidth") !=null && productInfo.get("shippingHeight") !=null) { Element dimensionsElement = UtilXml.addChildElement(packageElement, "Dimensions", requestDoc); UtilXml.addChildElementValue(dimensionsElement, "Length", productInfo.get("shippingDepth").toString(), requestDoc); UtilXml.addChildElementValue(dimensionsElement, "Width", productInfo.get("shippingWidth").toString(), requestDoc); 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=804895&r1=804894&r2=804895&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 Mon Aug 17 08:20:38 2009 @@ -621,7 +621,7 @@ String state = (String) context.get("state"); String city = (String) context.get("city"); String zip5 = (String) context.get("zip5"); - if ( (UtilValidate.isEmpty(state) && UtilValidate.isEmpty(city) && UtilValidate.isEmpty(zip5)) || // No state, city or zip5 + if ((UtilValidate.isEmpty(state) && UtilValidate.isEmpty(city) && UtilValidate.isEmpty(zip5)) || // No state, city or zip5 (UtilValidate.isEmpty(zip5) && (UtilValidate.isEmpty(state) || UtilValidate.isEmpty(city)))) { // Both state and city are required if no zip5 String errorMessage = UtilProperties.getMessage(errorResource, "ProductUspsAddressValidationStateAndCityOrZipRqd", (Locale) context.get("locale")); Debug.logError(errorMessage, module); @@ -1573,7 +1573,7 @@ shipmentRouteSegment.get("shipmentId"), shipmentPackageRouteSeg.get("shipmentPackageSeqId"), shipmentRouteSegment.get("shipmentRouteSegementId") - ), ':'); + ), ':'); UtilXml.addChildElementValue(rootElement, "FromCustomsReference", fromCustomsReference, packageDocument); // Determine the container type for this package String container = "VARIABLE"; 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=804895&r1=804894&r2=804895&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 Mon Aug 17 08:20:38 2009 @@ -358,7 +358,7 @@ verifiedQty = verifiedQty.add(pickRow.getReadyToVerifyQty()); } - if (orderedQty.compareTo(verifiedQty) != 0 ) { + if (orderedQty.compareTo(verifiedQty) != 0) { throw new GeneralException(UtilProperties.getMessage("ProductErrorUiLabels", "ProductErrorAllOrderItemsAreNotVerified", locale)); } } 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=804895&r1=804894&r2=804895&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 Mon Aug 17 08:20:38 2009 @@ -516,7 +516,7 @@ } shipCostEstimateMap.put("shippableTotal", shippableTotal); shipCostEstimateResult = getDispatcher().runSync("calcShipmentCostEstimate", shipCostEstimateMap); - } catch ( GeneralException e ) { + } catch (GeneralException e) { Debug.logError(e, module); } if (UtilValidate.isNotEmpty(shipCostEstimateResult.get("shippingEstimateAmount"))) { 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=804895&r1=804894&r2=804895&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 Mon Aug 17 08:20:38 2009 @@ -823,7 +823,7 @@ if ("TASK".equals(workEffortTypeId) || (typeValue != null && "TASK".equals(typeValue.get("parentTypeId")))) { isTask = true; resultList = components.getComponents("VTODO"); - } else if ("EVENT".equals(workEffortTypeId) || (typeValue != null && "EVENT".equals(typeValue.get("parentTypeId")))){ + } else if ("EVENT".equals(workEffortTypeId) || (typeValue != null && "EVENT".equals(typeValue.get("parentTypeId")))) { resultList = components.getComponents("VEVENT"); } else { return null; Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Mon Aug 17 08:20:38 2009 @@ -218,7 +218,7 @@ } // add a WorkEfort fromDate thruDate to the search - if (UtilValidate.isNotEmpty((String) parameters.get("fromDate")) || UtilValidate.isNotEmpty((String) parameters.get("thruDate")) ) { + if (UtilValidate.isNotEmpty((String) parameters.get("fromDate")) || UtilValidate.isNotEmpty((String) parameters.get("thruDate"))) { Timestamp fromDate =null; if (UtilValidate.isNotEmpty((String) parameters.get("fromDate"))) { fromDate=Timestamp.valueOf((String) parameters.get("fromDate")); 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=804895&r1=804894&r2=804895&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 Mon Aug 17 08:20:38 2009 @@ -84,10 +84,10 @@ EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_DELEGATED"), EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_COMPLETED"), EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_CANCELLED") - ); + ); validWorkEfforts = EntityUtil.filterByDate( delegator.findList("WorkEffortAndPartyAssign", ecl, null, UtilMisc.toList("estimatedStartDate", "priority"), null, false) - ); + ); } catch (GenericEntityException e) { Debug.logWarning(e, module); return ServiceUtil.returnError("Error finding desired WorkEffort records: " + e.toString()); @@ -120,7 +120,7 @@ EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(conditionList, EntityOperator.AND); validWorkEfforts = EntityUtil.filterByDate( delegator.findList("WorkEffortAndPartyAssign", ecl, null, UtilMisc.toList("estimatedStartDate", "priority"), null, false) - ); + ); } catch (GenericEntityException e) { Debug.logWarning(e, module); return ServiceUtil.returnError("Error finding desired WorkEffort records: " + e.toString()); @@ -232,7 +232,7 @@ EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(constraints); roleWorkEfforts = EntityUtil.filterByDate( delegator.findList("WorkEffortPartyAssignByRole", ecl, null, UtilMisc.toList("priority"), null, false) - ); + ); } catch (GenericEntityException e) { Debug.logWarning(e, module); return ServiceUtil.returnError("Error finding desired WorkEffort records: " + e.toString()); @@ -269,7 +269,7 @@ EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(constraints); groupWorkEfforts = EntityUtil.filterByDate( delegator.findList("WorkEffortPartyAssignByGroup", ecl, null, UtilMisc.toList("priority"), null, false) - ); + ); } catch (GenericEntityException e) { Debug.logWarning(e, module); return ServiceUtil.returnError("Error finding desired WorkEffort records: " + e.toString()); @@ -672,7 +672,7 @@ startDate = workEffort.getTimestamp("actualStartDate"); } Timestamp endDate = workEffort.getTimestamp("estimatedCompletionDate"); - if (workEffort.getTimestamp("actualCompletionDate") != null){ + if (workEffort.getTimestamp("actualCompletionDate") != null) { endDate = workEffort.getTimestamp("actualCompletionDate"); } if (endDate == null) endDate = startDate; Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java Mon Aug 17 08:20:38 2009 @@ -418,11 +418,11 @@ private static char[] hexChar = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; public static int convertChar(char c) { - if ( '0' <= c && c <= '9' ) { + if ('0' <= c && c <= '9') { return c - '0' ; - } else if ( 'a' <= c && c <= 'f' ) { + } else if ('a' <= c && c <= 'f') { return c - 'a' + 0xa ; - } else if ( 'A' <= c && c <= 'F' ) { + } else if ('A' <= c && c <= 'F') { return c - 'A' + 0xa ; } else { throw new IllegalArgumentException("Invalid hex character: [" + c + "]"); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java Mon Aug 17 08:20:38 2009 @@ -142,7 +142,7 @@ throw new IllegalArgumentException("You must pass an even sized array to the toMap method"); } Map<K, V> map = FastMap.newInstance(); - for (int i = 0; i < data.length; ) { + for (int i = 0; i < data.length;) { Object key = data[i]; if (key != null && !(keyType.isInstance(key))) throw new IllegalArgumentException("Key(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); i++; @@ -163,7 +163,7 @@ throw new IllegalArgumentException("You must pass an even sized array to the toMap method"); } Map<K, Object> map = FastMap.newInstance(); - for (int i = 0; i < data.length; ) { + for (int i = 0; i < data.length;) { Object key = data[i]; if (key != null && !(keyType.isInstance(key))) throw new IllegalArgumentException("Key(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); i++; Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java Mon Aug 17 08:20:38 2009 @@ -1179,7 +1179,7 @@ // collect the composite fields into a map Map<String, String> data = FastMap.newInstance(); - for (Enumeration names = request.getParameterNames(); names.hasMoreElements(); ) { + for (Enumeration names = request.getParameterNames(); names.hasMoreElements();) { String name = (String) names.nextElement(); if (!name.startsWith(prefix + COMPOSITE_DELIMITER)) continue; Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java?rev=804895&r1=804894&r2=804895&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java Mon Aug 17 08:20:38 2009 @@ -84,8 +84,8 @@ if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " (DispatchContext "); - if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "( DispatchContext "); - if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " ( DispatchContext "); + if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); + if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " (DispatchContext "); // not found! if (methodNameIndex < 0) return -1; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |