Author: gscokart Date: Wed Jun 9 20:02:06 2010 New Revision: 953137 URL: http://svn.apache.org/viewvc?rev=953137&view=rev Log: Remove EmptyForIteratorPadCheck checkstyle errors
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java ant/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java?rev=953137&r1=953136&r2=953137&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java Wed Jun 9 20:02:06 2010 @@ -214,7 +214,7 @@ public class ResolveData { // search again, now ignore the extra attributes // TODO: maybe we should search the node that has at least the // same attributes as mrid - for (Iterator it = visitData.entrySet().iterator(); it.hasNext(); ) { + for (Iterator it = visitData.entrySet().iterator(); it.hasNext();) { Map.Entry entry = (Entry) it.next(); ModuleRevisionId current = (ModuleRevisionId) entry.getKey(); if (current.getModuleId().equals(mrid.getModuleId()) Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java?rev=953137&r1=953136&r2=953137&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java Wed Jun 9 20:02:06 2010 @@ -229,7 +229,7 @@ public class SearchEngine { List ret = new ArrayList(); Map criteria = new HashMap(); - for (Iterator it = moduleCrit.getAttributes().entrySet().iterator(); it.hasNext(); ) { + for (Iterator it = moduleCrit.getAttributes().entrySet().iterator(); it.hasNext();) { Map.Entry entry = (Entry) it.next(); addMatcher(matcher, (String) entry.getValue(), criteria, (String) entry.getKey()); } @@ -247,7 +247,8 @@ public class SearchEngine { String rev = (String) moduleIdAsMap[i].get(IvyPatternHelper.REVISION_KEY); Map foundExtraAtts = new HashMap(); - for (Iterator iter2 = moduleCrit.getQualifiedExtraAttributes().keySet().iterator(); iter2.hasNext(); ) { + Set qualAttributes = moduleCrit.getQualifiedExtraAttributes().keySet(); + for (Iterator iter2 = qualAttributes.iterator(); iter2.hasNext();) { String qualifiedKey = (String) iter2.next(); String value = null; int colonIndex = qualifiedKey.indexOf(':'); @@ -284,7 +285,7 @@ public class SearchEngine { public ModuleRevisionId[] listModules( DependencyResolver resolver, ModuleRevisionId moduleCrit, PatternMatcher matcher) { Map criteria = new HashMap(); - for (Iterator it = moduleCrit.getAttributes().entrySet().iterator(); it.hasNext(); ) { + for (Iterator it = moduleCrit.getAttributes().entrySet().iterator(); it.hasNext();) { Map.Entry entry = (Entry) it.next(); addMatcher(matcher, (String) entry.getValue(), criteria, (String) entry.getKey()); } @@ -301,7 +302,8 @@ public class SearchEngine { String rev = (String) moduleIdAsMap[i].get(IvyPatternHelper.REVISION_KEY); Map foundExtraAtts = new HashMap(); - for (Iterator iter2 = moduleCrit.getQualifiedExtraAttributes().keySet().iterator(); iter2.hasNext(); ) { + Set qualExtraAttributes = moduleCrit.getQualifiedExtraAttributes().keySet(); + for (Iterator iter2 = qualExtraAttributes.iterator(); iter2.hasNext();) { String qualifiedKey = (String) iter2.next(); String value = null; int colonIndex = qualifiedKey.indexOf(':'); Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java?rev=953137&r1=953136&r2=953137&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java Wed Jun 9 20:02:06 2010 @@ -746,7 +746,7 @@ public final class XmlModuleDescriptorUp write(" namespace=\"" + namespace + "\""); } - for (Iterator extras = extraAttributes.entrySet().iterator(); extras.hasNext(); ) { + for (Iterator extras = extraAttributes.entrySet().iterator(); extras.hasNext();) { Map.Entry extra = (Map.Entry) extras.next(); write(" " + extra.getKey() + "=\"" + extra.getValue() + "\""); }