svn commit: r750997 [1/2] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r750997 [1/2] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Author: jleroux
Date: Fri Mar 6 17:36:09 2009 New Revision: 750997 URL: http://svn.apache.org/viewvc?rev=750997&view=rev Log: if( => if ( Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AuthorizeResponse.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilDateTime.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Classpath.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceVariantsEventHandler.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.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/projectmgr/src/org/ofbiz/project/Various.java ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Mar 6 17:36:09 2009 @@ -797,7 +797,7 @@ // Should all be in place now. Depending on the ProductStore.autoApproveInvoice setting, set status to INVOICE_READY (unless it's a purchase // invoice, which we set to INVOICE_IN_PROCESS) boolean autoApproveInvoice = UtilValidate.isEmpty(productStore.get("autoApproveInvoice")) || "Y".equals(productStore.getString("autoApproveInvoice")); - if(autoApproveInvoice) { + if (autoApproveInvoice) { String nextStatusId = "INVOICE_READY"; if (invoiceType.equals("PURCHASE_INVOICE")) { nextStatusId = "INVOICE_IN_PROCESS"; @@ -2737,7 +2737,7 @@ if (invoiceId != null) { Debug.logInfo(" Invoice(" + invoiceId + ") amount not yet applied: " + newInvoiceApplyAvailable + extra + " Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable + " Requested amount to apply:" + amountApplied, module); toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToInvoice",UtilMisc.toMap("invoiceId",invoiceId),locale); - if(extra.length() > 0) toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToInvoiceItem",UtilMisc.toMap("invoiceId",invoiceId,"invoiceItemSeqId",invoiceItemSeqId),locale); + if (extra.length() > 0) toMessage = UtilProperties.getMessage(resource, "AccountingApplicationToInvoiceItem",UtilMisc.toMap("invoiceId",invoiceId,"invoiceItemSeqId",invoiceItemSeqId),locale); } if (toPaymentId != null) { Debug.logInfo(" toPayment(" + toPaymentId + ") amount not yet applied: " + newToPaymentApplyAvailable + " Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable + " Requested amount to apply:" + amountApplied, module); Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Fri Mar 6 17:36:09 2009 @@ -307,7 +307,7 @@ String orderId = (String) context.get("orderId"); Map result = new HashMap(); boolean reAuth = false; - if(context.get("reAuth") != null) { + if (context.get("reAuth") != null) { reAuth = ((Boolean)context.get("reAuth")).booleanValue(); } // get the order header and payment preferences @@ -1242,7 +1242,7 @@ GenericValue productStore = orh.getProductStore(); if (!UtilValidate.isEmpty(productStore)) { boolean shipIfCaptureFails = UtilValidate.isEmpty(productStore.get("shipIfCaptureFails")) || "Y".equalsIgnoreCase(productStore.getString("shipIfCaptureFails")); - if(! shipIfCaptureFails) { + if (! shipIfCaptureFails) { return ServiceUtil.returnError("Cannot ship order because credit card captures were unsuccessful"); } } Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Fri Mar 6 17:36:09 2009 @@ -79,7 +79,7 @@ Map validateResults = validateRequest(context,props,request); String respMsg = (String)validateResults.get(ModelService.RESPONSE_MESSAGE); - if(ModelService.RESPOND_ERROR.equals(respMsg)) { + if (ModelService.RESPOND_ERROR.equals(respMsg)) { results.put(ModelService.ERROR_MESSAGE, "Validation Failed - invalid values"); return results; } @@ -127,7 +127,7 @@ Map validateResults = validateRequest(context,props,request); String respMsg = (String)validateResults.get(ModelService.RESPONSE_MESSAGE); - if(ModelService.RESPOND_ERROR.equals(respMsg)) { + if (ModelService.RESPOND_ERROR.equals(respMsg)) { results.put(ModelService.ERROR_MESSAGE, "Validation Failed - invalid values"); return results; } @@ -174,7 +174,7 @@ Map validateResults = validateRequest(context,props,request); String respMsg = (String)validateResults.get(ModelService.RESPONSE_MESSAGE); - if(ModelService.RESPOND_ERROR.equals(respMsg)) { + if (ModelService.RESPOND_ERROR.equals(respMsg)) { results.put(ModelService.ERROR_MESSAGE, "Validation Failed - invalid values"); return results; } @@ -279,7 +279,7 @@ Map validateResults = validateRequest(context,props,request); String respMsg = (String)validateResults.get(ModelService.RESPONSE_MESSAGE); - if(ModelService.RESPOND_ERROR.equals(respMsg)) { + if (ModelService.RESPOND_ERROR.equals(respMsg)) { results.put(ModelService.ERROR_MESSAGE, "Validation Failed - invalid values"); return results; } @@ -309,7 +309,7 @@ Map validateResults = validateRequest(context,props,request); String respMsg = (String)validateResults.get(ModelService.RESPONSE_MESSAGE); - if(ModelService.RESPOND_ERROR.equals(respMsg)) { + if (ModelService.RESPOND_ERROR.equals(respMsg)) { results.put(ModelService.ERROR_MESSAGE, "Validation Failed - invalid values"); return results; } @@ -333,7 +333,7 @@ url = "https://certification.authorize.net/gateway/transact.dll"; // test url Debug.logWarning("No payment.authorizedotnet.url found. Using a default of [" + url + "]", module); } - if(isTestMode()) { + if (isTestMode()) { Debug.logInfo("TEST Authorize.net using url [" + url + "]", module); Debug.logInfo("TEST Authorize.net request string " + request.toString(),module); Debug.logInfo("TEST Authorize.net properties string " + props.toString(),module); @@ -380,7 +380,7 @@ private static Properties buildAIMProperties(Map context) { String configStr = (String)context.get("paymentConfig"); - if(configStr == null) { + if (configStr == null) { configStr = "payment.properties"; } @@ -405,11 +405,11 @@ ver = "3.0"; } - if(login == null || login.length() == 0) { + if (login == null || login.length() == 0) { Debug.logInfo("the login property in " + configStr + " is not configured.",module); } - if(password == null || password.length() == 0) { + if (password == null || password.length() == 0) { Debug.logInfo("The password property in " + configStr + " is not configured.",module); } @@ -618,7 +618,7 @@ results.put("authMessage",ar.getReasonText()); - if(authResult.booleanValue()) { //passed + if (authResult.booleanValue()) { //passed results.put("authCode", ar.getResponseField(AuthorizeResponse.AUTHORIZATION_CODE)); results.put("authRefNum", ar.getResponseField(AuthorizeResponse.TRANSACTION_ID)); results.put("cvCode", ar.getResponseField(AuthorizeResponse.CID_RESPONSE_CODE)); @@ -642,7 +642,7 @@ results.put("captureMessage",ar.getReasonText()); results.put("captureRefNum", ar.getResponseField(AuthorizeResponse.TRANSACTION_ID)); - if(captureResult.booleanValue()) { //passed + if (captureResult.booleanValue()) { //passed results.put("captureCode", ar.getResponseField(AuthorizeResponse.AUTHORIZATION_CODE)); results.put("captureAmount", new BigDecimal(ar.getResponseField(AuthorizeResponse.AMOUNT))); } else { @@ -662,7 +662,7 @@ results.put("refundMessage",ar.getReasonText()); results.put("refundRefNum", ar.getResponseField(AuthorizeResponse.TRANSACTION_ID)); - if(captureResult.booleanValue()) { //passed + if (captureResult.booleanValue()) { //passed results.put("refundCode", ar.getResponseField(AuthorizeResponse.AUTHORIZATION_CODE)); results.put("refundAmount", new BigDecimal(ar.getResponseField(AuthorizeResponse.AMOUNT))); } else { @@ -682,7 +682,7 @@ results.put("releaseMessage",ar.getReasonText()); results.put("releaseRefNum", ar.getResponseField(AuthorizeResponse.TRANSACTION_ID)); - if(captureResult.booleanValue()) { //passed + if (captureResult.booleanValue()) { //passed results.put("releaseCode", ar.getResponseField(AuthorizeResponse.AUTHORIZATION_CODE)); results.put("releaseAmount", new BigDecimal(ar.getResponseField(AuthorizeResponse.AMOUNT))); } else { @@ -705,7 +705,7 @@ results.put("captureMessage",ar.getReasonText()); results.put("captureRefNum", ar.getResponseField(AuthorizeResponse.TRANSACTION_ID)); - if(authResult.booleanValue()) { //passed + if (authResult.booleanValue()) { //passed results.put("authCode", ar.getResponseField(AuthorizeResponse.AUTHORIZATION_CODE)); results.put("authRefNum", ar.getResponseField(AuthorizeResponse.TRANSACTION_ID)); results.put("cvCode", ar.getResponseField(AuthorizeResponse.CID_RESPONSE_CODE)); 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=750997&r1=750996&r2=750997&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:36:09 2009 @@ -95,15 +95,15 @@ private void setApproval() { String rc = (String)response.get(RESPONSE_CODE); - if(rc.equals("1")) { + if (rc.equals("1")) { this.respCode = APPROVED; } - if(rc.equals("2")) { + if (rc.equals("2")) { this.respCode = DECLINED; } - if(rc.equals("3")) { + if (rc.equals("3")) { this.respCode = ERROR; } @@ -141,7 +141,7 @@ if (posNum == CID_RESPONSE_CODE) return "M"; } - if(posNum < 1 || posNum > maxPos) { + if (posNum < 1 || posNum > maxPos) { return "unknown_field"; } else { @@ -159,12 +159,12 @@ out.add("empty"); while(true) { s2 = r.indexOf(delim, s1); - if(s2 != -1) { + if (s2 != -1) { out.add(r.substring(s1, s2)); }else{ //the end part of the string (string not pattern terminated) String _ = r.substring(s1); - if(_ != null && !_.equals("")) { + if (_ != null && !_.equals("")) { out.add(_); } break; Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java Fri Mar 6 17:36:09 2009 @@ -136,7 +136,7 @@ //lets see if there is a auth transaction already in context GenericValue authTransaction = (GenericValue) context.get("authTrans"); - if(authTransaction == null) { + if (authTransaction == null) { authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); } @@ -192,7 +192,7 @@ //lets see if there is a auth transaction already in context GenericValue authTransaction = (GenericValue) context.get("authTrans"); - if(authTransaction == null) { + if (authTransaction == null) { authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); } @@ -253,7 +253,7 @@ //lets see if there is a auth transaction already in context GenericValue authTransaction = (GenericValue) context.get("authTrans"); - if(authTransaction == null) { + if (authTransaction == null) { authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Fri Mar 6 17:36:09 2009 @@ -79,7 +79,7 @@ if (pk == null) return; Map lookupCaches = (Map)session.getAttribute("lookupCaches"); - if(lookupCaches == null) { + if (lookupCaches == null) { lookupCaches = FastMap.newInstance(); session.setAttribute("lookupCaches", lookupCaches); } @@ -100,7 +100,7 @@ String cacheEntityName = entityName; LifoSet lkupCache = (LifoSet)lookupCaches.get(cacheEntityName); - if(lkupCache == null) { + if (lkupCache == null) { lkupCache = new LifoSet(); lookupCaches.put(cacheEntityName, lkupCache); } @@ -113,7 +113,7 @@ String cacheEntityName = entityName; LifoSet lkupCache = (LifoSet)lookupCaches.get(cacheEntityName); - if(lkupCache == null) { + if (lkupCache == null) { lkupCache = new LifoSet(); lookupCaches.put(cacheEntityName, lkupCache); } @@ -162,7 +162,7 @@ String entityName, GenericEntity ent) { HttpSession session = request.getSession(); Map currentEntityMap = (Map)session.getAttribute("currentEntityMap"); - if(currentEntityMap == null) { + if (currentEntityMap == null) { currentEntityMap = FastMap.newInstance(); session.setAttribute("currentEntityMap", currentEntityMap); } @@ -218,7 +218,7 @@ HttpSession session = request.getSession(); Map currentEntityMap = (Map)session.getAttribute("currentEntityMap"); - if(currentEntityMap == null) { + if (currentEntityMap == null) { currentEntityMap = FastMap.newInstance(); session.setAttribute("currentEntityMap", currentEntityMap); } @@ -258,7 +258,7 @@ // whether or not a field is populated. boolean useCached = false; boolean usePassed = true; - if(cachedPK != null ) { + if (cachedPK != null ) { useCached = true; keyColl = cachedPK.getPrimaryKey().getAllKeys(); keyIt = keyColl.iterator(); @@ -269,16 +269,16 @@ Object oCached = null; String ky = (String)keyIt.next(); oPassed = passedPK.get(ky); - if(oPassed != null) { + if (oPassed != null) { sPassed = oPassed.toString(); - if(UtilValidate.isEmpty(sPassed)) { + if (UtilValidate.isEmpty(sPassed)) { // If any part of passed key is not available, it can't be used usePassed = false; } else { oCached = cachedPK.get(ky); - if(oCached != null) { + if (oCached != null) { sCached = oCached.toString(); - if(UtilValidate.isEmpty(sCached)) { + if (UtilValidate.isEmpty(sCached)) { useCached = false; } else { } 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=750997&r1=750996&r2=750997&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:36:09 2009 @@ -73,11 +73,11 @@ try { BufferedReader input = null; try{ - if(!UtilValidate.isEmpty(file)) { + if (!UtilValidate.isEmpty(file)) { input = new BufferedReader( new FileReader(file)); String line = null; int size=0; - if(file != null) { + if (file != null) { int counterLine=0; //Home Document Entity = null; @@ -121,7 +121,7 @@ rootContent=null, contentId = null; counterLine++; - if(counterLine>1) { + if (counterLine>1) { size = line.length(); String check = "\\", @@ -139,27 +139,27 @@ List<GenericValue> contentAssocs = null; if (data.charAt(index) == check.charAt(0)||data.charAt(index)== checkSubContent.charAt(0)) {//store data contentName = contentName + contentNameInprogress; - if(contentName.length()>100) { + if (contentName.length()>100) { contentName = contentName.substring(0,100); } //check duplicate folder contents = delegator.findByAnd("Content", UtilMisc.toMap("contentName",contentName)); - if(contents.size() > 0) { + if (contents.size() > 0) { GenericValue contentResult = contents.get(0); contentId = contentResult.get("contentId").toString(); } - if(contents.size() > 0 && hasFolder==true) { + if (contents.size() > 0 && hasFolder==true) { GenericValue contentResult = contents.get(0); contentId = contentResult.get("contentId").toString(); - if(rootContent != null) { + if (rootContent != null) { contentAssocs= delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId",contentId, "contentIdTo", rootContent)); List<GenericValue> contentAssocCheck= delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentIdTo", rootContent)); Iterator<GenericValue> contentAssChecks = contentAssocCheck.iterator(); while(contentAssChecks.hasNext() && contentNameMatch == false) { GenericValue contentAss = contentAssChecks.next(); GenericValue contentcheck = delegator.findByPrimaryKey("Content",UtilMisc.toMap("contentId",contentAss.get("contentId"))); - if(contentcheck!=null) { - if(contentcheck.get("contentName").equals(contentName) && contentNameMatch==false) { + if (contentcheck!=null) { + if (contentcheck.get("contentName").equals(contentName) && contentNameMatch==false) { contentNameMatch = true; contentId = contentcheck.get("contentId").toString(); } @@ -173,7 +173,7 @@ contentAssocSize=contentAssocs.size(); } - if( contentAssocSize == 0 && contentNameMatch==false) {//New Root Content + if ( contentAssocSize == 0 && contentNameMatch==false) {//New Root Content Entity = null; contentId = delegator.getNextSeqId("Content"); Entity = delegator.makeValue("Content"); @@ -194,12 +194,12 @@ hasFolder = true; } //Relation Content - if(rootContent==null) { + if (rootContent==null) { rootContent = "HOME_DUCUMENT"; } contentAssocs = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId",contentId,"contentIdTo",rootContent,"contentAssocTypeId","TREE_CHILD")); - if(contentAssocs.size()==0) { + if (contentAssocs.size()==0) { contentAssoc = FastMap.newInstance(); contentAssoc.put("contentId", contentId); contentAssoc.put("contentAssocTypeId", "TREE_CHILD"); @@ -214,14 +214,14 @@ contentName = ""; contentNameInprogress=""; } - if(data.charAt(index)== checkSubContent.charAt(0)) {//Have sub content + if (data.charAt(index)== checkSubContent.charAt(0)) {//Have sub content createSubContent(index, data, rootContent, context, dctx); index=size; continue; } - if((data.charAt(index))!= check.charAt(0)) { + if ((data.charAt(index))!= check.charAt(0)) { contentNameInprogress = contentNameInprogress.concat(Character.toString(data.charAt(index))); - if(contentNameInprogress.length()>99) { + if (contentNameInprogress.length()>99) { contentName = contentName + contentNameInprogress; contentNameInprogress=""; } @@ -277,24 +277,24 @@ if (subContents.charAt(index) == check.charAt(0)) {//store data contentName = contentName + contentNameInprogress; //Debug.log("subcontentName---->"+contentName); - if(contentName.length()>100) { + if (contentName.length()>100) { contentName = contentName.substring(0,100); } List<GenericValue> contents = delegator.findByAnd("Content", UtilMisc.toMap("contentName",contentName),null,"-contentId"); - if(contents!=null) { + if (contents!=null) { Iterator<GenericValue> contentCheck = contents.iterator(); while(contentCheck.hasNext() && contentNameMatch==false) { GenericValue contentch = contentCheck.next(); - if(contentch!=null) { + if (contentch!=null) { List<GenericValue> contentAssocsChecks = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId",contentch.get("contentId"), "contentIdTo", rootContent)); - if(contentAssocsChecks.size() > 0) { + if (contentAssocsChecks.size() > 0) { contentNameMatch = true; } } } } contentId = null; - if(contentNameMatch==false) { + if (contentNameMatch==false) { //create DataResource Map<String,Object> data = FastMap.newInstance(); data.put("userLogin", userLogin); @@ -330,31 +330,31 @@ contentNameInprogress=""; } - if((subContents.charAt(index))!= check.charAt(0)) { + if ((subContents.charAt(index))!= check.charAt(0)) { contentNameInprogress = contentNameInprogress.concat(Character.toString(subContents.charAt(index))); - if(contentNameInprogress.length() > 99) { + if (contentNameInprogress.length() > 99) { contentName = contentName + contentNameInprogress; contentNameInprogress=""; } } //lastItem - if(index==size-1) { + if (index==size-1) { contentNameMatch = false; List<GenericValue> contents = delegator.findByAnd("Content", UtilMisc.toMap("contentName",contentName)); - if(contents!=null) { + if (contents!=null) { Iterator<GenericValue> contentCheck = contents.iterator(); while(contentCheck.hasNext() && contentNameMatch==false) { GenericValue contentch = contentCheck.next(); - if(contentch!=null) { + if (contentch!=null) { List<GenericValue> contentAssocsChecks = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId",contentch.get("contentId"), "contentIdTo", rootContent)); - if(contentAssocsChecks.size() > 0) { + if (contentAssocsChecks.size() > 0) { contentNameMatch = true; } } } } contentId = null; - if(contentNameMatch == false) { + if (contentNameMatch == false) { //create DataResource Map<String,Object> data = FastMap.newInstance(); data.put("userLogin", userLogin); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java Fri Mar 6 17:36:09 2009 @@ -195,7 +195,7 @@ String thisDataResourceId = contentAssocRevisionItemView.getString("dataResourceId"); GenericValue dataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", thisDataResourceId)); String inputMimeType = null; - if(dataResource != null) { + if (dataResource != null) { inputMimeType = dataResource.getString("mimeTypeId"); } byte [] inputByteArray = null; @@ -344,7 +344,7 @@ dataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", dataResourceId)); } String inputMimeType = null; - if(dataResource != null) { + if (dataResource != null) { inputMimeType = dataResource.getString("mimeTypeId"); } byte [] inputByteArray = null; Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java Fri Mar 6 17:36:09 2009 @@ -310,7 +310,7 @@ Debug.logError(e, "Problem checking permissions", "ContentServices"); } permissionStatus = (String)permResults.get("permissionStatus"); - if(permissionStatus == null || !permissionStatus.equals("granted") ) { + if (permissionStatus == null || !permissionStatus.equals("granted") ) { if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) { String errMsg = (String)permResults.get(ModelService.ERROR_MESSAGE); results.put(ModelService.ERROR_MESSAGE, errMsg); @@ -326,7 +326,7 @@ Debug.logError(e, "Problem checking permissions", "ContentServices"); } permissionStatus = (String)permResults.get("permissionStatus"); - if(permissionStatus != null && permissionStatus.equals("granted") ) { + if (permissionStatus != null && permissionStatus.equals("granted") ) { results.put("permissionStatus", "granted"); } else { if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java Fri Mar 6 17:36:09 2009 @@ -97,7 +97,7 @@ String txt = null; String mapKey = (String)templateRoot.get("mapKey"); - if( UtilValidate.isEmpty(mapKey)) { + if ( UtilValidate.isEmpty(mapKey)) { txt = ContentWorker.renderContentAsText(dispatcher, delegator, thisContentId, templateRoot, locale, mimeTypeId, true); } else { txt = ContentWorker.renderSubContentAsText(dispatcher, delegator, thisContentId, mapKey, templateRoot, locale, mimeTypeId, true); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Fri Mar 6 17:36:09 2009 @@ -756,7 +756,7 @@ } stockTmp = stockTmp.add(eventQuantity); - if(stockTmp.compareTo(minimumStock) < 0) { + if (stockTmp.compareTo(minimumStock) < 0) { BigDecimal qtyToStock = minimumStock.subtract(stockTmp); //need to buy or build the product as we have not enough stock eventDate = inventoryEventForMRP.getTimestamp("eventDate"); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Fri Mar 6 17:36:09 2009 @@ -235,7 +235,7 @@ if (chargedToPaymentPref.compareTo(ZERO) > 0) { // key of the resulting map is paymentMethodId or paymentMethodTypeId if the paymentMethodId is not available String paymentMethodKey = paymentPref.getString("paymentMethodId") != null ? paymentPref.getString("paymentMethodId") : paymentPref.getString("paymentMethodTypeId"); - if(paymentMethodAmounts.containsKey(paymentMethodKey)) { + if (paymentMethodAmounts.containsKey(paymentMethodKey)) { BigDecimal value = (BigDecimal) paymentMethodAmounts.get(paymentMethodKey); if (value != null) chargedToPaymentPref = chargedToPaymentPref.add(value); } @@ -1804,7 +1804,7 @@ } Map itemAdjustmentCondition = UtilMisc.toMap("returnId", returnedItem.get("returnId"), "returnItemSeqId", returnedItem.get("returnItemSeqId")); returnedAmount = returnedAmount.add(getReturnAdjustmentTotal(orderHeader.getDelegator(), itemAdjustmentCondition)); - if(orderId.equals(returnedItem.getString("orderId")) && (!returnHeaderList.contains(returnedItem.getString("returnId")))) { + if (orderId.equals(returnedItem.getString("orderId")) && (!returnHeaderList.contains(returnedItem.getString("returnId")))) { returnHeaderList.add(returnedItem.getString("returnId")); } } @@ -2480,7 +2480,7 @@ List promoAdjustments = EntityUtil.filterByAnd(allOrderAdjustments, UtilMisc.toMap("orderAdjustmentTypeId", "PROMOTION_ADJUSTMENT")); - if(!promoAdjustments.isEmpty()) { + if (!promoAdjustments.isEmpty()) { Iterator promoAdjIter = promoAdjustments.iterator(); while(promoAdjIter.hasNext()) { @@ -2521,7 +2521,7 @@ if (persons.compareTo(BigDecimal.ONE) == 1) { if (persons.compareTo(new BigDecimal(2)) == 1) { persons = persons.subtract(new BigDecimal(2)); - if(nthPersonPerc.signum() == 1) + if (nthPersonPerc.signum() == 1) rentalAdjustment = persons.multiply(nthPersonPerc); else rentalAdjustment = persons.multiply(secondPersonPerc); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Fri Mar 6 17:36:09 2009 @@ -2269,7 +2269,7 @@ String paramName = modelParam.name; Object value = context.get(paramName); - if(value != null) { + if (value != null) { serviceContext.put(paramName, value); } } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Mar 6 17:36:09 2009 @@ -389,7 +389,7 @@ if (UtilValidate.isNotEmpty(selFixedAssetProduct)) { Iterator firstOne = selFixedAssetProduct.iterator(); - if(firstOne.hasNext()) { + if (firstOne.hasNext()) { GenericValue fixedAssetProduct = delegator.makeValue("FixedAssetProduct"); fixedAssetProduct = (GenericValue) firstOne.next(); workEffort.set("fixedAssetId",fixedAssetProduct.get("fixedAssetId")); @@ -688,7 +688,7 @@ } } } - if(techDataCalendar == null ) { + if (techDataCalendar == null ) { techDataCalendar = delegator.makeValue("TechDataCalendar"); Debug.logInfo("create techdata calendar because it does not exist",module); String calendarId = delegator.getNextSeqId("TechDataCalendar"); @@ -1428,7 +1428,7 @@ Iterator otait = UtilMisc.toIterator(orderTaxAdjustments); while (otait != null && otait.hasNext()) { GenericValue orderTaxAdjustment = (GenericValue) otait.next(); - if( orderTaxAdjustment.get("amount") != null) { + if ( orderTaxAdjustment.get("amount") != null) { totalExistingOrderTax = totalExistingOrderTax.add(orderTaxAdjustment.getBigDecimal("amount").setScale(taxDecimals, taxRounding)); } } @@ -1538,7 +1538,7 @@ Iterator oai = orderAdj.iterator(); while (oai.hasNext()) { GenericValue oa = (GenericValue) oai.next(); - if( oa.get("amount") != null) { + if ( oa.get("amount") != null) { totalNewOrderTax = totalNewOrderTax.add(oa.getBigDecimal("amount").setScale(taxDecimals, taxRounding)); } @@ -1553,7 +1553,7 @@ Iterator ida = itemAdjustments.iterator(); while (ida.hasNext()) { GenericValue ia = (GenericValue) ida.next(); - if( ia.get("amount") != null) { + if ( ia.get("amount") != null) { totalNewOrderTax = totalNewOrderTax.add(ia.getBigDecimal("amount").setScale(taxDecimals, taxRounding)); } } @@ -2395,7 +2395,7 @@ uiLabelMap.addBottomResourceBundle("CommonUiLabels"); Map bodyParameters = UtilMisc.toMap("orderId", orderId, "orderItemSeqId", orderItemSeqId, "userLogin", placingUserLogin, "uiLabelMap", uiLabelMap, "locale", locale); - if( placingParty!= null) { + if ( placingParty!= null) { bodyParameters.put("partyId", placingParty.get("partyId")); } bodyParameters.put("note", note); @@ -3139,11 +3139,11 @@ } catch (GenericServiceException e) { Debug.logError(e, "ERROR: Could not run external fulfillment service '" + fulfillmentService + "'; " + e.getMessage(), module); } - } else if("FULFILLMENT_EMAIL".equals(fulfillmentType)) { + } else if ("FULFILLMENT_EMAIL".equals(fulfillmentType)) { // digital email fulfillment // TODO: Add support for fulfillment email return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderEmailFulfillmentTypeNotYetImplemented", locale)); - } else if("DIGITAL_DOWNLOAD".equals(fulfillmentType)) { + } else if ("DIGITAL_DOWNLOAD".equals(fulfillmentType)) { // digital download fulfillment // Nothing to do for here. Downloads are made available to the user @@ -3249,7 +3249,7 @@ GenericValue productType = null; GenericValue product = (GenericValue) serviceProducts.get(item); boolean markComplete = false; - if(product != null) { + if (product != null) { try { productType = product.getRelatedOne("ProductType"); } catch (GenericEntityException e) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Fri Mar 6 17:36:09 2009 @@ -840,7 +840,7 @@ // If the user has just created a new payment method, add it to the map with a null amount, so that // it becomes the sole payment method for the order. String newPaymentMethodId = (String) request.getAttribute("paymentMethodId"); - if(! UtilValidate.isEmpty(newPaymentMethodId)) { + if (! UtilValidate.isEmpty(newPaymentMethodId)) { selectedPaymentMethods.put(newPaymentMethodId, null); if (!selectedPaymentMethods.containsKey(newPaymentMethodId)) { selectedPaymentMethods.put(newPaymentMethodId, UtilMisc.toMap("amount", null, "securityCode", null)); 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -489,7 +489,7 @@ if (sci.getItemType().equals("RENTAL_ORDER_ITEM")) { // check to see if the related fixed asset is available for the new quantity String isAvailable = ShoppingCartItem.checkAvailability(productId, newQuantity, reservStart, reservLength, this); - if(isAvailable.compareTo("OK") != 0) { + 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() ); Debug.logInfo(excMsg, module); 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -367,7 +367,7 @@ } //check accommodation for reservations - if((paramMap.containsKey("accommodationMapId")) && (paramMap.containsKey("accommodationSpotId"))) { + if ((paramMap.containsKey("accommodationMapId")) && (paramMap.containsKey("accommodationSpotId"))) { accommodationMapId = (String) paramMap.remove("accommodationMapId"); accommodationSpotId = (String) paramMap.remove("accommodationSpotId"); } 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=750997&r1=750996&r2=750997&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:36:09 2009 @@ -531,7 +531,7 @@ // check to see if the related fixed asset is available for rent String isAvailable = checkAvailability(product.getString("productId"), quantity, reservStart, reservLength, cart); - if(isAvailable.compareTo("OK") != 0) { + if (isAvailable.compareTo("OK") != 0) { Map messageMap = UtilMisc.toMap("productId", product.getString("productId"), "availableMessage", isAvailable); String excMsg = UtilProperties.getMessage(resource_error, "item.product_not_available", @@ -890,7 +890,7 @@ } catch (GenericEntityException e) { Debug.logWarning(e, module); } - if(techDataCalendar == null) { + if (techDataCalendar == null) { // no calendar ok, when not more that total capacity if (fixedAsset.getBigDecimal("productionCapacity").compareTo(quantity) >= 0) { String msg = UtilProperties.getMessage(resource_error, "item.availableOk", cart.getLocale()); @@ -1228,7 +1228,7 @@ if (addDays.compareTo(BigDecimal.ZERO) == 0) return this.reservStart; else { - if(this.reservStart != null) + if (this.reservStart != null) return new Timestamp((long)(this.reservStart.getTime() + (addDays.doubleValue() * 86400000.0))); else return null; @@ -1947,7 +1947,7 @@ if (persons.compareTo(BigDecimal.ONE) > 0) { if (persons.compareTo(new BigDecimal("2")) > 0 ) { persons = persons.subtract(new BigDecimal("2")); - if(getReservNthPPPerc().compareTo(BigDecimal.ZERO) > 0) { + if (getReservNthPPPerc().compareTo(BigDecimal.ZERO) > 0) { rentalValue = persons.multiply(getReservNthPPPerc()); } else { rentalValue = persons.multiply(getReserv2ndPPPerc()); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Fri Mar 6 17:36:09 2009 @@ -461,7 +461,7 @@ cart.setPoNumber(item.getString("correspondingPoId")); List<GenericValue> itemAdjustments = orh.getOrderItemAdjustments(item); - if(itemAdjustments != null) { + if (itemAdjustments != null) { for(GenericValue itemAdjustment : itemAdjustments) { cartItem.addAdjustment(itemAdjustment); } @@ -923,7 +923,7 @@ Map<String, Object> result = ServiceUtil.returnSuccess(); Locale locale = (Locale) context.get("locale"); ShoppingCart shoppingCart = (ShoppingCart) context.get("shoppingCart"); - if(shoppingCart != null) { + if (shoppingCart != null) { String isoCode = shoppingCart.getCurrency(); result.put("totalQuantity", shoppingCart.getTotalQuantity()); result.put("currencyIsoCode",isoCode); 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -68,7 +68,7 @@ int shipGroups = cart.getShipGroupSize(); for (int i = 0; i < shipGroups; i++) { String shipmentMethodTypeId = cart.getShipmentMethodTypeId(i); - if(UtilValidate.isEmpty(shipmentMethodTypeId)) { + if (UtilValidate.isEmpty(shipmentMethodTypeId)) { continue; } Map result = getShipGroupEstimate(dispatcher, delegator, cart, i); @@ -279,12 +279,12 @@ // invoke the external shipping estimate service String serviceName = (String)storeShipMeth.get("serviceName"); BigDecimal externalShipAmt = null; - if(serviceName != null) { + if (serviceName != null) { String doEstimates = UtilProperties.getPropertyValue("shipment.properties", "shipment.doratecheck", "true"); //If all estimates are not turned off, check for the individual one - if("true".equals(doEstimates)) { + if ("true".equals(doEstimates)) { String dothisEstimate = UtilProperties.getPropertyValue("shipment.properties", "shipment.doratecheck." + serviceName, "true"); - if("false".equals(dothisEstimate)) + if ("false".equals(dothisEstimate)) serviceName = null; } else { //Rate checks inhibited 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -465,7 +465,7 @@ // only execute when config file has been set && header variable found if (!spamHeaderName.equals("N") && message.getHeader(spamHeaderName) != null && message.getHeader(spamHeaderName).length > 0) { String msgHeaderValue = message.getHeader(spamHeaderName)[0]; - if(msgHeaderValue != null && msgHeaderValue.startsWith(configHeaderValue)) { + if (msgHeaderValue != null && msgHeaderValue.startsWith(configHeaderValue)) { Debug.logInfo("Incoming Email message ignored, was detected by external spam checker", module); return ServiceUtil.returnSuccess(" Message Ignored: detected by external spam checker"); } @@ -865,7 +865,7 @@ } // Debug.logInfo("=====attachment not contains attachment, index:" + currentIndex, module); // Debug.logInfo("=====check for currentIndex(" + currentIndex + ") against master contentIndex(" + EmailServices.contentIndex + ")", module); - if(currentIndex.concat("." + i).equals(CommunicationEventServices.contentIndex)) continue; + if (currentIndex.concat("." + i).equals(CommunicationEventServices.contentIndex)) continue; // The first test should not pass, because if it exists, it should be the bodyContentIndex part // Debug.logInfo("====check for disposition: " + disposition + " contentType: '" + thisContentType + "' variable i:" + i, module); 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -892,7 +892,7 @@ deletePcmCtx.put("userLogin", context.get("userLogin")); try { Map<String, Object> deletePcmResult = ctx.getDispatcher().runSync("deletePartyContactMechPurpose", deletePcmCtx); - if(ServiceUtil.isError(deletePcmResult)) { + if (ServiceUtil.isError(deletePcmResult)) { return deletePcmResult; } } catch (GenericServiceException e) { @@ -1064,7 +1064,7 @@ Debug.logError(e.getMessage(), module); return ServiceUtil.returnError(e.getMessage()); } - if(UtilValidate.isEmpty(emailAddVerifications)) { + if (UtilValidate.isEmpty(emailAddVerifications)) { GenericValue emailAddressVerification = delegator.makeValue("EmailAddressVerification"); emailAddressVerification.set("emailAddress", emailAddress); emailAddressVerification.set("verifyHash", verifyHash); Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java Fri Mar 6 17:36:09 2009 @@ -67,11 +67,11 @@ try { List<GenericValue> tempCol = delegator.findByAnd("PartyContactMech", UtilMisc.toMap("partyId", partyId)); - if(contactMechTypeId != null) { + if (contactMechTypeId != null) { List<GenericValue> tempColTemp = FastList.newInstance(); for (GenericValue partyContactMech: tempCol) { GenericValue contactMech = delegator.getRelatedOne("ContactMech", partyContactMech); - if(contactMech != null && contactMechTypeId.equals(contactMech.getString("contactMechTypeId"))) { + if (contactMech != null && contactMechTypeId.equals(contactMech.getString("contactMechTypeId"))) { tempColTemp.add(partyContactMech); } @@ -138,11 +138,11 @@ try { List<GenericValue> tempCol = delegator.findByAnd("FacilityContactMech", UtilMisc.toMap("facilityId", facilityId)); - if(contactMechTypeId != null) { + if (contactMechTypeId != null) { List<GenericValue> tempColTemp = FastList.newInstance(); for (GenericValue partyContactMech: tempCol) { GenericValue contactMech = delegator.getRelatedOne("ContactMech", partyContactMech); - if(contactMech != null && contactMechTypeId.equals(contactMech.getString("contactMechTypeId"))) { + if (contactMech != null && contactMechTypeId.equals(contactMech.getString("contactMechTypeId"))) { tempColTemp.add(partyContactMech); } Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java Fri Mar 6 17:36:09 2009 @@ -584,10 +584,10 @@ //Map noteCtx = UtilMisc.toMap("note", noteString, "userLogin", userLogin); //Make sure the note Id actually exists if one is passed to avoid a foreign key error below - if(noteId != null) { + if (noteId != null) { try { GenericValue value = delegator.findByPrimaryKey("NoteData", UtilMisc.toMap("noteId", noteId)); - if(value == null) { + if (value == null) { Debug.logError("ERROR: Note id does not exist for : " + noteId + ", autogenerating." , module); noteId = null; } 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -459,7 +459,7 @@ CategoryContentWrapper catContentWrapper = new CategoryContentWrapper(cat, request); catContentWrappers.put(productCategoryId, catContentWrapper); List<GenericValue> subCat = getRelatedCategoriesRet(request, "subCatList", productCategoryId, true); - if(subCat != null) { + if (subCat != null) { 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -188,7 +188,7 @@ for (ConfigItem ci: questions) { if (ci.isMandatory()) { ConfigOption co = ci.getDefault(); - if(co != null) { + if (co != null) { co.setSelected(true); }else if (ci.getOptions().size() > 0) { co = ci.getOptions().get(0); @@ -481,7 +481,7 @@ public ConfigOption getDefault() { String defaultConfigOptionId = configItemAssoc.getString("defaultConfigOptionId"); - if(UtilValidate.isNotEmpty(defaultConfigOptionId)) { + if (UtilValidate.isNotEmpty(defaultConfigOptionId)) { for(ConfigOption oneOption : getOptions()) { String currentConfigOptionId = oneOption.getId(); if (defaultConfigOptionId.compareToIgnoreCase(currentConfigOptionId) == 0 ) { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java Fri Mar 6 17:36:09 2009 @@ -90,7 +90,7 @@ /* ImageProperties.xml */ String imgPropertyFullPath = System.getProperty("ofbiz.home") + "/applications/product/config/ImageProperties.xml"; resultXMLMap.putAll((Map<String, Object>) ImageTransform.getXMLValue(imgPropertyFullPath, locale)); - if(resultXMLMap.containsKey("responseMessage") && resultXMLMap.get("responseMessage").equals("success")) { + if (resultXMLMap.containsKey("responseMessage") && resultXMLMap.get("responseMessage").equals("success")) { imgPropertyMap.putAll((Map<String, Map<String, String>>) resultXMLMap.get("xml")); } else { String errMsg = UtilProperties.getMessage(resource, "ScaleImage.unable_to_parse", locale) + " : ImageProperties.xml"; @@ -111,10 +111,10 @@ String id = null; String type = null; - if(viewType.toLowerCase().contains("main")) { + if (viewType.toLowerCase().contains("main")) { type = "original"; id = imgName; - } else if(viewType.toLowerCase().contains("additional") && viewNumber != null && !viewNumber.equals("0")) { + } else if (viewType.toLowerCase().contains("additional") && viewNumber != null && !viewNumber.equals("0")) { type = "additional"; id = imgName + "_View_" + viewNumber; } else { @@ -195,7 +195,7 @@ String newFileLocation = null; if (viewType.toLowerCase().contains("main")) { newFileLocation = mainFilenameExpander.expandString(UtilMisc.toMap("location", "products", "type", sizeType, "id", id)); - } else if(viewType.toLowerCase().contains("additional")) { + } else if (viewType.toLowerCase().contains("additional")) { newFileLocation = addFilenameExpander.expandString(UtilMisc.toMap("location", "products", "viewtype", viewType, "sizetype", sizeType,"id", id)); } String newFilePathPrefix = ""; 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=750997&r1=750996&r2=750997&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:36:09 2009 @@ -860,11 +860,11 @@ } //change this for product price for (GenericValue onePrice: productPrices) { - if(onePrice.getString("productPriceTypeId").equals("DEFAULT_PRICE")) { //defaultPrice + if (onePrice.getString("productPriceTypeId").equals("DEFAULT_PRICE")) { //defaultPrice result.put("defultPrice", onePrice.getBigDecimal("price")); - }else if(onePrice.getString("productPriceTypeId").equals("WHOLESALE_PRICE")) {// + }else if (onePrice.getString("productPriceTypeId").equals("WHOLESALE_PRICE")) {// result.put("wholeSalePrice", onePrice.getBigDecimal("price")); - }else if(onePrice.getString("productPriceTypeId").equals("LIST_PRICE")) {//listPrice + }else if (onePrice.getString("productPriceTypeId").equals("LIST_PRICE")) {//listPrice result.put("listPrice", onePrice.getBigDecimal("price")); }else{ result.put("defultPrice", onePrice.getBigDecimal("price")); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java Fri Mar 6 17:36:09 2009 @@ -1100,7 +1100,7 @@ StringBuilder ppBuf = new StringBuilder(); if (productFeatureCategory != null) { ppBuf.append(UtilProperties.getMessage(resource, "ProductFeatureCategory", locale)).append(": "); - if(productFeatureCategory.get("description") != null) { + if (productFeatureCategory.get("description") != null) { ppBuf.append(productFeatureCategory.get("description")); } else { ppBuf.append("[").append(this.productFeatureCategoryId).append("]"); @@ -1177,7 +1177,7 @@ StringBuilder ppBuf = new StringBuilder(); if (productFeatureGroup != null) { ppBuf.append(UtilProperties.getMessage(resource, "ProductFeatureGroup", locale)).append(": "); - if(productFeatureGroup.get("description") != null) { + if (productFeatureGroup.get("description") != null) { ppBuf.append(productFeatureGroup.get("description")); } else { ppBuf.append("[").append(this.productFeatureGroupId).append("]"); 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -995,10 +995,10 @@ "productFeatureIactnTypeId","FEATURE_IACTN_INCOMP")); for (GenericValue incompatibilityVariant: incompatibilityVariants) { String featur = incompatibilityVariant.getString("productFeatureId"); - if(paramValue.equals(featur)) { + if (paramValue.equals(featur)) { String featurTo = incompatibilityVariant.getString("productFeatureIdTo"); for (String paramValueTo: selectedFeatures) { - if(featurTo.equals(paramValueTo)) { + if (featurTo.equals(paramValueTo)) { Debug.logWarning("Incompatible features", module); return null; } @@ -1011,11 +1011,11 @@ "productFeatureIactnTypeId","FEATURE_IACTN_DEPEND")); for (GenericValue dpVariant: dependenciesVariants) { String featur = dpVariant.getString("productFeatureId"); - if(paramValue.equals(featur)) { + if (paramValue.equals(featur)) { String featurTo = dpVariant.getString("productFeatureIdTo"); boolean found = false; for (String paramValueTo: selectedFeatures) { - if(featurTo.equals(paramValueTo)) { + if (featurTo.equals(paramValueTo)) { found = true; break; } 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -139,7 +139,7 @@ Boolean replaceMeterNumber = (Boolean) context.get("replaceMeterNumber"); - if(! replaceMeterNumber.booleanValue()) { + if (! replaceMeterNumber.booleanValue()) { String meterNumber = UtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.fedex.access.meterNumber"); if (UtilValidate.isNotEmpty(meterNumber)) { return ServiceUtil.returnError("MeterNumber already exists: " + shipmentPropertiesFile + ":shipment.fedex.access.meterNumber=" + meterNumber); @@ -156,7 +156,7 @@ return ServiceUtil.returnError("accountNbr not found for Fedex subscription request."); } - if(UtilValidate.isEmpty(contactPartyName)) { + if (UtilValidate.isEmpty(contactPartyName)) { return ServiceUtil.returnError("Contact name can't be empty."); } @@ -258,7 +258,7 @@ faxNumberConditions.add(EntityCondition.makeCondition("contactNumber", EntityOperator.NOT_EQUAL, "")); List<GenericValue> faxNumbers = EntityUtil.filterByCondition(partyContactDetails, EntityCondition.makeCondition(faxNumberConditions, EntityOperator.AND)); GenericValue faxNumberValue = EntityUtil.getFirst(faxNumbers); - if(! UtilValidate.isEmpty(faxNumberValue)) { + if (! UtilValidate.isEmpty(faxNumberValue)) { faxNumber = faxNumberValue.getString("areaCode") + faxNumberValue.getString("contactNumber"); // Fedex doesn't want the North American country code if (UtilValidate.isNotEmpty(faxNumberValue.getString("countryCode")) && !(countryCode.equals("CA") || countryCode.equals("US"))) { @@ -274,7 +274,7 @@ emailConditions.add(EntityCondition.makeCondition("infoString", EntityOperator.NOT_EQUAL, "")); List<GenericValue> emailAddresses = EntityUtil.filterByCondition(partyContactDetails, EntityCondition.makeCondition(emailConditions, EntityOperator.AND)); GenericValue emailAddressValue = EntityUtil.getFirst(emailAddresses); - if(! UtilValidate.isEmpty(emailAddressValue)) { + if (! UtilValidate.isEmpty(emailAddressValue)) { emailAddress = emailAddressValue.getString("infoString"); } 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=750997&r1=750996&r2=750997&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 Fri Mar 6 17:36:09 2009 @@ -638,7 +638,7 @@ if (UtilValidate.isNotEmpty(totalCurrencyCode)) { if (UtilValidate.isEmpty(shipmentRouteSegment.getString("currencyUomId"))) { shipmentRouteSegment.set("currencyUomId", totalCurrencyCode); - } else if(!totalCurrencyCode.equals(shipmentRouteSegment.getString("currencyUomId"))) { + } else if (!totalCurrencyCode.equals(shipmentRouteSegment.getString("currencyUomId"))) { errorList.add("The Currency Unit of Measure returned [" + totalCurrencyCode + "] is not the same as the original [" + shipmentRouteSegment.getString("currencyUomId") + "], setting to the new one."); shipmentRouteSegment.set("currencyUomId", totalCurrencyCode); } @@ -904,7 +904,7 @@ if (UtilValidate.isNotEmpty(totalCurrencyCode)) { if (UtilValidate.isEmpty(shipmentRouteSegment.getString("currencyUomId"))) { shipmentRouteSegment.set("currencyUomId", totalCurrencyCode); - } else if(!totalCurrencyCode.equals(shipmentRouteSegment.getString("currencyUomId"))) { + } else if (!totalCurrencyCode.equals(shipmentRouteSegment.getString("currencyUomId"))) { errorList.add("The Currency Unit of Measure returned [" + totalCurrencyCode + "] is not the same as the original [" + shipmentRouteSegment.getString("currencyUomId") + "], setting to the new one."); shipmentRouteSegment.set("currencyUomId", totalCurrencyCode); } @@ -1607,7 +1607,7 @@ Iterator<String> i = packageMap.keySet().iterator(); String productId = i.next(); Map<String, Object> productInfo = getProductItemInfo(shippableItemInfo, productId); - if(productInfo.get("inShippingBox") != null && ((String) productInfo.get("inShippingBox")).equalsIgnoreCase("Y") + if (productInfo.get("inShippingBox") != null && ((String) productInfo.get("inShippingBox")).equalsIgnoreCase("Y") && 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); @@ -1653,7 +1653,7 @@ for (int z = 1; z <= totalQuantity.intValue(); z++) { BigDecimal partialQty = pieces > 1 ? BigDecimal.ONE.divide(BigDecimal.valueOf(pieces), generalRounding) : BigDecimal.ONE; for (long x = 0; x < pieces; x++) { - if(itemInfo.get("inShippingBox") != null && ((String) itemInfo.get("inShippingBox")).equalsIgnoreCase("Y")) { + if (itemInfo.get("inShippingBox") != null && ((String) itemInfo.get("inShippingBox")).equalsIgnoreCase("Y")) { Map<String, BigDecimal> newPackage = FastMap.newInstance(); newPackage.put(productId, partialQty); packages.add(newPackage); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java Fri Mar 6 17:36:09 2009 @@ -1013,17 +1013,17 @@ EntityConditionList<EntityExpr> dateConditions = null; EntityExpr dateCondition=null; - if(fromDate !=null && thruDate!=null) { + if (fromDate !=null && thruDate!=null) { dateConditions= EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("lastModifiedDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate), EntityCondition.makeCondition("lastModifiedDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate)), EntityOperator.AND); - } if(fromDate !=null) { + } if (fromDate !=null) { dateCondition=EntityCondition.makeCondition("lastModifiedDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate); } else if (thruDate != null) { dateCondition = EntityCondition.makeCondition("lastModifiedDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate); } EntityConditionList<? extends EntityCondition> conditions = null; - if(fromDate !=null && thruDate!=null) { + if (fromDate !=null && thruDate!=null) { conditions=EntityCondition.makeCondition(UtilMisc.toList( dateConditions, EntityCondition.makeCondition("lastModifiedDate", EntityOperator.EQUALS, null)), Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilDateTime.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilDateTime.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilDateTime.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilDateTime.java Fri Mar 6 17:36:09 2009 @@ -746,9 +746,9 @@ Calendar calendar = Calendar.getInstance(); calendar.setFirstDayOfWeek(startOfWeek); - if(startOfWeek == Calendar.MONDAY) { + if (startOfWeek == Calendar.MONDAY) { calendar.setMinimalDaysInFirstWeek(4); - } else if(startOfWeek == Calendar.SUNDAY) { + } else if (startOfWeek == Calendar.SUNDAY) { calendar.setMinimalDaysInFirstWeek(3); } 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=750997&r1=750996&r2=750997&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:36:09 2009 @@ -1036,7 +1036,7 @@ } if (!paramNames.contains(name)) { cleanQuery.append(token); - if(queryTokens.hasMoreTokens()) { + if (queryTokens.hasMoreTokens()) { cleanQuery.append("&"); } } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java?rev=750997&r1=750996&r2=750997&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java Fri Mar 6 17:36:09 2009 @@ -208,7 +208,7 @@ String retString = retStringBuf.toString(); - // if(!quiet) Debug.logInfo(retString, module); + // if (!quiet) Debug.logInfo(retString, module); if (log && Debug.timingOn()) Debug.logTiming(retString, module); return retString; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |