Bug 548309 - Use jdk 5 for-each loop

org.eclipse.jdt.core.manipulation
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.

Change-Id: I0247fe6bfd2460fd82a3fa88e396f1a7db2473d3
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>

7 files changed, 40 insertions, 66 deletions

diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/OrganizeImportsOperation.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/OrganizeImportsOperation.java
index f7ee9fe1fe..5ac88ca85b 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/OrganizeImportsOperation.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/OrganizeImportsOperation.java
@@ -350,8 +350,8 @@ public class OrganizeImportsOperation implements IWorkspaceRunnable {
 				}
 				char[][] allTypes= new char[nUnresolved][];
 				int i= 0;
-				for (Iterator<String> iter= fUnresolvedTypes.keySet().iterator(); iter.hasNext();) {
-					allTypes[i++]= iter.next().toCharArray();
+				for (String string : fUnresolvedTypes.keySet()) {
+					allTypes[i++]= string.toCharArray();
 				}
 				final ArrayList<TypeNameMatch> typesFound= new ArrayList<>();
 				final IJavaProject project= fCurrPackage.getJavaProject();
@@ -362,8 +362,7 @@ public class OrganizeImportsOperation implements IWorkspaceRunnable {
 
 				boolean is50OrHigher= JavaModelUtil.is50OrHigher(project);
 
-				for (i= 0; i < typesFound.size(); i++) {
-					TypeNameMatch curr= typesFound.get(i);
+				for (TypeNameMatch curr : typesFound) {
 					UnresolvedTypeData data= fUnresolvedTypes.get(curr.getSimpleTypeName());
 					if (data != null && isVisible(curr) && isOfKind(curr, data.typeKinds, is50OrHigher)) {
 						if (fAllowDefaultPackageImports || curr.getPackageName().length() > 0) {
@@ -386,8 +385,7 @@ public class OrganizeImportsOperation implements IWorkspaceRunnable {
 
 				ArrayList<TypeNameMatch[]> openChoices= new ArrayList<>(nUnresolved);
 				ArrayList<SourceRange> sourceRanges= new ArrayList<>(nUnresolved);
-				for (Iterator<UnresolvedTypeData> iter= fUnresolvedTypes.values().iterator(); iter.hasNext();) {
-					UnresolvedTypeData data= iter.next();
+				for (UnresolvedTypeData data : fUnresolvedTypes.values()) {
 					TypeNameMatch[] openChoice= processTypeInfo(data.foundInfos);
 					if (openChoice != null) {
 						openChoices.add(openChoice);
@@ -634,15 +632,13 @@ public class OrganizeImportsOperation implements IWorkspaceRunnable {
   		importsAdded.addAll(Arrays.asList(importsStructure.getCreatedImports()));
   		importsAdded.addAll(Arrays.asList(importsStructure.getCreatedStaticImports()));
 
-		Object[] content= oldSingleImports.toArray();
-	    for (int i= 0; i < content.length; i++) {
-	        String importName= (String) content[i];
+  		for (Object element : oldSingleImports.toArray()) {
+	        String importName= (String) element;
 	        if (importsAdded.remove(importName))
 	            oldSingleImports.remove(importName);
 	    }
-	    content= oldDemandImports.toArray();
-	    for (int i= 0; i < content.length; i++) {
-	        String importName= (String) content[i];
+	    for (Object element : oldDemandImports.toArray()) {
+	        String importName= (String) element;
 	        if (importsAdded.remove(importName + ".*")) //$NON-NLS-1$
 	            oldDemandImports.remove(importName);
 	    }
@@ -682,18 +678,15 @@ public class OrganizeImportsOperation implements IWorkspaceRunnable {
 	// find type references in a compilation unit
 	private boolean collectReferences(CompilationUnit astRoot, List<SimpleName> typeReferences, List<SimpleName> staticReferences, Set<String> oldSingleImports, Set<String> oldDemandImports) {
 		if (!fAllowSyntaxErrors) {
-			IProblem[] problems= astRoot.getProblems();
-			for (int i= 0; i < problems.length; i++) {
-				IProblem curr= problems[i];
+			for (IProblem curr : astRoot.getProblems()) {
 				if (curr.isError() && (curr.getID() & IProblem.Syntax) != 0) {
-					fParsingError= problems[i];
+					fParsingError= curr;
 					return false;
 				}
 			}
 		}
 		List<ImportDeclaration> imports= astRoot.imports();
-		for (int i= 0; i < imports.size(); i++) {
-			ImportDeclaration curr= imports.get(i);
+		for (ImportDeclaration curr : imports) {
 			String id= ASTResolving.getFullName(curr.getName());
 			if (curr.isOnDemand()) {
 				oldDemandImports.add(id);
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/StubUtility.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/StubUtility.java
index 563d3976c1..d13463d14f 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/StubUtility.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/StubUtility.java
@@ -492,9 +492,8 @@ public class StubUtility {
 			if (position == null || position.getLength() > 0) {
 				continue;
 			}
-			int[] offsets= position.getOffsets();
-			for (int k= 0; k < offsets.length; k++) {
-				int line= doc.getLineOfOffset(offsets[k]);
+			for (int offset2 : position.getOffsets()) {
+				int line= doc.getLineOfOffset(offset2);
 				IRegion lineInfo= doc.getLineInformation(line);
 				int offset= lineInfo.getOffset();
 				String str= doc.get(offset, lineInfo.getLength());
@@ -562,17 +561,17 @@ public class StubUtility {
 		String lineStart= textBuffer.get(region.getOffset(), offset - region.getOffset());
 
 		StringBuilder buf= new StringBuilder();
-		for (int i= 0; i < providesNames.length; i++) {
+		for (String providesName : providesNames) {
 			if (buf.length() > 0) {
 				buf.append(lineDelimiter).append(lineStart);
 			}
-			buf.append("@provides ").append(providesNames[i]); //$NON-NLS-1$
+			buf.append("@provides ").append(providesName); //$NON-NLS-1$
 		}
-		for (int i= 0; i < usesNames.length; i++) {
+		for (String usesName : usesNames) {
 			if (buf.length() > 0) {
 				buf.append(lineDelimiter).append(lineStart);
 			}
-			buf.append("@uses ").append(usesNames[i]); //$NON-NLS-1$
+			buf.append("@uses ").append(usesName); //$NON-NLS-1$
 		}
 		if (buf.length() == 0 && isAllCommentWhitespace(lineStart)) {
 			int prevLine= textBuffer.getLineOfOffset(offset) - 1;
@@ -874,12 +873,12 @@ public class StubUtility {
 	}
 
 	private static boolean isAllCommentWhitespace(String lineStart) {
-		for (int i= 0; i < lineStart.length(); i++) {
-			char ch= lineStart.charAt(i);
+		for (char ch : lineStart.toCharArray()) {
 			if (!Character.isWhitespace(ch) && ch != '*') {
 				return false;
 			}
 		}
+
 		return true;
 	}
 
@@ -1171,8 +1170,7 @@ public class StubUtility {
 			String string= assignedExpression instanceof StringLiteral ? ((StringLiteral)assignedExpression).getLiteralValue() : ((NumberLiteral)assignedExpression).getToken();
 			StringBuilder res= new StringBuilder();
 			boolean needsUnderscore= false;
-			for (int i= 0; i < string.length(); i++) {
-				char ch= string.charAt(i);
+			for (char ch : string.toCharArray()) {
 				if (Character.isJavaIdentifierPart(ch)) {
 					if (res.length() == 0 && !Character.isJavaIdentifierStart(ch) || needsUnderscore) {
 						res.append('_');
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFixCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFixCore.java
index 7c0a3f30d0..1decdcb5d9 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFixCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/AbstractMultiFixCore.java
@@ -67,8 +67,8 @@ public abstract class AbstractMultiFixCore extends AbstractCleanUpCore implement
 	 */
 	protected static int getNumberOfProblems(IProblem[] problems, int problemId) {
 		int result= 0;
-		for (int i= 0; i < problems.length; i++) {
-			if (problems[i].getID() == problemId)
+		for (IProblem problem : problems) {
+			if (problem.getID() == problemId)
 				result++;
 		}
 		return result;
@@ -100,8 +100,7 @@ public abstract class AbstractMultiFixCore extends AbstractCleanUpCore implement
 	protected static IProblemLocationCore[] filter(IProblemLocationCore[] problems, int[] problemIds) {
 		ArrayList<IProblemLocationCore> result= new ArrayList<>();
 
-		for (int i= 0; i < problems.length; i++) {
-			IProblemLocationCore problem= problems[i];
+		for (IProblemLocationCore problem : problems) {
 			if (contains(problemIds, problem.getProblemId()) && !contains(result, problem)) {
 				result.add(problem);
 			}
@@ -111,8 +110,7 @@ public abstract class AbstractMultiFixCore extends AbstractCleanUpCore implement
 	}
 
 	private static boolean contains(ArrayList<IProblemLocationCore> problems, IProblemLocationCore problem) {
-		for (int i= 0; i < problems.size(); i++) {
-			IProblemLocationCore existing= problems.get(i);
+		for (IProblemLocationCore existing : problems) {
 			if (existing.getProblemId() == problem.getProblemId() && existing.getOffset() == problem.getOffset() && existing.getLength() == problem.getLength()) {
 				return true;
 			}
@@ -122,8 +120,8 @@ public abstract class AbstractMultiFixCore extends AbstractCleanUpCore implement
 	}
 
 	private static boolean contains(int[] ids, int id) {
-		for (int i= 0; i < ids.length; i++) {
-			if (ids[i] == id)
+		for (int id2 : ids) {
+			if (id2 == id)
 				return true;
 		}
 		return false;
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/CodeStyleCleanUpCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/CodeStyleCleanUpCore.java
index efea4a0a15..2b64a5da27 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/CodeStyleCleanUpCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/CodeStyleCleanUpCore.java
@@ -215,15 +215,15 @@ public class CodeStyleCleanUpCore extends AbstractMultiFixCore {
 		if (isEnabled(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_FIELD_USE_THIS) && isEnabled(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_FIELD_USE_THIS_ALWAYS))
 			result+= getNumberOfProblems(problems, IProblem.UnqualifiedFieldAccess);
 		if (isEnabled(CleanUpConstants.MEMBER_ACCESSES_STATIC_QUALIFY_WITH_DECLARING_CLASS) && isEnabled(CleanUpConstants.MEMBER_ACCESSES_STATIC_QUALIFY_WITH_DECLARING_CLASS_SUBTYPE_ACCESS)) {
-			for (int i=0;i<problems.length;i++) {
-				int id= problems[i].getID();
+			for (IProblem problem : problems) {
+				int id= problem.getID();
 				if (id == IProblem.IndirectAccessToStaticField || id == IProblem.IndirectAccessToStaticMethod)
 					result++;
 			}
 		}
 		if (isEnabled(CleanUpConstants.MEMBER_ACCESSES_STATIC_QUALIFY_WITH_DECLARING_CLASS) && isEnabled(CleanUpConstants.MEMBER_ACCESSES_STATIC_QUALIFY_WITH_DECLARING_CLASS_INSTANCE_ACCESS)) {
-			for (int i=0;i<problems.length;i++) {
-				int id= problems[i].getID();
+			for (IProblem problem : problems) {
+				int id= problem.getID();
 				if (id == IProblem.NonStaticAccessToStaticField || id == IProblem.NonStaticAccessToStaticMethod)
 					result++;
 			}
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MapCleanUpOptionsCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MapCleanUpOptionsCore.java
index 8f721198ec..f721587797 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MapCleanUpOptionsCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MapCleanUpOptionsCore.java
@@ -15,9 +15,7 @@
 package org.eclipse.jdt.internal.ui.fix;
 
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 
 import org.eclipse.jdt.core.manipulation.CleanUpOptionsCore;
 
@@ -58,9 +56,7 @@ public class MapCleanUpOptionsCore extends CleanUpOptionsCore {
 		if (options instanceof MapCleanUpOptionsCore) {
 			fOptions.putAll(((MapCleanUpOptionsCore)options).getMap());
 		} else {
-			Set<String> keys= options.getKeys();
-			for (Iterator<String> iterator= keys.iterator(); iterator.hasNext();) {
-				String key= iterator.next();
+			for (String key : options.getKeys()) {
 				fOptions.put(key, options.getValue(key));
 			}
 		}
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/ModifierCorrectionSubProcessorCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/ModifierCorrectionSubProcessorCore.java
index f77a5110e8..3ebbabe95e 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/ModifierCorrectionSubProcessorCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/ModifierCorrectionSubProcessorCore.java
@@ -126,8 +126,7 @@ public class ModifierCorrectionSubProcessorCore {
 	}
 
 	private static Modifier findVisibilityModifier(List<IExtendedModifier> modifiers) {
-		for (int i= 0; i < modifiers.size(); i++) {
-			IExtendedModifier curr= modifiers.get(i);
+		for (IExtendedModifier curr : modifiers) {
 			if (curr instanceof Modifier) {
 				Modifier modifier= (Modifier) curr;
 				ModifierKeyword keyword= modifier.getKeyword();
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/SerialVersionHashOperationCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/SerialVersionHashOperationCore.java
index 9d03becbf2..bac2506006 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/SerialVersionHashOperationCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/SerialVersionHashOperationCore.java
@@ -109,13 +109,10 @@ public final class SerialVersionHashOperationCore extends AbstractSerialVersionO
 		int classModifiers= mod & (Flags.AccPublic | Flags.AccFinal | Flags.AccInterface | Flags.AccAbstract);
 
 		doos.writeInt(classModifiers); // class modifiers
-		char[][] interfaces= getSortedInterfacesNames(cfReader);
-		for (int i= 0; i < interfaces.length; i++) {
-			doos.writeUTF(getClassName(interfaces[i]));
+		for (char[] interface1 : getSortedInterfacesNames(cfReader)) {
+			doos.writeUTF(getClassName(interface1));
 		}
-		IFieldInfo[] sortedFields= getSortedFields(cfReader);
-		for (int i= 0; i < sortedFields.length; i++) {
-			IFieldInfo curr= sortedFields[i];
+		for (IFieldInfo curr : getSortedFields(cfReader)) {
 			int flags= curr.getAccessFlags();
 			if (!Flags.isPrivate(flags) || (!Flags.isStatic(flags) && !Flags.isTransient(flags))) {
 				doos.writeUTF(new String(curr.getName()));
@@ -128,9 +125,7 @@ public final class SerialVersionHashOperationCore extends AbstractSerialVersionO
 			doos.writeInt(Flags.AccStatic);
 			doos.writeUTF("()V"); //$NON-NLS-1$
 		}
-		IMethodInfo[] sortedMethods= getSortedMethods(cfReader);
-		for (int i= 0; i < sortedMethods.length; i++) {
-			IMethodInfo curr= sortedMethods[i];
+		for (IMethodInfo curr : getSortedMethods(cfReader)) {
 			int flags= curr.getAccessFlags();
 			if (!Flags.isPrivate(flags) && !curr.isClinit()) {
 				doos.writeUTF(new String(curr.getName()));
@@ -145,9 +140,7 @@ public final class SerialVersionHashOperationCore extends AbstractSerialVersionO
 	private static int getClassModifiers(IClassFileReader cfReader) {
 		IInnerClassesAttribute innerClassesAttribute= cfReader.getInnerClassesAttribute();
 		if (innerClassesAttribute != null) {
-			IInnerClassesAttributeEntry[] entries = innerClassesAttribute.getInnerClassAttributesEntries();
-			for (int i= 0; i < entries.length; i++) {
-				IInnerClassesAttributeEntry entry = entries[i];
+			for (IInnerClassesAttributeEntry entry : innerClassesAttribute.getInnerClassAttributesEntries()) {
 				char[] innerClassName = entry.getInnerClassName();
 				if (innerClassName != null) {
 					if (CharOperation.equals(cfReader.getClassName(), innerClassName)) {
@@ -203,9 +196,8 @@ public final class SerialVersionHashOperationCore extends AbstractSerialVersionO
 	}
 
 	private static boolean hasStaticClassInitializer(IClassFileReader cfReader) {
-		IMethodInfo[] methodInfos= cfReader.getMethodInfos();
-		for (int i= 0; i < methodInfos.length; i++) {
-			if (methodInfos[i].isClinit()) {
+		for (IMethodInfo methodInfo : cfReader.getMethodInfos()) {
+			if (methodInfo.isClinit()) {
 				return true;
 			}
 		}
@@ -251,9 +243,7 @@ public final class SerialVersionHashOperationCore extends AbstractSerialVersionO
 
 		name += ".class"; //$NON-NLS-1$
 
-		IResource[] classFiles= JavaCore.getGeneratedResources(region, false);
-		for (int i= 0; i < classFiles.length; i++) {
-			IResource resource= classFiles[i];
+		for (IResource resource : JavaCore.getGeneratedResources(region, false)) {
 			if (resource.getType() == IResource.FILE && resource.getName().equals(name)) {
 				return (IFile) resource;
 			}