Re: svn commit: r1511742 [1/5] - in /ofbiz/trunk: applications/accounting/src/or
Locked
Re: svn commit: r1511742 [1/5] - in /ofbiz/trunk: applications/accounting/src/or
 
Administrator
|
It was quite boring to check, but there should not be any bugs left after r1459222 and r1509164
Jacques ----- Original Message ----- From: <[hidden email]> To: <[hidden email]> Sent: Thursday, August 08, 2013 2:28 PM Subject: svn commit: r1511742 [1/5] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/tax/ applications/accounting/src/org/ofbi... > Author: jleroux > Date: Thu Aug 8 12:28:01 2013 > New Revision: 1511742 > > URL: http://svn.apache.org/r1511742 > Log: > No functional changes, only formatting. > While looking for other cases like r1459222 and r1509164 introduced by r1300812 and r1305309. I noticed there were a lot of wrong for loops formatting (miss a white space after for), this changes it > > Modified: > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.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/blog/BlogRssServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java > ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.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/quote/QuoteServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.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/ShoppingCartHelper.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/product/ProductDisplayWorker.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.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/order/src/org/ofbiz/order/test/OrderTestServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java > ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java > ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.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/imagemanagement/ImageManagementServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java > ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java > ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java > ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java > ofbiz/trunk/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java > ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.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=1511742&r1=1511741&r2=1511742&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 Thu Aug 8 12:28:01 2013 > @@ -3367,7 +3367,7 @@ public class InvoiceServices { > } > > try { > - for(final CSVRecord rec : fmt.parse(csvReader)) { > + for (final CSVRecord rec : fmt.parse(csvReader)) { > currentInvoiceId = rec.get("invoiceId"); > if (lastInvoiceId == null || !currentInvoiceId.equals(lastInvoiceId)) { > newInvoiceId = null; > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java Thu Aug 8 12:28:01 2013 > @@ -84,7 +84,7 @@ public class BillingAccountWorker { > > if (billingAccountRoleList.size() > 0) { > BigDecimal totalAvailable = BigDecimal.ZERO; > - for(GenericValue billingAccountRole : billingAccountRoleList) { > + for (GenericValue billingAccountRole : billingAccountRoleList) { > GenericValue billingAccountVO = billingAccountRole.getRelatedOne("BillingAccount", false); > > // skip accounts that have thruDate < nowTimestamp > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Thu Aug 8 12:28:01 2013 > @@ -798,7 +798,7 @@ public class GiftCertificateServices { > // make a map of answer info > Map<String, Object> answerMap = FastMap.newInstance(); > if (responseAnswers != null) { > - for(GenericValue answer : responseAnswers) { > + for (GenericValue answer : responseAnswers) { > GenericValue question = null; > try { > question = answer.getRelatedOne("SurveyQuestion", false); > @@ -1034,7 +1034,7 @@ public class GiftCertificateServices { > // make a map of answer info > Map<String, Object> answerMap = FastMap.newInstance(); > if (responseAnswers != null) { > - for(GenericValue answer : responseAnswers) { > + for (GenericValue answer : responseAnswers) { > GenericValue question = null; > try { > question = answer.getRelatedOne("SurveyQuestion", false); > > 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=1511742&r1=1511741&r2=1511742&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 Thu Aug 8 12:28:01 2013 > @@ -365,7 +365,7 @@ public class PaymentGatewayServices { > int finished = 0; > int hadError = 0; > List<String> messages = FastList.newInstance(); > - for(GenericValue paymentPref : paymentPrefs) { > + for (GenericValue paymentPref : paymentPrefs) { > if (reAuth && "PAYMENT_AUTHORIZED".equals(paymentPref.getString("statusId"))) { > String paymentConfig = null; > // get the payment settings i.e. serviceName and config properties file name > @@ -761,7 +761,7 @@ public class PaymentGatewayServices { > > // iterate over the prefs and release each one > List<GenericValue> finished = FastList.newInstance(); > - for(GenericValue pPref : paymentPrefs) { > + for (GenericValue pPref : paymentPrefs) { > Map<String, Object> releaseContext = UtilMisc.toMap("userLogin", userLogin, "orderPaymentPreferenceId", pPref.getString("orderPaymentPreferenceId")); > Map<String, Object> releaseResult = null; > try { > @@ -820,7 +820,7 @@ public class PaymentGatewayServices { > List<GenericValue> messageEntities = FastList.newInstance(); > List<String> messages = UtilGenerics.cast(context.get("internalRespMsgs")); > if (UtilValidate.isNotEmpty(messages)) { > - for(String message : messages) { > + for (String message : messages) { > GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg"); > String respMsgId = delegator.getNextSeqId("PaymentGatewayRespMsg"); > respMsg.set("paymentGatewayRespMsgId", respMsgId); > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Thu Aug 8 12:28:01 2013 > @@ -109,7 +109,7 @@ public class TaxAuthorityServices { > } > > // add up amounts from adjustments (amount OR exemptAmount, sourcePercentage) > - for(GenericValue taxAdjustment : taxAdustmentList) { > + for (GenericValue taxAdjustment : taxAdustmentList) { > if ("SALES_TAX".equals(taxAdjustment.getString("orderAdjustmentTypeId"))) { > taxPercentage = taxPercentage.add(taxAdjustment.getBigDecimal("sourcePercentage")); > BigDecimal adjAmount = taxAdjustment.getBigDecimal("amount"); > @@ -295,7 +295,7 @@ public class TaxAuthorityServices { > EntityOperator.AND, > EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.EQUALS, "_NA_"))); > > - for(GenericValue taxAuthority : taxAuthoritySet) { > + for (GenericValue taxAuthority : taxAuthoritySet) { > EntityCondition taxAuthCond = EntityCondition.makeCondition( > EntityCondition.makeCondition("taxAuthPartyId", EntityOperator.EQUALS, taxAuthority.getString("taxAuthPartyId")), > EntityOperator.AND, > @@ -327,7 +327,7 @@ public class TaxAuthorityServices { > } > List<GenericValue> pcmList = delegator.findList("ProductCategoryMember", productIdCond, UtilMisc.toSet("productCategoryId", "fromDate", "thruDate"), null, null, true); > pcmList = EntityUtil.filterByDate(pcmList, true); > - for(GenericValue pcm : pcmList) { > + for (GenericValue pcm : pcmList) { > productCategoryIdSet.add(pcm.getString("productCategoryId")); > } > > @@ -389,7 +389,7 @@ public class TaxAuthorityServices { > } > > // find the right entry(s) based on purchase amount > - for(GenericValue taxAuthorityRateProduct : filteredList) { > + for (GenericValue taxAuthorityRateProduct : filteredList) { > BigDecimal taxRate = taxAuthorityRateProduct.get("taxPercentage") != null ? taxAuthorityRateProduct.getBigDecimal("taxPercentage") : ZERO_BASE; > BigDecimal taxable = ZERO_BASE; > > @@ -469,7 +469,7 @@ public class TaxAuthorityServices { > Set<String> billToPartyIdSet = FastSet.newInstance(); > billToPartyIdSet.add(billToPartyId); > List<GenericValue> partyRelationshipList = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", UtilMisc.toMap("partyIdTo", billToPartyId, "partyRelationshipTypeId", "GROUP_ROLLUP"), null, true), true); > - for(GenericValue partyRelationship : partyRelationshipList) { > + for (GenericValue partyRelationship : partyRelationshipList) { > billToPartyIdSet.add(partyRelationship.getString("partyIdFrom")); > } > handlePartyTaxExempt(taxAdjValue, billToPartyIdSet, taxAuthGeoId, taxAuthPartyId, taxAmount, nowTimestamp, delegator); > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java Thu Aug 8 12:28:01 2013 > @@ -193,7 +193,7 @@ public class IdealEvents { > GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); > Map <String, Object> parametersMap = UtilHttp.getParameterMap(request); > String transactionId = request.getParameter("trxid"); > - for(String name : parametersMap.keySet()) { > + for (String name : parametersMap.keySet()) { > String value = request.getParameter(name); > Debug.logError("### Param: " + name + " => " + value, module); > } > @@ -318,7 +318,7 @@ public class IdealEvents { > return false; > } > if (paymentPrefs.size() > 0) { > - for(GenericValue pref : paymentPrefs) { > + for (GenericValue pref : paymentPrefs) { > boolean okay = setPaymentPreference(dispatcher, userLogin, pref, request); > if (!okay) > return false; > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Thu Aug 8 12:28:01 2013 > @@ -245,7 +245,7 @@ public class PayPalEvents { > > Debug.logInfo("Got verification from PayPal, processing..", module); > boolean verified = false; > - for(String name : parametersMap.keySet()) { > + for (String name : parametersMap.keySet()) { > String value = request.getParameter(name); > Debug.logError("### Param: " + name + " => " + value, module); > if (UtilValidate.isNotEmpty(name) && "payer_status".equalsIgnoreCase(name) && > @@ -412,7 +412,7 @@ public class PayPalEvents { > return false; > } > if (paymentPrefs.size() > 0) { > - for(GenericValue pref : paymentPrefs) { > + for (GenericValue pref : paymentPrefs) { > boolean okay = setPaymentPreference(dispatcher, userLogin, pref, request); > if (!okay) > return false; > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Thu Aug 8 12:28:01 2013 > @@ -1158,7 +1158,7 @@ public class ValueLinkServices { > // make a map of answer info > Map<String, Object> answerMap = FastMap.newInstance(); > if (responseAnswers != null) { > - for(GenericValue answer : responseAnswers) { > + for (GenericValue answer : responseAnswers) { > GenericValue question = null; > try { > question = answer.getRelatedOne("SurveyQuestion", false); > @@ -1413,7 +1413,7 @@ public class ValueLinkServices { > // make a map of answer info > Map<String, Object> answerMap = FastMap.newInstance(); > if (responseAnswers != null) { > - for(GenericValue answer : responseAnswers) { > + for (GenericValue answer : responseAnswers) { > GenericValue question = null; > try { > question = answer.getRelatedOne("SurveyQuestion", false); > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java Thu Aug 8 12:28:01 2013 > @@ -671,7 +671,7 @@ public class PayflowPro { > Debug.logInfo("Verisign response string: " + resp, module); > Map<String, String> parameters = FastMap.newInstance(); > List<String> params = StringUtil.split(resp, "&"); > - for(String str : params) { > + for (String str : params) { > if (str.length() > 0) { > List<String> kv = StringUtil.split(str, "="); > String k = kv.get(0); > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Thu Aug 8 12:28:01 2013 > @@ -316,7 +316,7 @@ public class WorldPayEvents { > GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); > Map <String, Object> parametersMap = UtilHttp.getParameterMap(request); > String orderId = request.getParameter("cartId"); > - for(String name : parametersMap.keySet()) { > + for (String name : parametersMap.keySet()) { > String value = request.getParameter(name); > Debug.logError("### Param: " + name + " => " + value, module); > } > @@ -417,7 +417,7 @@ public class WorldPayEvents { > return false; > } > if (paymentPrefs.size() > 0) { > - for(GenericValue pref : paymentPrefs) { > + for (GenericValue pref : paymentPrefs) { > boolean okay = setPaymentPreference(dispatcher, userLogin, pref, request); > if (!okay) { > return false; > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java Thu Aug 8 12:28:01 2013 > @@ -124,7 +124,7 @@ public class UtilAccounting { > private static void getGlAccountClassChildren(GenericValue glAccountClass, List<String> glAccountClassIds) throws GenericEntityException { > glAccountClassIds.add(glAccountClass.getString("glAccountClassId")); > List<GenericValue> glAccountClassChildren = glAccountClass.getRelated("ChildGlAccountClass", null, null, true); > - for(GenericValue glAccountClassChild : glAccountClassChildren) { > + for (GenericValue glAccountClassChild : glAccountClassChildren) { > getGlAccountClassChildren(glAccountClassChild, glAccountClassIds); > } > } > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java Thu Aug 8 12:28:01 2013 > @@ -99,11 +99,11 @@ public class ContentManagementEvents { > */ > > int counter = 0; > - for(Map<String, Object> map : valueList) { > + for (Map<String, Object> map : valueList) { > String contentId = (String)map.get("contentId"); > //Integer idxObj = (Integer)contentIdLookup.get(contentId); > //int idx = idxObj.intValue(); > - for(String [] pubArr : permittedPublishPointList) { > + for (String [] pubArr : permittedPublishPointList) { > String pubContentId = pubArr[0]; > String pubValue = (String)map.get(pubContentId); > String paramName = Integer.toString(counter) + "_" + pubContentId; > @@ -208,7 +208,7 @@ public class ContentManagementEvents { > // make a map of the values that are passed in using the top subSite as the key. > // Content can only be linked to one subsite under a top site (ends with "_MASTER") > Map<String, String> siteIdLookup = FastMap.newInstance(); > - for(String param : paramMap.keySet()) { > + for (String param : paramMap.keySet()) { > int pos = param.indexOf("select_"); > //if (Debug.infoOn()) Debug.logInfo("in updatePublishLinks, param:" + param + " pos:" + pos , module); > if (pos >= 0) { > @@ -227,14 +227,14 @@ public class ContentManagementEvents { > // String permissionMessage = null; > boolean statusIdUpdated = false; > Map<String, Object> results = null; > - for(Object [] arr : origPublishedLinkList) { > + for (Object [] arr : origPublishedLinkList) { > //if (Debug.infoOn()) Debug.logInfo("in updatePublishLinks, arr:" + Arrays.asList(arr) , module); > String contentId = (String)arr[0]; // main (2nd level) site id > String origSubContentId = null; > List<Object []> origSubList = UtilGenerics.checkList(arr[1]); > // Timestamp topFromDate = (Timestamp)arr[3]; > Timestamp origFromDate = null; > - for(Object [] pubArr : origSubList) { > + for (Object [] pubArr : origSubList) { > // see if a link already exists by looking for non-null fromDate > //if (Debug.infoOn()) Debug.logInfo("in updatePublishLinks, pubArr:" + Arrays.asList(pubArr) , module); > Timestamp fromDate = (Timestamp)pubArr[2]; > @@ -255,7 +255,7 @@ public class ContentManagementEvents { > // disable existing link > if (UtilValidate.isNotEmpty(origSubContentId) && origFromDate != null) { > List<GenericValue> oldActiveValues = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId", targContentId, "contentIdTo", origSubContentId, "contentAssocTypeId", "PUBLISH_LINK", "thruDate", null), null, false); > - for(GenericValue cAssoc : oldActiveValues) { > + for (GenericValue cAssoc : oldActiveValues) { > cAssoc.set("thruDate", nowTimestamp); > cAssoc.store(); > //if (Debug.infoOn()) Debug.logInfo("in updatePublishLinks, deactivating:" + cAssoc , module); > @@ -309,12 +309,12 @@ public class ContentManagementEvents { > } else if (UtilValidate.isNotEmpty(origSubContentId)) { > // if no current link is passed in, look to see if there is an existing link(s) that must be disabled > List<GenericValue> oldActiveValues = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId", targContentId, "contentIdTo", origSubContentId, "contentAssocTypeId", "PUBLISH_LINK", "thruDate", null), null, false); > - for(GenericValue cAssoc : oldActiveValues) { > + for (GenericValue cAssoc : oldActiveValues) { > cAssoc.set("thruDate", nowTimestamp); > cAssoc.store(); > } > oldActiveValues = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId", targContentId, "contentIdTo", contentId, "contentAssocTypeId", "PUBLISH_LINK", "thruDate", null), null, false); > - for(GenericValue cAssoc : oldActiveValues) { > + for (GenericValue cAssoc : oldActiveValues) { > cAssoc.set("thruDate", nowTimestamp); > cAssoc.store(); > } > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java Thu Aug 8 12:28:01 2013 > @@ -342,7 +342,7 @@ public class ContentManagementServices { > try { > if (contentPurposeList != null) { > Set<String> contentPurposeSet = UtilMisc.makeSetWritable(contentPurposeList); > - for(String contentPurposeTypeId : contentPurposeSet) { > + for (String contentPurposeTypeId : contentPurposeSet) { > GenericValue contentPurpose = delegator.makeValue("ContentPurpose", UtilMisc.toMap("contentId", contentId, "contentPurposeTypeId", contentPurposeTypeId)); > contentPurpose.create(); > } > @@ -470,7 +470,7 @@ public class ContentManagementServices { > return ServiceUtil.returnError(e.toString()); > } > > - for(GenericValue roleType : siteRoles) { > + for (GenericValue roleType : siteRoles) { > Map<String, Object> serviceContext = FastMap.newInstance(); > serviceContext.put("partyId", partyId); > serviceContext.put("contentId", siteContentId); > @@ -768,7 +768,7 @@ public class ContentManagementServices { > String partyId = (String)serviceContext.get("partyId"); > Map<String, Object> findMap = UtilMisc.<String, Object>toMap("partyId", partyId); > List<GenericValue> userLoginList = delegator.findByAnd("UserLogin", findMap, null, false); > - for(GenericValue partyUserLogin : userLoginList) { > + for (GenericValue partyUserLogin : userLoginList) { > String partyUserLoginId = partyUserLogin.getString("userLoginId"); > serviceContext.put("contentId", partyUserLoginId); // author contentId > dispatcher.runSync("createContentRole", serviceContext); > @@ -798,7 +798,7 @@ public class ContentManagementServices { > } catch (GenericEntityException e) { > return ServiceUtil.returnError(e.toString()); > } > - for(GenericValue roleType : siteRoles) { > + for (GenericValue roleType : siteRoles) { > String siteRole = (String)roleType.get("roleTypeId"); // BLOG_EDITOR, BLOG_ADMIN, etc. > String cappedSiteRole = ModelUtil.dbNameToVarName(siteRole); > //if (Debug.infoOn()) Debug.logInfo("updateSiteRoles, cappediteRole(1):" + cappedSiteRole, module); > @@ -1153,7 +1153,7 @@ public class ContentManagementServices { > thisContent.set("contentTypeId", contentTypeId); > thisContent.store(); > List<GenericValue> kids = ContentWorker.getAssociatedContent(thisContent, "from", UtilMisc.toList("SUB_CONTENT"), null, null, null); > - for(GenericValue kidContent : kids) { > + for (GenericValue kidContent : kids) { > if (contentTypeId.equals("OUTLINE_NODE")) { > updateOutlineNodeChildren(kidContent, false, context); > } else { > @@ -1194,14 +1194,14 @@ public class ContentManagementServices { > thisContent.set("contentTypeId", "OUTLINE_NODE"); > thisContent.store(); > List<GenericValue> kids = ContentWorker.getAssociatedContent(thisContent, "from", UtilMisc.toList("SUB_CONTENT"), null, null, null); > - for(GenericValue kidContent : kids) { > + for (GenericValue kidContent : kids) { > if (contentTypeId.equals("OUTLINE_NODE")) { > updateOutlineNodeChildren(kidContent, true, context); > } else { > kidContent.put("contentTypeId", "PAGE_NODE"); > kidContent.store(); > List<GenericValue> kids2 = ContentWorker.getAssociatedContent(kidContent, "from", UtilMisc.toList("SUB_CONTENT"), null, null, null); > - for(GenericValue kidContent2 : kids2) { > + for (GenericValue kidContent2 : kids2) { > updatePageNodeChildren(kidContent2, context); > } > } > @@ -1272,7 +1272,7 @@ public class ContentManagementServices { > > //if (contentTypeId == null || contentTypeId.equals("OUTLINE_DOCUMENT") || contentTypeId.equals("DOCUMENT")) { > List<GenericValue> kids = ContentWorker.getAssociatedContent(content, "from", UtilMisc.toList("SUB_CONTENT"), null, null, null); > - for(GenericValue kidContent : kids) { > + for (GenericValue kidContent : kids) { > updatePageNodeChildren(kidContent, context); > } > //} > @@ -1314,7 +1314,7 @@ public class ContentManagementServices { > if (contentTypeId == null || contentTypeId.equals("DOCUMENT") || contentTypeId.equals("OUTLINE_NODE")) { > //if (contentTypeId == null || contentTypeId.equals("DOCUMENT")) { > List<GenericValue> kids = ContentWorker.getAssociatedContent(content, "from", UtilMisc.toList("SUB_CONTENT"), null, null, null); > - for(GenericValue kidContent : kids) { > + for (GenericValue kidContent : kids) { > updateOutlineNodeChildren(kidContent, forceOutline, context); > } > } > @@ -1611,7 +1611,7 @@ public class ContentManagementServices { > context.put("orderCreatedDate", orderCreatedDate); > List<GenericValue> orderItemList = orderHeader.getRelated("OrderItem", null, null, false); > ModelService subscriptionModel = dispatcher.getDispatchContext().getModelService("updateContentSubscriptionByProduct"); > - for(GenericValue orderItem : orderItemList) { > + for (GenericValue orderItem : orderItemList) { > BigDecimal qty = orderItem.getBigDecimal("quantity"); > String productId = (String) orderItem.get("productId"); > List<GenericValue> productContentList = delegator.findByAnd("ProductContent", UtilMisc.toMap("productId", productId, "productContentTypeId", "ONLINE_ACCESS"), null, false); > @@ -1685,7 +1685,7 @@ public class ContentManagementServices { > result = dispatcher.runSync(serviceName, UtilMisc.toMap("content", content, "userLogin", userLogin)); > > List<GenericValue> kids = ContentWorker.getAssociatedContent(content, "from", contentAssocTypeIdList, null, null, null); > - for(GenericValue kidContent : kids) { > + for (GenericValue kidContent : kids) { > followNodeChildrenMethod(kidContent, dispatcher, serviceName, context); > } > return result; > > 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=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Thu Aug 8 12:28:01 2013 > @@ -129,7 +129,7 @@ public class ContentManagementWorker { > Collection<String> keyColl = pk.getPrimaryKey().getAllKeys(); > List<String> keyList = UtilMisc.makeListWritable(keyColl); > Collections.sort(keyList); > - for(String ky : keyList) { > + for (String ky : keyList) { > String val = (String)pk.get(ky); > if (UtilValidate.isNotEmpty(val)) { > if (sig.length() > 0) sig.append("_"); > @@ -226,7 +226,7 @@ public class ContentManagementWorker { > GenericValue v = delegator.makeValue(entityName); > GenericPK passedPK = v.getPrimaryKey(); > Collection<String> keyColl = passedPK.getAllKeys(); > - for(String attrName : keyColl) { > + for (String attrName : keyColl) { > String attrVal = (String)request.getAttribute(attrName); > if (UtilValidate.isEmpty(attrVal)) { > attrVal = (String)paramMap.get(attrName); > @@ -244,7 +244,7 @@ public class ContentManagementWorker { > if (cachedPK != null) { > useCached = true; > keyColl = cachedPK.getPrimaryKey().getAllKeys(); > - for(String ky : keyColl) { > + for (String ky : keyColl) { > String sCached = null; > String sPassed = null; > Object oPassed = null; > @@ -299,7 +299,7 @@ public class ContentManagementWorker { > List<String []> permittedPublishPointList = FastList.newInstance(); > > // Check that user has permission to admin sites > - for(GenericValue webSitePP : allPublishPoints) { > + for (GenericValue webSitePP : allPublishPoints) { > String contentId = (String)webSitePP.get("contentId"); > String templateTitle = (String)webSitePP.get("templateTitle"); > GenericValue content = delegator.makeValue("Content", UtilMisc.toMap("contentId", contentId)); > @@ -343,7 +343,7 @@ public class ContentManagementWorker { > } > List<GenericValue> allPublishPoints = FastList.newInstance(); > GenericValue webSitePublishPoint = null; > - for(GenericValue contentAssoc : relatedPubPts) { > + for (GenericValue contentAssoc : relatedPubPts) { > String pub = (String)contentAssoc.get("contentId"); > //webSitePublishPoint = delegator.findOne("WebSitePublishPoint", UtilMisc.toMap("contentId", pub), true); > webSitePublishPoint = getWebSitePublishPoint(delegator, pub, false); > @@ -355,7 +355,7 @@ public class ContentManagementWorker { > public static Map<String, GenericValue> getPublishPointMap(Delegator delegator, String pubPtId) throws GeneralException { > List<GenericValue> publishPointList = getAllPublishPoints(delegator, pubPtId); > Map<String, GenericValue> publishPointMap = FastMap.newInstance(); > - for(GenericValue webSitePublishPoint : publishPointList) { > + for (GenericValue webSitePublishPoint : publishPointList) { > String pub = (String)webSitePublishPoint.get("contentId"); > publishPointMap.put(pub, webSitePublishPoint); > } > @@ -365,7 +365,7 @@ public class ContentManagementWorker { > > public static void getAllPublishPointMap(Delegator delegator, String pubPtId, Map<String, GenericValue> publishPointMap) throws GeneralException { > List<GenericValue> publishPointList = getAllPublishPoints(delegator, pubPtId); > - for(GenericValue webSitePublishPoint : publishPointList) { > + for (GenericValue webSitePublishPoint : publishPointList) { > String pub = (String)webSitePublishPoint.get("contentId"); > publishPointMap.put(pub, webSitePublishPoint); > getAllPublishPointMap(delegator, pub, publishPointMap); > @@ -374,7 +374,7 @@ public class ContentManagementWorker { > > public static Map<String, GenericValue> getPublishPointMap(Delegator delegator, List<GenericValue> publishPointList) { > Map<String, GenericValue> publishPointMap = FastMap.newInstance(); > - for(GenericValue webSitePublishPoint : publishPointList) { > + for (GenericValue webSitePublishPoint : publishPointList) { > String pub = (String)webSitePublishPoint.get("contentId"); > publishPointMap.put(pub, webSitePublishPoint); > } > @@ -391,7 +391,7 @@ public class ContentManagementWorker { > > List<Map<String, Object>> staticValueList = FastList.newInstance(); > int counter = 0; > - for(GenericValue content : assocValueList) { > + for (GenericValue content : assocValueList) { > String contentId = (String)content.get("contentId"); > String contentName = (String)content.get("contentName"); > String description = (String)content.get("description"); > @@ -399,7 +399,7 @@ public class ContentManagementWorker { > map.put("contentId", contentId); > map.put("contentName", contentName); > map.put("description", description); > - for(String [] publishPointArray : permittedPublishPointList) { > + for (String [] publishPointArray : permittedPublishPointList) { > String publishPointId = publishPointArray[0]; > List<GenericValue> contentAssocList = content.getRelated("ToContentAssoc", UtilMisc.toMap("contentId", publishPointId), null, false); > List<GenericValue> filteredList = EntityUtil.filterByDate(contentAssocList); > @@ -512,7 +512,7 @@ public class ContentManagementWorker { > List<String []> publishPointList = getPermittedPublishPoints(delegator, allPublishPointList, userLogin, security , permittedAction, permittedOperations, passedRoles); > Map<String, Object> publishPointMap = FastMap.newInstance(); > Map<String, Object> publishPointMapAll = FastMap.newInstance(); > - for(String [] arr : publishPointList) { > + for (String [] arr : publishPointList) { > //GenericValue webSitePublishPoint = (GenericValue)it.next(); > //String contentId = (String)webSitePublishPoint.get("contentId"); > //String description = (String)webSitePublishPoint.get("description"); > @@ -524,7 +524,7 @@ public class ContentManagementWorker { > publishPointMap.put(contentId, subArr); > publishPointMapAll.put(contentId, contentId); > List<GenericValue> subPublishPointList = getAllPublishPoints(delegator, contentId); > - for(GenericValue webSitePublishPoint2 : subPublishPointList) { > + for (GenericValue webSitePublishPoint2 : subPublishPointList) { > //String [] arr2 = (String [])it2.next(); > //String contentId2 = (String)arr2[0]; > //String description2 = (String)arr2[1]; > @@ -544,7 +544,7 @@ public class ContentManagementWorker { > } catch (GenericEntityException e) { > throw new GeneralException(e.getMessage()); > } > - for(GenericValue contentAssoc : assocValueList) { > + for (GenericValue contentAssoc : assocValueList) { > String contentIdTo = contentAssoc.getString("contentIdTo"); > String topContentId = (String)publishPointMapAll.get(contentIdTo); > Object [] subArr = (Object [])publishPointMap.get(topContentId); > @@ -568,7 +568,7 @@ public class ContentManagementWorker { > } > > List<Object []> publishedLinkList = FastList.newInstance(); > - for(String contentId : publishPointMap.keySet()) { > + for (String contentId : publishPointMap.keySet()) { > Object [] subPointArr = (Object [])publishPointMap.get(contentId); > publishedLinkList.add(subPointArr); > } > @@ -602,7 +602,7 @@ public class ContentManagementWorker { > List<String []> permittedDepartmentPointList = FastList.newInstance(); > > // Check that user has permission to admin sites > - for(GenericValue content : allDepartmentPoints) { > + for (GenericValue content : allDepartmentPoints) { > String contentId = (String)content.get("contentId"); > String contentName = (String)content.get("contentName"); > String statusId = null; > @@ -645,7 +645,7 @@ public class ContentManagementWorker { > } > List<GenericValue> allDepartmentPoints = FastList.newInstance(); > GenericValue departmentContent = null; > - for(GenericValue contentAssoc : relatedPubPts) { > + for (GenericValue contentAssoc : relatedPubPts) { > String pub = (String)contentAssoc.get("contentId"); > departmentContent = delegator.findOne("Content", UtilMisc.toMap("contentId", pub), true); > allDepartmentPoints.add(departmentContent); > @@ -677,7 +677,7 @@ public class ContentManagementWorker { > } > List<GenericValue> listAll = delegator.findList("ContentAssoc", conditionMain, null, null, null, true); > List<GenericValue> listFiltered = EntityUtil.filterByDate(listAll); > - for(GenericValue contentAssoc : listFiltered) { > + for (GenericValue contentAssoc : listFiltered) { > String subContentId = contentAssoc.getString("contentId"); > subLeafCount += updateStatsTopDown(delegator, subContentId, typeList); > } > @@ -701,7 +701,7 @@ public class ContentManagementWorker { > EntityCondition conditionMain = EntityCondition.makeCondition(UtilMisc.toList(EntityCondition.makeCondition("contentId", EntityOperator.EQUALS, contentId), conditionType), EntityOperator.AND); > List<GenericValue> listAll = delegator.findList("ContentAssoc", conditionMain, null, null, null, true); > List<GenericValue> listFiltered = EntityUtil.filterByDate(listAll); > - for(GenericValue contentAssoc : listFiltered) { > + for (GenericValue contentAssoc : listFiltered) { > String contentIdTo = contentAssoc.getString("contentIdTo"); > GenericValue contentTo = delegator.findOne("Content", UtilMisc.toMap("contentId", contentIdTo), false); > int intLeafCount = 0; > > 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=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java Thu Aug 8 12:28:01 2013 > @@ -125,7 +125,7 @@ In order ta make this service active add > size = data.length(); > List<GenericValue> contents = null; > > - for(int index = 0; index< size; index++) {//start character in line > + for (int index = 0; index< size; index++) {//start character in line > boolean contentNameMatch = false; > int contentAssocSize = 0; > List<GenericValue> contentAssocs = null; > @@ -255,7 +255,7 @@ In order ta make this service active add > subContents = subContents.replace(oldChar, newChar); > int size = subContents.length(); > try { > - for(index = 0; index < size; index++) {//start character in line > + for (index = 0; index < size; index++) {//start character in line > boolean contentNameMatch = false; > if (subContents.charAt(index) == check.charAt(0)) {//store data > contentName = contentName + contentNameInprogress; > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java Thu Aug 8 12:28:01 2013 > @@ -114,7 +114,7 @@ public class BlogRssServices { > } > > if (contentRecs != null) { > - for(GenericValue v : contentRecs) { > + for (GenericValue v : contentRecs) { > String sub = null; > try { > Map<String, Object> dummy = FastMap.newInstance(); > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java Thu Aug 8 12:28:01 2013 > @@ -103,7 +103,7 @@ public class CompDocEvents { > Map<String, Object> persistResult = dispatcher.runSync("persistContentAndAssoc", persistMap); > contentId = (String)persistResult.get("contentId"); > //request.setAttribute("contentId", contentId); > - for(Object obj : persistResult.keySet()) { > + for (Object obj : persistResult.keySet()) { > Object val = persistResult.get(obj); > request.setAttribute(obj.toString(), val); > } > @@ -113,7 +113,7 @@ public class CompDocEvents { > contentRevisionMap.put("contentId", contentId); > contentRevisionMap.put("userLogin", userLogin); > Map<String, Object> result = dispatcher.runSync("persistContentRevisionAndItem", contentRevisionMap); > - for(Object obj : result.keySet()) { > + for (Object obj : result.keySet()) { > Object val = result.get(obj); > request.setAttribute(obj.toString(), val); > } > > 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=1511742&r1=1511741&r2=1511742&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 Thu Aug 8 12:28:01 2013 > @@ -177,7 +177,7 @@ public class CompDocServices { > PdfCopy writer = new PdfCopy(document, baos); > document.open(); > int pgCnt =0; > - for(GenericValue contentAssocRevisionItemView : compDocParts) { > + for (GenericValue contentAssocRevisionItemView : compDocParts) { > //String thisContentId = contentAssocRevisionItemView.getString("contentId"); > //String thisContentRevisionSeqId = contentAssocRevisionItemView.getString("maxRevisionSeqId"); > String thisDataResourceId = contentAssocRevisionItemView.getString("dataResourceId"); > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java Thu Aug 8 12:28:01 2013 > @@ -102,7 +102,7 @@ public class ContentServices { > > List<GenericValue> permittedList = FastList.newInstance(); > Map<String, Object> permResults = null; > - for(GenericValue content : contentList) { > + for (GenericValue content : contentList) { > serviceInMap.put("currentContent", content); > try { > permResults = dispatcher.runSync("checkContentPermission", serviceInMap); > @@ -159,7 +159,7 @@ public class ContentServices { > if (UtilValidate.isEmpty(kids)) { > parentList.add(nodeMap.get("contentId")); > } else { > - for(Map<String, Object> node : kids) { > + for (Map<String, Object> node : kids) { > walkParentTree(node, parentList); > } > } > @@ -838,7 +838,7 @@ public class ContentServices { > List<GenericValue> filteredAssocs = EntityUtil.filterByDate(relatedAssocs); > //if (Debug.infoOn()) Debug.logInfo("in deactivateAssocs, filteredAssocs:" + filteredAssocs, module); > > - for(GenericValue val : filteredAssocs) { > + for (GenericValue val : filteredAssocs) { > val.set("thruDate", nowTimestamp); > val.store(); > //if (Debug.infoOn()) Debug.logInfo("in deactivateAssocs, val:" + val, module); > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Thu Aug 8 12:28:01 2013 > @@ -255,7 +255,7 @@ public class ContentServicesComplex { > String contentAssocTypeId = null; > List<GenericValue> contentAssocsTypeFiltered = FastList.newInstance(); > if (assocTypes != null && assocTypes.size() > 1) { > - for(GenericValue contentAssoc : contentAssocsDateFiltered) { > + for (GenericValue contentAssoc : contentAssocsDateFiltered) { > contentAssocTypeId = (String)contentAssoc.get("contentAssocTypeId"); > if (assocTypes.contains(contentAssocTypeId)) { > contentAssocsTypeFiltered.add(contentAssoc); > @@ -277,7 +277,7 @@ public class ContentServicesComplex { > GenericValue dataResource = null; > List<GenericValue> contentAssocDataResourceList = FastList.newInstance(); > Locale locale = Locale.getDefault(); // TODO: this needs to be passed in > - for(GenericValue contentAssoc : contentAssocsTypeFiltered) { > + for (GenericValue contentAssoc : contentAssocsTypeFiltered) { > content = contentAssoc.getRelatedOne(assocRelationName, true); > if (UtilValidate.isNotEmpty(contentTypes)) { > String contentTypeId = (String)content.get("contentTypeId"); > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Thu Aug 8 12:28:01 2013 > @@ -157,7 +157,7 @@ public class ContentWorker implements or > } > > alternateViews = EntityUtil.filterByDate(alternateViews, UtilDateTime.nowTimestamp(), "caFromDate", "caThruDate", true); > - for(GenericValue thisView : alternateViews) { > + for (GenericValue thisView : alternateViews) { > GenericValue altContentRole = EntityUtil.getFirst(EntityUtil.filterByDate(thisView.getRelated("ContentRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", roleTypeId), null, true))); > GenericValue altContent = null; > if (UtilValidate.isNotEmpty(altContentRole)) { > @@ -385,7 +385,7 @@ public class ContentWorker implements or > } > > alternateViews = EntityUtil.filterByDate(alternateViews, UtilDateTime.nowTimestamp(), "caFromDate", "caThruDate", true); > - for(GenericValue thisView : alternateViews) { > + for (GenericValue thisView : alternateViews) { > String currentLocaleString = thisView.getString("localeString"); > if (UtilValidate.isEmpty(currentLocaleString)) { > continue; > @@ -490,7 +490,7 @@ public class ContentWorker implements or > List<GenericValue> relatedAssocs = getContentAssocsWithId(delegator, contentId, fromDate, thruDate, direction, assocTypes); > Map<String, Object> assocContext = FastMap.newInstance(); > assocContext.put("related", relatedAssocs); > - for(GenericValue assocValue : relatedAssocs) { > + for (GenericValue assocValue : relatedAssocs) { > contentAssocTypeId = (String) assocValue.get("contentAssocTypeId"); > assocContext.put("contentAssocTypeId", contentAssocTypeId); > //assocContext.put("contentTypeId", assocValue.get("contentTypeId")); > @@ -687,7 +687,7 @@ public class ContentWorker implements or > } > List<GenericValue> relatedViews = UtilGenerics.checkList(results.get("entityList")); > //if (Debug.infoOn()) Debug.logInfo("traverse, relatedViews:" + relatedViews,null); > - for(GenericValue assocValue : relatedViews) { > + for (GenericValue assocValue : relatedViews) { > Map<String, Object> thisNode = ContentWorker.makeNode(assocValue); > checkConditions(delegator, thisNode, null, whenMap); > // boolean isReturnBeforePick = booleanDataType(thisNode.get("isReturnBeforePick")); > @@ -759,7 +759,7 @@ public class ContentWorker implements or > } > GenericValue content = null; > String contentTypeId = null; > - for(GenericValue assoc : assocList) { > + for (GenericValue assoc : assocList) { > String contentId = (String) assoc.get(contentIdName); > if (Debug.infoOn()) Debug.logInfo("contentId:" + contentId, ""); > content = delegator.findOne("Content", UtilMisc.toMap("contentId", contentId), false); > @@ -845,7 +845,7 @@ public class ContentWorker implements or > exprList.add(joinExpr); > if (UtilValidate.isNotEmpty(assocTypes)) { > List<EntityExpr> exprListOr = FastList.newInstance(); > - for(String assocType : assocTypes) { > + for (String assocType : assocTypes) { > expr = EntityCondition.makeCondition("contentAssocTypeId", EntityOperator.EQUALS, assocType); > exprListOr.add(expr); > } > @@ -955,7 +955,7 @@ public class ContentWorker implements or > //if (Debug.infoOn()) Debug.logInfo("getContentAncestry, lst:" + lst, ""); > List<GenericValue> lst2 = EntityUtil.filterByDate(lst); > //if (Debug.infoOn()) Debug.logInfo("getContentAncestry, lst2:" + lst2, ""); > - for(GenericValue contentAssoc : lst2) { > + for (GenericValue contentAssoc : lst2) { > String contentIdOther = contentAssoc.getString(contentIdOtherField); > if (!contentAncestorList.contains(contentIdOther)) { > getContentAncestryAll(delegator, contentIdOther, passedContentTypeId, direction, contentAncestorList); > @@ -977,7 +977,7 @@ public class ContentWorker implements or > List<GenericValue> contentAncestorList = FastList.newInstance(); > List<Map<String, Object>> nodeTrail = FastList.newInstance(); > getContentAncestry(delegator, contentId, contentAssocTypeId, direction, contentAncestorList); > - for(GenericValue value : contentAncestorList) { > + for (GenericValue value : contentAncestorList) { > Map<String, Object> thisNode = ContentWorker.makeNode(value); > nodeTrail.add(thisNode); > } > @@ -1437,7 +1437,7 @@ public class ContentWorker implements or > return ""; > } > StringBuilder csv = new StringBuilder(); > - for(Map<String, ? extends Object> node : nodeTrail) { > + for (Map<String, ? extends Object> node : nodeTrail) { > if (csv.length() > 0) { > csv.append(","); > } > @@ -1456,7 +1456,7 @@ public class ContentWorker implements or > GenericValue content = null; > String contentName = null; > List<String> values = null; > - for(String contentId : contentIdList) { > + for (String contentId : contentIdList) { > try { > content = delegator.findOne("Content", UtilMisc.toMap("contentId", contentId), true); > } catch (GenericEntityException e) { > @@ -1479,7 +1479,7 @@ public class ContentWorker implements or > } > List<String> contentIdList = StringUtil.split(csv, ","); > GenericValue content = null; > - for(String contentId : contentIdList) { > + for (String contentId : contentIdList) { > try { > content = delegator.findOne("Content", UtilMisc.toMap("contentId", contentId), true); > } catch (GenericEntityException e) { > @@ -1497,7 +1497,7 @@ public class ContentWorker implements or > return trail; > } > List<GenericValue> contentList = csvToContentList(csv, delegator); > - for(GenericValue content : contentList) { > + for (GenericValue content : contentList) { > Map<String, Object> node = makeNode(content); > trail.add(node); > } > @@ -1593,7 +1593,7 @@ public class ContentWorker implements or > s.append(lbl); > } > s.append("=").append(indent).append("==>").append(eol); > - for(String key : map.keySet()) { > + for (String key : map.keySet()) { > if ("request response session".indexOf(key) < 0) { > Object obj = map.get(key); > s.append(spc).append(key).append(sep); > @@ -1639,7 +1639,7 @@ public class ContentWorker implements or > int sz = lst.size(); > if (lbl != null) s.append(lbl); > s.append("=").append(indent).append("==> sz:").append(sz).append(eol); > - for(Object obj : lst) { > + for (Object obj : lst) { > s.append(spc); > if (obj instanceof GenericValue) { > GenericValue gv = (GenericValue)obj; > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java Thu Aug 8 12:28:01 2013 > @@ -235,7 +235,7 @@ public class PermissionRecorder { > sb.append("<td class=\"headr\" >Pass/Fail</td>"); > sb.append("</tr>"); > > - for(Map<String, Object> cMap : permCheckResults) { > + for (Map<String, Object> cMap : permCheckResults) { > sb.append(renderCurrentContentMapHtml(cMap)); > } > sb.append("</table>"); > @@ -245,7 +245,7 @@ public class PermissionRecorder { > public String renderCurrentContentMapHtml(Map<String, Object> cMap) { > StringBuilder sb = new StringBuilder(); > List<Map<String, Object>> resultList = UtilGenerics.checkList(cMap.get("checkResultList")); > - for(Map<String, Object> rMap : resultList) { > + for (Map<String, Object> rMap : resultList) { > //if (Debug.infoOn()) Debug.logInfo("renderCCMapHtml, (1):" + rMap, module); > sb.append(renderResultRowHtml(rMap, cMap)); > } > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java Thu Aug 8 12:28:01 2013 > @@ -464,7 +464,7 @@ public class UploadContentAndImage { > List<String> fieldNames = modelEntity.getAllFieldNames(); > Map<String, Object> ftlContext2 = FastMap.newInstance(); > Map<String, Object> ftlContext3 = FastMap.newInstance(); > - for(String keyName : fieldNames) { > + for (String keyName : fieldNames) { > Object obj = passedParams.get(keyName + suffix); > ftlContext2.put(keyName, obj); > } > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Thu Aug 8 12:28:01 2013 > @@ -593,7 +593,7 @@ public class LayoutEvents { > GenericValue v = delegator.makeValue(entityName); > GenericPK passedPK = v.getPrimaryKey(); > Collection<String> keyColl = passedPK.getAllKeys(); > - for(String attrName : keyColl) { > + for (String attrName : keyColl) { > String attrVal = (String)request.getAttribute(attrName); > if (attrVal == null) { > attrVal = (String) paramMap.get(attrName); > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java Thu Aug 8 12:28:01 2013 > @@ -110,7 +110,7 @@ public class PdfSurveyServices { > String surveyQuestionCategoryId = (String) createCategoryResultMap.get("surveyQuestionCategoryId"); > > pdfStamper.setFormFlattening(true); > - for(String fieldName : acroFieldMap.keySet()) { > + for (String fieldName : acroFieldMap.keySet()) { > AcroFields.Item item = acroFields.getFieldItem(fieldName); > int type = acroFields.getFieldType(fieldName); > String value = acroFields.getField(fieldName); > @@ -179,7 +179,7 @@ public class PdfSurveyServices { > PdfObject tuValue = null; > > Set<PdfName> dictKeys = UtilGenerics.checkSet(dict.getKeys()); > - for(PdfName dictKeyName : dictKeys) { > + for (PdfName dictKeyName : dictKeys) { > PdfObject dictObject = dict.get(dictKeyName); > > if ("/Type".equals(dictKeyName.toString())) { > @@ -266,7 +266,7 @@ public class PdfSurveyServices { > AcroFields fs = s.getAcroFields(); > Map<String, Object> hm = UtilGenerics.checkMap(fs.getFields()); > s.setFormFlattening(true); > - for(String fieldName : hm.keySet()) { > + for (String fieldName : hm.keySet()) { > //AcroFields.Item item = fs.getFieldItem(fieldName); > //int type = fs.getFieldType(fieldName); > String value = fs.getField(fieldName); > @@ -322,7 +322,7 @@ public class PdfSurveyServices { > // for (int i=0;i<sa.length;i++) > // Debug.logInfo("Appearance="+sa[i]); > > - for(String fieldName : map.keySet()) { > + for (String fieldName : map.keySet()) { > String parmValue = fs.getField(fieldName); > acroFieldMap.put(fieldName, parmValue); > } > @@ -363,7 +363,7 @@ public class PdfSurveyServices { > // for (int i=0;i<sa.length;i++) > // Debug.logInfo("Appearance="+sa[i]); > > - for(String fieldName : map.keySet()) { > + for (String fieldName : map.keySet()) { > String fieldValue = fs.getField(fieldName); > Object obj = acroFieldMap.get(fieldName); > if (obj instanceof Date) { > @@ -441,7 +441,7 @@ public class PdfSurveyServices { > PdfWriter.getInstance(document, baos); > > List<GenericValue> responses = delegator.findByAnd("SurveyResponseAnswer", UtilMisc.toMap("surveyResponseId", surveyResponseId), null, false); > - for(GenericValue surveyResponseAnswer : responses) { > + for (GenericValue surveyResponseAnswer : responses) { > String value = null; > String surveyQuestionId = (String) surveyResponseAnswer.get("surveyQuestionId"); > GenericValue surveyQuestion = delegator.findOne("SurveyQuestion", UtilMisc.toMap("surveyQuestionId", surveyQuestionId), false); > @@ -490,7 +490,7 @@ public class PdfSurveyServices { > > try { > List<GenericValue> responses = delegator.findByAnd("SurveyResponseAnswer", UtilMisc.toMap("surveyResponseId", surveyResponseId), null, false); > - for(GenericValue surveyResponseAnswer : responses) { > + for (GenericValue surveyResponseAnswer : responses) { > String surveyQuestionId = (String) surveyResponseAnswer.get("surveyQuestionId"); > GenericValue surveyQuestion = delegator.findOne("SurveyQuestion", UtilMisc.toMap("surveyQuestionId", surveyQuestionId), false); > qAndA.add(UtilMisc.toMap("question", surveyQuestion, "response", surveyResponseAnswer)); > @@ -531,7 +531,7 @@ public class PdfSurveyServices { > } > > List<GenericValue> responses = delegator.findByAnd("SurveyResponseAnswer", UtilMisc.toMap("surveyResponseId", surveyResponseId), null, false); > - for(GenericValue surveyResponseAnswer : responses) { > + for (GenericValue surveyResponseAnswer : responses) { > String value = null; > String surveyQuestionId = (String) surveyResponseAnswer.get("surveyQuestionId"); > > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java Thu Aug 8 12:28:01 2013 > @@ -180,7 +180,7 @@ public class SurveyWrapper { > } > > Map<String, Object> sqaaWithColIdListByMultiRespId = FastMap.newInstance(); > - for(GenericValue surveyQuestionAndAppl : surveyQuestionAndAppls) { > + for (GenericValue surveyQuestionAndAppl : surveyQuestionAndAppls) { > String surveyMultiRespColId = surveyQuestionAndAppl.getString("surveyMultiRespColId"); > if (UtilValidate.isNotEmpty(surveyMultiRespColId)) { > String surveyMultiRespId = surveyQuestionAndAppl.getString("surveyMultiRespId"); > @@ -365,7 +365,7 @@ public class SurveyWrapper { > } > > if (UtilValidate.isNotEmpty(answers)) { > - for(GenericValue answer : answers) { > + for (GenericValue answer : answers) { > answerMap.put(answer.getString("surveyQuestionId"), answer); > } > } > @@ -373,7 +373,7 @@ public class SurveyWrapper { > > // get the pass-thru (posted form data) > if (UtilValidate.isNotEmpty(passThru)) { > - for(String key : passThru.keySet()) { > + for (String key : passThru.keySet()) { > if (key.toUpperCase().startsWith("ANSWERS_")) { > int splitIndex = key.indexOf('_'); > String questionId = key.substring(splitIndex+1); > @@ -433,7 +433,7 @@ public class SurveyWrapper { > public Map<String, Object> getResults(List<GenericValue> questions) throws SurveyWrapperException { > Map<String, Object> questionResults = FastMap.newInstance(); > if (questions != null) { > - for(GenericValue question : questions) { > + for (GenericValue question : questions) { > Map<String, Object> results = getResultInfo(question); > if (results != null) { > questionResults.put(question.getString("surveyQuestionId"), results); > @@ -475,7 +475,7 @@ public class SurveyWrapper { > resultMap.put("_total", questionTotal); > > // create the map of option info ("_total", "_percent") > - for(String optId : thisResult.keySet()) { > + for (String optId : thisResult.keySet()) { > Map<String, Object> optMap = FastMap.newInstance(); > Long optTotal = (Long) thisResult.get(optId); > if (optTotal == null) { > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Thu Aug 8 12:28:01 2013 > @@ -165,7 +165,7 @@ public class EditRenderSubContentCacheTr > > templateRoot.put("context", templateCtx); > if (Debug.verboseOn()) { > - for(Object ky : templateCtx.keySet()) { > + for (Object ky : templateCtx.keySet()) { > Object val = templateCtx.get(ky); > Debug.logVerbose("context key: " + ky + " val: " + val, module); > } > > Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java (original) > +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java Thu Aug 8 12:28:01 2013 > @@ -111,7 +111,7 @@ public class BOMHelper { > UtilMisc.toMap("productIdTo", productId, "productAssocTypeId", bomType), null, true); > productNodesList = EntityUtil.filterByDate(productNodesList, inDate); > GenericValue duplicatedNode = null; > - for(GenericValue oneNode : productNodesList) { > + for (GenericValue oneNode : productNodesList) { > for (int i = 0; i < productIdKeys.size(); i++) { > if (oneNode.getString("productId").equals(productIdKeys.get(i))) { > return oneNode; > @@ -134,7 +134,7 @@ public class BOMHelper { > > try { > List<GenericValue> shipmentPlans = delegator.findByAnd("OrderShipment", UtilMisc.toMap("shipmentId", shipmentId), null, false); > - for(GenericValue shipmentPlan : shipmentPlans) { > + for (GenericValue shipmentPlan : shipmentPlans) { > GenericValue orderItem = shipmentPlan.getRelatedOne("OrderItem", false); > > List<GenericValue> productionRuns = delegator.findByAnd("WorkOrderItemFulfillment", UtilMisc.toMap("orderId", shipmentPlan.getString("orderId"), "orderItemSeqId", shipmentPlan.getString("orderItemSeqId"), "shipGroupSeqId", shipmentPlan.getString("shipGroupSeqId")), null, true); > > Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java (original) > +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java Thu Aug 8 12:28:01 2013 > @@ -114,7 +114,7 @@ public class BOMNode { > children.addAll(rows); > childrenNodes = FastList.newInstance(); > BOMNode oneChildNode = null; > - for(GenericValue oneChild : children) { > + for (GenericValue oneChild : children) { > // Configurator > oneChildNode = configurator(oneChild, productFeatures, getRootNode().getProductForRules(), inDate); > // If the node is null this means that the node has been discarded by the rules. > @@ -340,7 +340,7 @@ public class BOMNode { > childrenNodes = FastList.newInstance(); > > BOMNode oneChildNode = null; > - for(GenericValue oneChild : children) { > + for (GenericValue oneChild : children) { > oneChildNode = new BOMNode(oneChild.getString("productId"), delegator, dispatcher, userLogin); > // Configurator > //oneChildNode = configurator(oneChild, productFeatures, getRootNode().getProductForRules(), delegator); > > Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?rev=1511742&r1=1511741&r2=1511742&view=diff > ============================================================================== > --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java (original) > +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java Thu Aug 8 12:28:01 2013 > @@ -83,7 +83,7 @@ public class BOMServices { > if (bomType == null) { > try { > List<GenericValue> bomTypesValues = delegator.findByAnd("ProductAssocType", UtilMisc.toMap("parentTypeId", "PRODUCT_COMPONENT"), null, false); > - for(GenericValue bomTypesValue : bomTypesValues) { > + for (GenericValue bomTypesValue : bomTypesValues) { > bomTypes.add(bomTypesValue.getString("productAssocTypeId")); > } > } catch (GenericEntityException gee) { > @@ -96,7 +96,7 @@ public class BOMServices { > int depth = 0; > int maxDepth = 0; > try { > - for(String oneBomType : bomTypes) { > + for (String oneBomType : bomTypes) { > depth = BOMHelper.getMaxDepth(productId, oneBomType, fromDate, delegator); > if (depth > maxDepth) { > maxDepth = depth; > @@ -145,7 +145,7 @@ public class BOMServices { > UtilMisc.toMap("productIdTo", productId, "productAssocTypeId", "PRODUCT_VARIANT"), null, false); > virtualProducts = EntityUtil.filterByDate(virtualProducts); > int virtualMaxDepth = 0; > - for(GenericValue oneVirtualProductAssoc : virtualProducts) { > + for (GenericValue oneVirtualProductAssoc : virtualProducts) { > int virtualDepth = 0; > GenericValue virtualProduct = delegator.findOne("Product", UtilMisc.toMap("productId", oneVirtualProductAssoc.getString("productId")), false); > if (virtualProduct.get("billOfMaterialLevel") != null) { > @@ -184,7 +184,7 @@ public class BOMServices { > List<GenericValue> variantProducts = delegator.findByAnd("ProductAssoc", > UtilMisc.toMap("productId", productId, "productAssocTypeId", "PRODUCT_VARIANT"), null, false); > variantProducts = EntityUtil.filterByDate(variantProducts, true); > - for(GenericValue oneVariantProductAssoc : variantProducts) { > + for (GenericValue oneVariantProductAssoc : variantProducts) { > GenericValue variantProduct = delegator.findOne("Product", UtilMisc.toMap("productId", oneVariantProductAssoc.getString("productId")), false); > variantProduct.set("billOfMaterialLevel", llc); > variantProduct.store(); > @@ -214,14 +214,14 @@ public class BOMServices { > UtilMisc.toList("isVirtual DESC"), null, false); > Long zero = Long.valueOf(0); > List<GenericValue> allProducts = FastList.newInstance(); > - for(GenericValue product : products) { > + for (GenericValue product : products) { > product.set("billOfMaterialLevel", zero); > allProducts.add(product); > } > delegator.storeAll(allProducts); > Debug.logInfo("Low Level Code set to 0 for all the products", module); > > - for(GenericValue product : products) { > + for (GenericValue product : products) { > try { > Map<String, Object> depthResult = dispatcher.runSync("updateLowLevelCode", UtilMisc.<String, Object>toMap("productIdTo", product.getString("productId"), "alsoComponents", Boolean.valueOf(false), "alsoVariants", Boolean.valueOf(false))); > Debug.logInfo("Product [" + product.getString("productId") + "] Low Level Code [" + depthResult.get("lowLevelCode") + "]", module); > @@ -402,7 +402,7 @@ public class BOMServices { > > // also return a componentMap (useful in scripts and simple language code) > List<Map<String, Object>> componentsMap = FastList.newInstance(); > - for(BOMNode node : components) { > + for (BOMNode node : components) { > Map<String, Object> componentMap = FastMap.newInstance(); > componentMap.put("product", node.getProduct()); > componentMap.put("quantity", node.getQuantity()); > @@ -452,7 +452,7 @@ public class BOMServices { > } catch (GenericEntityException gee) { > return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingBomErrorCreatingBillOfMaterialsTree", UtilMisc.toMap("errorString", gee.getMessage()), locale)); > } > - for(BOMNode oneComponent : components) { > + for (BOMNode oneComponent : components) { > if (!oneComponent.isManufactured()) { > notAssembledComponents.add(oneComponent); > } > @@ -489,7 +489,7 @@ public class BOMServices { > } > Map<String, Object> orderReadHelpers = FastMap.newInstance(); > Map<String, Object> partyOrderShipments = FastMap.newInstance(); > - for(GenericValue shipmentItem : shipmentItems) { > + for (GenericValue shipmentItem : shipmentItems) { > // Get the OrderShipments > List<GenericValue> orderShipments = null; > try { > @@ -517,7 +517,7 @@ public class BOMServices { > } > // For each party: try to expand the shipment item products > // (search for components that needs to be packaged). > - for(Map.Entry<String, Object> partyOrderShipment : partyOrderShipments.entrySet()) { > + for (Map.Entry<String, Object> partyOrderShipment : partyOrderShipments.entrySet()) { > List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.checkList(partyOrderShipment.getValue()); > for (int i = 0; i < orderShipmentReadMapList.size(); i++) { > Map<String, Object> orderShipmentReadMap = UtilGenerics.checkMap(orderShipmentReadMapList.get(i)); > @@ -553,7 +553,7 @@ public class BOMServices { > // Group together products and components > // of the same box type. > Map<String, GenericValue> boxTypes = FastMap.newInstance(); > - for(Map.Entry<String, Object> partyOrderShipment : partyOrderShipments.entrySet()) { > + for (Map.Entry<String, Object> partyOrderShipment : partyOrderShipments.entrySet()) { > Map<String, List<Map<String, Object>>> boxTypeContent = FastMap.newInstance(); > List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.checkList(partyOrderShipment.getValue()); > for (int i = 0; i < orderShipmentReadMapList.size(); i++) { > > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |