Bug 548309 - Use jdk 5 for-each loop

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

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

13 files changed, 52 insertions, 78 deletions

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit3TestFinderTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit3TestFinderTest.java
index b84ad9557a..4a88e5481f 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit3TestFinderTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit3TestFinderTest.java
@@ -14,7 +14,6 @@
 package org.eclipse.jdt.junit.tests;
 
 import java.util.HashSet;
-import java.util.Iterator;
 
 import junit.framework.TestCase;
 
@@ -401,8 +400,8 @@ public class JUnit3TestFinderTest extends TestCase {
 		finder.findTestsInContainer(container, set, null);
 
 		HashSet<String> namesFound= new HashSet<>();
-		for (Iterator<IType> iterator= set.iterator(); iterator.hasNext();) {
-			namesFound.add(iterator.next().getFullyQualifiedName('.'));
+		for (IType iType : set) {
+			namesFound.add(iType.getFullyQualifiedName('.'));
 		}
 		String[] actuals= namesFound.toArray(new String[namesFound.size()]);
 		StringAsserts.assertEqualStringsIgnoreOrder(actuals, expectedValidTests);
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit4TestFinderTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit4TestFinderTest.java
index fd23f3bc63..8aea5795a0 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit4TestFinderTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit4TestFinderTest.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.junit.tests;
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Iterator;
 
 import junit.framework.TestCase;
 
@@ -472,8 +471,7 @@ public class JUnit4TestFinderTest extends TestCase {
 		set.addAll(Arrays.asList(JUnitCore.findTestTypes(container, null)));
 
 		HashSet<String> namesFound= new HashSet<>();
-		for (Iterator<IType> iterator= set.iterator(); iterator.hasNext();) {
-			IType curr= iterator.next();
+		for (IType curr : set) {
 			namesFound.add(curr.getFullyQualifiedName('.'));
 		}
 		String[] actuals= namesFound.toArray(new String[namesFound.size()]);
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathModifierActionTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathModifierActionTest.java
index c91232fe7a..d6a1f61fe2 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathModifierActionTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathModifierActionTest.java
@@ -13,7 +13,6 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests.buildpath;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.jdt.testplugin.JavaProjectHelper;
@@ -138,8 +137,7 @@ public class BuildpathModifierActionTest extends TestCase {
     	assertTrue("Expected " + paths.length + " is " + removedEntries.size(), removedEntries.size() == paths.length);
     	IPath[] removed= new IPath[removedEntries.size()];
     	int i= 0;
-    	for (Iterator<CPListElement> iterator= removedEntries.iterator(); iterator.hasNext();) {
-	        CPListElement element= iterator.next();
+    	for (CPListElement element : removedEntries) {
 	        removed[i]= element.getPath();
 	        i++;
         }
@@ -156,8 +154,7 @@ public class BuildpathModifierActionTest extends TestCase {
     	assertTrue("Expected " + paths.length + " is " + addedEntries.size(), addedEntries.size() == paths.length);
     	IPath[] added= new IPath[addedEntries.size()];
     	int i= 0;
-    	for (Iterator<CPListElement> iterator= addedEntries.iterator(); iterator.hasNext();) {
-	        CPListElement element= iterator.next();
+    	for (CPListElement element : addedEntries) {
 	        added[i]= element.getPath();
 	        i++;
         }
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/MethodOverrideTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/MethodOverrideTest.java
index d0e3469f47..2263153905 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/MethodOverrideTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/MethodOverrideTest.java
@@ -498,9 +498,9 @@ public class MethodOverrideTest extends CoreTests {
 
 	private boolean hasOverrideAnnotation(MethodDeclaration declaration) {
 		List<IExtendedModifier> list= declaration.modifiers();
-		for (int i= 0; i < list.size(); i++) {
-			if (list.get(i) instanceof Annotation) {
-				return "Override".equals(((Annotation) list.get(i)).getTypeName().getFullyQualifiedName());
+		for (IExtendedModifier element : list) {
+			if (element instanceof Annotation) {
+				return "Override".equals(((Annotation) element).getTypeName().getFullyQualifiedName());
 			}
 		}
 		return false;
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/PartialASTTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/PartialASTTest.java
index ba2eb22206..16c05e9023 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/PartialASTTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/PartialASTTest.java
@@ -152,23 +152,22 @@ public class PartialASTTest extends CoreTests {
 
 	private void assertAllBindings(CompilationUnit astRoot) {
 		List<AbstractTypeDeclaration> list= astRoot.types();
-		for (int i= 0; i < list.size(); i++) {
-			TypeDeclaration decl= (TypeDeclaration) list.get(i);
+		for (AbstractTypeDeclaration element : list) {
+			TypeDeclaration decl= (TypeDeclaration) element;
 			assertTrue(decl.resolveBinding() != null);
 
 			if (!decl.isInterface() && decl.getSuperclassType() != null) {
 				assertTrue(decl.getSuperclassType().resolveBinding() != null);
 			}
 			List<Type> interfaces= decl.superInterfaceTypes();
-			for (int j= 0; j < interfaces.size(); j++) {
-				assertTrue(interfaces.get(j).resolveBinding() != null);
+			for (Type interface1 : interfaces) {
+				assertTrue(interface1.resolveBinding() != null);
 			}
 
 			for (MethodDeclaration meth : decl.getMethods()) {
 				assertTrue(meth.resolveBinding() != null);
 				List<SingleVariableDeclaration> params= meth.parameters();
-				for (int n= 0; n < params.size(); n++) {
-					SingleVariableDeclaration arg= params.get(n);
+				for (SingleVariableDeclaration arg : params) {
 					assertTrue(arg.resolveBinding() != null);
 				}
 				if (!meth.isConstructor()) {
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeInfoTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeInfoTest.java
index bf9b579750..d1139f6023 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeInfoTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeInfoTest.java
@@ -126,8 +126,7 @@ public class TypeInfoTest extends TestCase {
 		findTypeRef(result, "junit.runner.Version");
 
 
-		for (int i= 0; i < result.size(); i++) {
-			TypeNameMatch ref= result.get(i);
+		for (TypeNameMatch ref : result) {
 			//System.out.println(ref.getTypeName());
 			assertResolve(ref);
 
@@ -149,8 +148,7 @@ public class TypeInfoTest extends TestCase {
 	}
 
 	private void findTypeRef(List<TypeNameMatch> refs, String fullname) {
-		for (int i= 0; i <refs.size(); i++) {
-			TypeNameMatch curr= refs.get(i);
+		for (TypeNameMatch curr : refs) {
 			if (fullname.equals(curr.getFullyQualifiedName())) {
 				return;
 			}
@@ -191,8 +189,7 @@ public class TypeInfoTest extends TestCase {
 
 		assertEquals("wrong element count", 51, result.size());
 		//System.out.println("Elements found: " + result.size());
-		for (int i= 0; i < result.size(); i++) {
-			TypeNameMatch ref= result.get(i);
+		for (TypeNameMatch ref : result) {
 			//System.out.println(ref.getTypeName());
 			assertResolve(ref);
 		}
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/HierarchicalContentProviderTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/HierarchicalContentProviderTests.java
index d3e7fe8cda..2cc9021900 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/HierarchicalContentProviderTests.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/HierarchicalContentProviderTests.java
@@ -141,8 +141,8 @@ public class HierarchicalContentProviderTests {
 	private String getString(List<String> list) {
 		Collections.sort(list, Collator.getInstance());
 		StringBuilder buf= new StringBuilder();
-		for (int i= 0; i < list.size(); i++) {
-			buf.append(list.get(i)).append('\n');
+		for (String element : list) {
+			buf.append(element).append('\n');
 		}
 		return buf.toString();
 	}
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageCacheTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageCacheTest.java
index 250da87ee5..586e0d2682 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageCacheTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageCacheTest.java
@@ -219,12 +219,10 @@ public class PackageCacheTest {
 	 * which computes the single child package of a package (if any).
 	 */
 	private IPackageFragment findSinglePackageChild(IPackageFragment fragment) throws Exception {
-		IJavaElement[] children= src.getChildren();
 		String prefix= fragment.getElementName() + '.';
 		int prefixLen= prefix.length();
 		IPackageFragment found= null;
-		for (int i= 0; i < children.length; ++i) {
-			IJavaElement element= children[i];
+		for (IJavaElement element : src.getChildren()) {
 			String name= element.getElementName();
 			if (name.startsWith(prefix) && name.length() > prefixLen && name.indexOf('.', prefixLen) == -1) {
 				if (found == null) {
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JarUtil.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JarUtil.java
index a1021c90d7..d1ca0886ae 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JarUtil.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JarUtil.java
@@ -125,11 +125,10 @@ public class JarUtil {
                 flushDirectoryContent(dir);
             } else {
                 // remove only old sub-dirs
-                File[] testDirs = dir.listFiles();
-                for (int i=0,l=testDirs.length; i<l; i++) {
-                    if (testDirs[i].isDirectory()) {
-                        if ((now - testDirs[i].lastModified()) > delay) {
-                            delete(testDirs[i]);
+                for (File testDir : dir.listFiles()) {
+                    if (testDir.isDirectory()) {
+                        if ((now - testDir.lastModified()) > delay) {
+                            delete(testDir);
                         }
                     }
                 }
@@ -192,11 +191,8 @@ private static class Requestor implements ICompilerRequestor {
 	}
 	protected void outputClassFiles(CompilationResult unitResult) {
 		if (this.classFileFilter.include(unitResult)) {
-			ClassFile[] classFiles = unitResult.getClassFiles();
 			if (this.outputPath != null) {
-				for (int i = 0, fileCount = classFiles.length; i < fileCount; i++) {
-					// retrieve the key and the corresponding classfile
-					ClassFile classFile = classFiles[i];
+				for (ClassFile classFile : unitResult.getClassFiles()) {
 					String relativeName =
 						new String(classFile.fileName()).replace('/', File.separatorChar) + ".class";
 					try {
@@ -326,8 +322,8 @@ public static boolean delete(File file) {
 public static void flushDirectoryContent(File dir) {
     File[] files = dir.listFiles();
     if (files == null) return;
-    for (int i = 0, max = files.length; i < max; i++) {
-        delete(files[i]);
+    for (File file : files) {
+        delete(file);
     }
 }
 private static Map<String, String> getCompileOptions(String compliance) {
@@ -414,8 +410,8 @@ public static String[] getJavaClassLibs() {
 	return jars;
 }
 private static void addJarEntries(String jreDir, String[] jarNames, ArrayList<String> paths) {
-	for (int i = 0, max = jarNames.length; i < max; i++) {
-		final String currentName = jreDir + jarNames[i];
+	for (String jarName : jarNames) {
+		final String currentName = jreDir + jarName;
 		File f = new File(currentName);
 		if (f.exists()) {
 			paths.add(toNativePath(currentName));
@@ -733,8 +729,7 @@ public static void zip(File rootDir, String zipPath) throws IOException {
 private static void zip(File dir, ZipOutputStream zip, int rootPathLength) throws IOException {
     File[] files = dir.listFiles();
     if (files != null) {
-        for (int i = 0, length = files.length; i < length; i++) {
-            File file = files[i];
+        for (File file : files) {
             if (file.isFile()) {
                 String path = file.getPath();
                 path = path.substring(rootPathLength);
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
index 0a995dd89e..279d66acdc 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
@@ -197,8 +197,8 @@ public class QuickFixTest {
 
 	public static TypeDeclaration findTypeDeclaration(CompilationUnit astRoot, String simpleTypeName) {
 		List<AbstractTypeDeclaration> types= astRoot.types();
-		for (int i= 0; i < types.size(); i++) {
-			TypeDeclaration elem= (TypeDeclaration) types.get(i);
+		for (AbstractTypeDeclaration type : types) {
+			TypeDeclaration elem= (TypeDeclaration) type;
 			if (simpleTypeName.equals(elem.getName().getIdentifier())) {
 				return elem;
 			}
@@ -218,8 +218,7 @@ public class QuickFixTest {
 	public static VariableDeclarationFragment findFieldDeclaration(TypeDeclaration typeDecl, String fieldName) {
 		for (FieldDeclaration field : typeDecl.getFields()) {
 			List<VariableDeclarationFragment> list= field.fragments();
-			for (int k= 0; k < list.size(); k++) {
-				VariableDeclarationFragment fragment= list.get(k);
+			for (VariableDeclarationFragment fragment : list) {
 				if (fieldName.equals(fragment.getName().getIdentifier())) {
 					return fragment;
 				}
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReorgQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReorgQuickFixTest.java
index 3d20384aef..98f3ffd8d8 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReorgQuickFixTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReorgQuickFixTest.java
@@ -256,8 +256,8 @@ public class ReorgQuickFixTest extends QuickFixTest {
 
 		boolean hasRename= true, hasMove= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
+		for (IJavaCompletionProposal proposal2 : proposals) {
+			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposal2;
 			if (curr instanceof CorrectPackageDeclarationProposal) {
 				assertTrue("Duplicated proposal", hasRename);
 				hasRename= false;
@@ -305,8 +305,8 @@ public class ReorgQuickFixTest extends QuickFixTest {
 
 		boolean hasRename= true, hasMove= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
+		for (IJavaCompletionProposal proposal2 : proposals) {
+			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposal2;
 			if (curr instanceof CorrectPackageDeclarationProposal) {
 				assertTrue("Duplicated proposal", hasRename);
 				hasRename= false;
@@ -354,8 +354,8 @@ public class ReorgQuickFixTest extends QuickFixTest {
 
 		boolean hasRename= true, hasMove= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
+		for (IJavaCompletionProposal proposal2 : proposals) {
+			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposal2;
 			if (curr instanceof CorrectPackageDeclarationProposal) {
 				assertTrue("Duplicated proposal", hasRename);
 				hasRename= false;
@@ -401,8 +401,8 @@ public class ReorgQuickFixTest extends QuickFixTest {
 
 		boolean hasRename= true, hasMove= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
+		for (IJavaCompletionProposal proposal2 : proposals) {
+			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposal2;
 			if (curr instanceof CorrectPackageDeclarationProposal) {
 				assertTrue("Duplicated proposal", hasRename);
 				hasRename= false;
@@ -480,8 +480,8 @@ public class ReorgQuickFixTest extends QuickFixTest {
 
 		boolean hasRename= true, hasMove= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
+		for (IJavaCompletionProposal proposal2 : proposals) {
+			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposal2;
 			if (curr instanceof CorrectMainTypeNameProposal) {
 				assertTrue("Duplicated proposal", hasRename);
 				hasRename= false;
@@ -528,8 +528,8 @@ public class ReorgQuickFixTest extends QuickFixTest {
 
 		boolean hasRename= true, hasMove= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
+		for (IJavaCompletionProposal proposal2 : proposals) {
+			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposal2;
 			if (curr instanceof CorrectMainTypeNameProposal) {
 				assertTrue("Duplicated proposal", hasRename);
 				hasRename= false;
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReturnTypeQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReturnTypeQuickFixTest.java
index 7bdad3b581..0cc522a176 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReturnTypeQuickFixTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReturnTypeQuickFixTest.java
@@ -98,8 +98,7 @@ public class ReturnTypeQuickFixTest extends QuickFixTest {
 
 		boolean addReturnType= true, doRename= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
+		for (IJavaCompletionProposal elem : proposals) {
 			if (elem instanceof ASTRewriteCorrectionProposal) {
 				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
 				assertTrue("duplicated entries", addReturnType);
@@ -156,8 +155,7 @@ public class ReturnTypeQuickFixTest extends QuickFixTest {
 
 		boolean addReturnType= true, doRename= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
+		for (IJavaCompletionProposal elem : proposals) {
 			if (elem instanceof ASTRewriteCorrectionProposal) {
 				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
 				assertTrue("duplicated entries", addReturnType);
@@ -245,8 +243,7 @@ public class ReturnTypeQuickFixTest extends QuickFixTest {
 
 		boolean addReturnType= true, doRename= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
+		for (IJavaCompletionProposal elem : proposals) {
 			if (elem instanceof ASTRewriteCorrectionProposal) {
 				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
 				assertTrue("duplicated entries", addReturnType);
@@ -347,8 +344,7 @@ public class ReturnTypeQuickFixTest extends QuickFixTest {
 
 		boolean addReturnType= true, doRename= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
+		for (IJavaCompletionProposal elem : proposals) {
 			if (elem instanceof ASTRewriteCorrectionProposal) {
 				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
 				assertTrue("duplicated entries", addReturnType);
@@ -401,8 +397,7 @@ public class ReturnTypeQuickFixTest extends QuickFixTest {
 
 		boolean addReturnType= true, doRename= true;
 
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
+		for (IJavaCompletionProposal elem : proposals) {
 			if (elem instanceof ASTRewriteCorrectionProposal) {
 				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
 				assertTrue("duplicated entries", addReturnType);
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedVariablesQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedVariablesQuickFixTest.java
index 394e3ab139..fa49ee5d3f 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedVariablesQuickFixTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedVariablesQuickFixTest.java
@@ -1956,8 +1956,7 @@ public class UnresolvedVariablesQuickFixTest extends QuickFixTest {
 		assertCorrectLabels(proposals);
 
 		CUCorrectionProposal localProposal= null;
-		for (int i = 0; i < proposals.size(); i++) {
-			Object curr= proposals.get(i);
+		for (IJavaCompletionProposal curr : proposals) {
 			if (curr instanceof NewVariableCorrectionProposal && ((NewVariableCorrectionProposal) curr).getVariableKind() == NewVariableCorrectionProposal.LOCAL) {
 				localProposal= (CUCorrectionProposal) curr;
 			}
@@ -1998,8 +1997,7 @@ public class UnresolvedVariablesQuickFixTest extends QuickFixTest {
 		assertCorrectLabels(proposals);
 
 		CUCorrectionProposal localProposal= null;
-		for (int i = 0; i < proposals.size(); i++) {
-			Object curr= proposals.get(i);
+		for (IJavaCompletionProposal curr : proposals) {
 			if (curr instanceof NewVariableCorrectionProposal && ((NewVariableCorrectionProposal) curr).getVariableKind() == NewVariableCorrectionProposal.LOCAL) {
 				localProposal= (CUCorrectionProposal) curr;
 			}
@@ -2041,8 +2039,7 @@ public class UnresolvedVariablesQuickFixTest extends QuickFixTest {
 		assertCorrectLabels(proposals);
 
 		CUCorrectionProposal localProposal= null;
-		for (int i = 0; i < proposals.size(); i++) {
-			Object curr= proposals.get(i);
+		for (IJavaCompletionProposal curr : proposals) {
 			if (curr instanceof NewVariableCorrectionProposal && ((NewVariableCorrectionProposal) curr).getVariableKind() == NewVariableCorrectionProposal.LOCAL) {
 				localProposal= (CUCorrectionProposal) curr;
 			}