svn commit: r1301930 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: erwan
Date: Sat Mar 17 13:01:26 2012 New Revision: 1301930 URL: http://svn.apache.org/viewvc?rev=1301930&view=rev Log: Changes from while to for each loops in accounting component Modified: 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 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -84,9 +84,7 @@ public class BillingAccountWorker { if (billingAccountRoleList.size() > 0) { BigDecimal totalAvailable = BigDecimal.ZERO; - Iterator<GenericValue> billingAcctIter = billingAccountRoleList.iterator(); - while (billingAcctIter.hasNext()) { - GenericValue billingAccountRole = billingAcctIter.next(); + for(GenericValue billingAccountRole : billingAccountRoleList) { GenericValue billingAccountVO = billingAccountRole.getRelatedOne("BillingAccount"); // 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -799,9 +799,7 @@ public class GiftCertificateServices { // make a map of answer info Map<String, Object> answerMap = FastMap.newInstance(); if (responseAnswers != null) { - Iterator<GenericValue> rai = responseAnswers.iterator(); - while (rai.hasNext()) { - GenericValue answer = rai.next(); + for(GenericValue answer : responseAnswers) { GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); @@ -1037,9 +1035,7 @@ public class GiftCertificateServices { // make a map of answer info Map<String, Object> answerMap = FastMap.newInstance(); if (responseAnswers != null) { - Iterator<GenericValue> rai = responseAnswers.iterator(); - while (rai.hasNext()) { - GenericValue answer = rai.next(); + for(GenericValue answer : responseAnswers) { GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -237,10 +237,7 @@ public class PaymentGatewayServices { } if (UtilValidate.isNotEmpty(otherPaymentMethodAndCreditCardList)) { - Iterator<GenericValue> otherPaymentMethodAndCreditCardIter = otherPaymentMethodAndCreditCardList.iterator(); - while (otherPaymentMethodAndCreditCardIter.hasNext()) { - GenericValue otherPaymentMethodAndCreditCard = otherPaymentMethodAndCreditCardIter.next(); - + for (GenericValue otherPaymentMethodAndCreditCard : otherPaymentMethodAndCreditCardList) { // change OrderPaymentPreference in memory only and call auth service orderPaymentPreference.set("paymentMethodId", otherPaymentMethodAndCreditCard.getString("paymentMethodId")); Map<String, Object> authRetryResult = authPayment(dispatcher, userLogin, orh, orderPaymentPreference, totalRemaining, reAuth, transAmount); @@ -368,9 +365,7 @@ public class PaymentGatewayServices { int finished = 0; int hadError = 0; List<String> messages = FastList.newInstance(); - Iterator<GenericValue> payments = paymentPrefs.iterator(); - while (payments.hasNext()) { - GenericValue paymentPref = payments.next(); + 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 @@ -766,10 +761,8 @@ public class PaymentGatewayServices { // iterate over the prefs and release each one List<GenericValue> finished = FastList.newInstance(); - Iterator<GenericValue> payments = paymentPrefs.iterator(); - while (payments.hasNext()) { - paymentPref = payments.next(); - Map<String, Object> releaseContext = UtilMisc.toMap("userLogin", userLogin, "orderPaymentPreferenceId", paymentPref.getString("orderPaymentPreferenceId")); + for(GenericValue pPref : paymentPrefs) { + Map<String, Object> releaseContext = UtilMisc.toMap("userLogin", userLogin, "orderPaymentPreferenceId", pPref.getString("orderPaymentPreferenceId")); Map<String, Object> releaseResult = null; try { releaseResult = dispatcher.runSync("releaseOrderPaymentPreference", releaseContext); @@ -827,11 +820,9 @@ public class PaymentGatewayServices { List<GenericValue> messageEntities = FastList.newInstance(); List<String> messages = UtilGenerics.cast(context.get("internalRespMsgs")); if (UtilValidate.isNotEmpty(messages)) { - Iterator<String> i = messages.iterator(); - while (i.hasNext()) { + for(String message : messages) { GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg"); String respMsgId = delegator.getNextSeqId("PaymentGatewayRespMsg"); - String message = i.next(); respMsg.set("paymentGatewayRespMsgId", respMsgId); respMsg.set("paymentGatewayResponseId", responseId); respMsg.set("pgrMessage", message); 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -110,9 +110,7 @@ public class TaxAuthorityServices { } // add up amounts from adjustments (amount OR exemptAmount, sourcePercentage) - Iterator<GenericValue> taxAdustmentIter = taxAdustmentList.iterator(); - while (taxAdustmentIter.hasNext()) { - GenericValue taxAdjustment = taxAdustmentIter.next(); + for(GenericValue taxAdjustment : taxAdustmentList) { if ("SALES_TAX".equals(taxAdjustment.getString("orderAdjustmentTypeId"))) { taxPercentage = taxPercentage.add(taxAdjustment.getBigDecimal("sourcePercentage")); BigDecimal adjAmount = taxAdjustment.getBigDecimal("amount"); @@ -298,9 +296,7 @@ public class TaxAuthorityServices { EntityOperator.AND, EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.EQUALS, "_NA_"))); - Iterator<GenericValue> taxAuthorityIter = taxAuthoritySet.iterator(); - while (taxAuthorityIter.hasNext()) { - GenericValue taxAuthority = taxAuthorityIter.next(); + for(GenericValue taxAuthority : taxAuthoritySet) { EntityCondition taxAuthCond = EntityCondition.makeCondition( EntityCondition.makeCondition("taxAuthPartyId", EntityOperator.EQUALS, taxAuthority.getString("taxAuthPartyId")), EntityOperator.AND, @@ -332,9 +328,7 @@ public class TaxAuthorityServices { } List<GenericValue> pcmList = delegator.findList("ProductCategoryMember", productIdCond, UtilMisc.toSet("productCategoryId"), null, null, true); pcmList = EntityUtil.filterByDate(pcmList, true); - Iterator<GenericValue> pcmIter = pcmList.iterator(); - while (pcmIter.hasNext()) { - GenericValue pcm = pcmIter.next(); + for(GenericValue pcm : pcmList) { productCategoryIdSet.add(pcm.getString("productCategoryId")); } @@ -396,9 +390,7 @@ public class TaxAuthorityServices { } // find the right entry(s) based on purchase amount - Iterator<GenericValue> flIt = filteredList.iterator(); - while (flIt.hasNext()) { - GenericValue taxAuthorityRateProduct = flIt.next(); + for(GenericValue taxAuthorityRateProduct : filteredList) { BigDecimal taxRate = taxAuthorityRateProduct.get("taxPercentage") != null ? taxAuthorityRateProduct.getBigDecimal("taxPercentage") : ZERO_BASE; BigDecimal taxable = ZERO_BASE; @@ -478,9 +470,7 @@ public class TaxAuthorityServices { Set<String> billToPartyIdSet = FastSet.newInstance(); billToPartyIdSet.add(billToPartyId); List<GenericValue> partyRelationshipList = EntityUtil.filterByDate(delegator.findByAndCache("PartyRelationship", UtilMisc.toMap("partyIdTo", billToPartyId, "partyRelationshipTypeId", "GROUP_ROLLUP")), true); - Iterator<GenericValue> partyRelationshipIter = partyRelationshipList.iterator(); - while (partyRelationshipIter.hasNext()) { - GenericValue partyRelationship = partyRelationshipIter.next(); + 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -193,10 +193,7 @@ public class IdealEvents { GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); Map <String, Object> parametersMap = UtilHttp.getParameterMap(request); String transactionId = request.getParameter("trxid"); - Set<String> keySet = parametersMap.keySet(); - Iterator<String> i = keySet.iterator(); - while (i.hasNext()) { - String name = (String) i.next(); + for(String name : parametersMap.keySet()) { String value = request.getParameter(name); Debug.logError("### Param: " + name + " => " + value, module); } @@ -321,9 +318,7 @@ public class IdealEvents { return false; } if (paymentPrefs.size() > 0) { - Iterator <GenericValue> i = paymentPrefs.iterator(); - while (i.hasNext()) { - GenericValue pref = i.next(); + 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -247,10 +247,7 @@ public class PayPalEvents { Debug.logInfo("Got verification from PayPal, processing..", module); boolean verified = false; - Set <String> keySet = parametersMap.keySet(); - Iterator <String> i = keySet.iterator(); - while (i.hasNext()) { - String name = i.next(); + for(String name : parametersMap.keySet()) { String value = request.getParameter(name); Debug.logError("### Param: " + name + " => " + value, module); if (UtilValidate.isNotEmpty(name) && "payer_status".equalsIgnoreCase(name) && @@ -417,9 +414,7 @@ public class PayPalEvents { return false; } if (paymentPrefs.size() > 0) { - Iterator <GenericValue> i = paymentPrefs.iterator(); - while (i.hasNext()) { - GenericValue pref = i.next(); + 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -1159,9 +1159,7 @@ public class ValueLinkServices { // make a map of answer info Map<String, Object> answerMap = FastMap.newInstance(); if (responseAnswers != null) { - Iterator<GenericValue> rai = responseAnswers.iterator(); - while (rai.hasNext()) { - GenericValue answer = rai.next(); + for(GenericValue answer : responseAnswers) { GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); @@ -1416,9 +1414,7 @@ public class ValueLinkServices { // make a map of answer info Map<String, Object> answerMap = FastMap.newInstance(); if (responseAnswers != null) { - Iterator<GenericValue> rai = responseAnswers.iterator(); - while (rai.hasNext()) { - GenericValue answer = rai.next(); + for(GenericValue answer : responseAnswers) { GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -671,11 +671,7 @@ public class PayflowPro { Debug.logInfo("Verisign response string: " + resp, module); Map<String, String> parameters = FastMap.newInstance(); List<String> params = StringUtil.split(resp, "&"); - Iterator<String> i = params.iterator(); - - while (i.hasNext()) { - String str = (String) i.next(); - + 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -316,10 +316,7 @@ public class WorldPayEvents { GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); Map <String, Object> parametersMap = UtilHttp.getParameterMap(request); String orderId = request.getParameter("cartId"); - Set<String> keySet = parametersMap.keySet(); - Iterator<String> i = keySet.iterator(); - while (i.hasNext()) { - String name = i.next(); + for(String name : parametersMap.keySet()) { String value = request.getParameter(name); Debug.logError("### Param: " + name + " => " + value, module); } @@ -420,9 +417,7 @@ public class WorldPayEvents { return false; } if (paymentPrefs.size() > 0) { - Iterator<GenericValue> i = paymentPrefs.iterator(); - while (i.hasNext()) { - GenericValue pref = i.next(); + 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=1301930&r1=1301929&r2=1301930&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 Sat Mar 17 13:01:26 2012 @@ -125,9 +125,7 @@ public class UtilAccounting { private static void getGlAccountClassChildren(GenericValue glAccountClass, List<String> glAccountClassIds) throws GenericEntityException { glAccountClassIds.add(glAccountClass.getString("glAccountClassId")); List<GenericValue> glAccountClassChildren = glAccountClass.getRelatedCache("ChildGlAccountClass"); - Iterator<GenericValue> glAccountClassChildrenIt = glAccountClassChildren.iterator(); - while (glAccountClassChildrenIt.hasNext()) { - GenericValue glAccountClassChild = glAccountClassChildrenIt.next(); + for(GenericValue glAccountClassChild : glAccountClassChildren) { getGlAccountClassChildren(glAccountClassChild, glAccountClassIds); } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |