Return-Path: Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: (qmail 86528 invoked from network); 28 Feb 2011 19:44:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Feb 2011 19:44:00 -0000 Received: (qmail 58345 invoked by uid 500); 28 Feb 2011 19:44:00 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 58154 invoked by uid 500); 28 Feb 2011 19:43:59 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 58147 invoked by uid 99); 28 Feb 2011 19:43:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Feb 2011 19:43:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Feb 2011 19:43:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 34CC22388906; Mon, 28 Feb 2011 19:43:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075504 - /ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java Date: Mon, 28 Feb 2011 19:43:36 -0000 To: commits@ofbiz.apache.org From: mrisaliti@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110228194336.34CC22388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mrisaliti Date: Mon Feb 28 19:43:35 2011 New Revision: 1075504 URL: http://svn.apache.org/viewvc?rev=1075504&view=rev Log: Remove some warning in PreferenceServices (OFBIZ-4102) Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java?rev=1075504&r1=1075503&r2=1075504&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java Mon Feb 28 19:43:35 2011 @@ -18,10 +18,10 @@ *******************************************************************************/ package org.ofbiz.common.preferences; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Properties; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -140,10 +140,8 @@ public class PreferenceServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "getPreference.readFailure", new Object[] { e.getMessage() }, locale)); } // for the 'DEFAULT' values find the related values in general properties and if found use those. - Iterator it = userPrefMap.entrySet().iterator(); - Map generalProperties = UtilProperties.getProperties("general"); - while (it.hasNext()) { - Map.Entry pairs = (Map.Entry) it.next(); + Properties generalProperties = UtilProperties.getProperties("general"); + for (Map.Entry pairs: userPrefMap.entrySet()) { if ("DEFAULT".equals(pairs.getValue())) { if (UtilValidate.isNotEmpty(generalProperties.get(pairs.getKey()))) { userPrefMap.put((String) pairs.getKey(), generalProperties.get(pairs.getKey())); @@ -241,9 +239,8 @@ public class PreferenceServices { } try { - for (Iterator i = userPrefMap.entrySet().iterator(); i.hasNext();) { - Map.Entry mapEntry = (Map.Entry) i.next(); - GenericValue rec = delegator.makeValidValue("UserPreference", PreferenceWorker.toFieldMap(userLoginId, (String) mapEntry.getKey(), userPrefGroupTypeId, (String) mapEntry.getValue())); + for (Map.Entry mapEntry: userPrefMap.entrySet()) { + GenericValue rec = delegator.makeValidValue("UserPreference", PreferenceWorker.toFieldMap(userLoginId, mapEntry.getKey(), userPrefGroupTypeId, (String) mapEntry.getValue())); delegator.createOrStore(rec); } } catch (GenericEntityException e) {