svn commit: r751004 - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r751004 - in /ofbiz/trunk: applications/accounting/src/or
 
|
Author: jleroux
Date: Fri Mar 6 17:51:02 2009 New Revision: 751004 URL: http://svn.apache.org/viewvc?rev=751004&view=rev Log: }else{ => } else { Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AuthorizeResponse.java ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AuthorizeResponse.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AuthorizeResponse.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AuthorizeResponse.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AuthorizeResponse.java Fri Mar 6 17:51:02 2009 @@ -161,7 +161,7 @@ s2 = r.indexOf(delim, s1); if (s2 != -1) { out.add(r.substring(s1, s2)); - }else{ + } else { //the end part of the string (string not pattern terminated) String _ = r.substring(s1); if (_ != null && !_.equals("")) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java Fri Mar 6 17:51:02 2009 @@ -165,7 +165,7 @@ } } } - }else{ + } else { rootContent = "HOME_DUCUMENT"; contentAssocs= delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId",contentId, "contentIdTo", rootContent)); @@ -189,7 +189,7 @@ Entity.set("createdTxStamp",UtilDateTime.nowTimestamp()); delegator.create(Entity); hasFolder = false; - }else{ + } else { //Debug.log("Content Name = [ "+contentId+"] already exist.");//ShoW log file hasFolder = true; } @@ -207,7 +207,7 @@ contentAssoc.put("userLogin", userLogin); dispatcher.runSync("createContentAssoc", contentAssoc); rootContent=contentId; - }else{ + } else { //Debug.log("ContentAssoc [contentId= "+contentId+",contentIdTo="+rootContent+"] already exist.");//ShoW log file rootContent=contentId; } 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=751004&r1=751003&r2=751004&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 Fri Mar 6 17:51:02 2009 @@ -1499,7 +1499,7 @@ Debug.logError("Change Amount : " + changeAmount + " / No cash.", module); errMsg = UtilProperties.getMessage(resource_error, "checkhelper.change_returned_cannot_be_greater_than_cash", (cart != null ? cart.getLocale() : Locale.getDefault())); return ServiceUtil.returnError(errMsg); - }else{ + } else { int cashIndex = paymentTypes.indexOf("CASH"); String cashId = (String) paymentTypes.get(cashIndex); BigDecimal cashAmount = cart.getPaymentAmount(cashId); 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=751004&r1=751003&r2=751004&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 Fri Mar 6 17:51:02 2009 @@ -1183,7 +1183,7 @@ // Get Taxes Map totalPriceWithTaxMap = dispatcher.runSync("calcTaxForDisplay", UtilMisc.toMap("basePrice", totalPrice, "productId", this.productId, "productStoreId", cart.getProductStoreId())); this.setDisplayPrice((BigDecimal) totalPriceWithTaxMap.get("priceWithTax")); - }else{ + } else { this.setDisplayPrice(configWrapper.getTotalPrice()); } } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java Fri Mar 6 17:51:02 2009 @@ -291,7 +291,7 @@ // i cannot get the addOrDecrease function to accept a null reservStart field: i get a null pointer exception a null constant works.... if (reservStart == null) { cart.addOrIncreaseItem(productId, null, quantity, null, null, null, null, null, null, attributes, prodCatalogId, configWrapper, null, null, null, dispatcher); - }else{ + } else { cart.addOrIncreaseItem(productId, null, quantity, reservStart, reservLength, reservPersons, null, null, null, null, null, attributes, prodCatalogId, configWrapper, null, null, null, dispatcher); } Map messageMap = UtilMisc.toMap("productId", productId); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java Fri Mar 6 17:51:02 2009 @@ -574,7 +574,7 @@ BigDecimal orderQuantity = orderItem.getBigDecimal("quantity"); if (quantityPurchased != null) { shoppingListItem.set("quantityPurchased", orderQuantity.add(quantityPurchased)); - }else{ + } else { shoppingListItem.set("quantityPurchased", orderQuantity); } shoppingListItem.store(); 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=751004&r1=751003&r2=751004&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 Fri Mar 6 17:51:02 2009 @@ -866,7 +866,7 @@ result.put("wholeSalePrice", onePrice.getBigDecimal("price")); }else if (onePrice.getString("productPriceTypeId").equals("LIST_PRICE")) {//listPrice result.put("listPrice", onePrice.getBigDecimal("price")); - }else{ + } else { result.put("defultPrice", onePrice.getBigDecimal("price")); result.put("listPrice", onePrice.getBigDecimal("price")); result.put("wholeSalePrice", onePrice.getBigDecimal("price")); 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=751004&r1=751003&r2=751004&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 Fri Mar 6 17:51:02 2009 @@ -1215,10 +1215,10 @@ if (UtilValidate.isNotEmpty(spiderRequest)) { if ("Y".equals(spiderRequest)) { return true; - }else{ + } else { return false; } - }else{ + } else { String initialUserAgent = request.getHeader("User-Agent") != null ? request.getHeader("User-Agent") : ""; List<String> spiderList = StringUtil.split(UtilProperties.getPropertyValue("url", "link.remove_lsessionid.user_agent_list"), ","); if (UtilValidate.isNotEmpty(spiderList)) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java Fri Mar 6 17:51:02 2009 @@ -408,7 +408,7 @@ try { if (null!=request.getParameter("_RUN_SYNC_") && request.getParameter("_RUN_SYNC_").equals("Y")) { syncServiceResult = dispatcher.runSync(serviceName, serviceContext); - }else{ + } else { dispatcher.schedule(jobName, poolName, serviceName, serviceContext, startTime, frequency, interval, count, endTime, maxRetry); } } catch (GenericServiceException e) { @@ -467,7 +467,7 @@ String servicePathEntry = sp[i]; if (null==servicePathMap) { servicePathObject = serviceResult.get(servicePathEntry); - }else{ + } else { servicePathObject = servicePathMap.get(servicePathEntry); } servicePathMap = null; @@ -492,7 +492,7 @@ } if (null==servicePathMap) { return servicePathObject; - }else{ + } else { return servicePathMap; } } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Fri Mar 6 17:51:02 2009 @@ -1344,7 +1344,7 @@ // TODO: add stuff to append items this.cart = restoredCart; this.orderId = orderId; - }else{ + } else { this.cart = restoredCart; this.orderId = orderId; } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java Fri Mar 6 17:51:02 2009 @@ -215,7 +215,7 @@ try { if (!aggregatedItem) { trans.addItem(productId, quantity); - }else{ + } else { trans.addItem(productId, pcw); } } catch (CartItemModifyException e) { @@ -442,7 +442,7 @@ pcw = configureItem.openDlg(); configureItem = null; trans.modifyConfig(productId, pcw, index); - }else{ + } else { pos.showDialog("dialog/error/itemnotconfigurable"); } } catch(Exception e) { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Fri Mar 6 17:51:02 2009 @@ -232,7 +232,7 @@ if (track2Info != null && UtilValidate.isNotEmpty(track2Info[1])) { // if swiped trans.setPaymentTrack2(pmId, null, track2Info[1]); - }else{ //keyed + } else { //keyed if (securityCodeInfo != null && UtilValidate.isNotEmpty(securityCodeInfo[1])) { trans.setPaymentSecurityCode(pmId, null, securityCodeInfo[1]); } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java Fri Mar 6 17:51:02 2009 @@ -275,7 +275,7 @@ if (question.isSingleChoice()) { if (options.size()>2) { return new ListButtonQuestion(question); - }else{ + } else { //TODO: this doesn't handle the case of // two options with none required to be selected return new SingleButtonQuestion(question); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java Fri Mar 6 17:51:02 2009 @@ -99,13 +99,13 @@ if (getMinus()) { button = (XButton) m_dialog.findComponent("numMinus"); XEventHelper.addMouseHandler(this, button, "triggerMinus"); - }else{ + } else { disableButton("numMinus"); } if (getPercent()) { button = (XButton) m_dialog.findComponent("numPercent"); XEventHelper.addMouseHandler(this, button, "triggerMinus"); - }else{ + } else { disableButton("numPercent"); } Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java?rev=751004&r1=751003&r2=751004&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java (original) +++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Fri Mar 6 17:51:02 2009 @@ -345,7 +345,7 @@ return returnList; } } - }else{ + } else { return getAllProcessMgrs(trans); } return returnList; @@ -996,7 +996,7 @@ if (((Process)l.get(i)).getState().startsWith(new String(procState.substring(0, procState.length()-1)))) returnList.add(l.get(i)); } - }else{ + } else { returnList = getAllProcesses(trans); return returnList; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |