Bug 548309 - Use jdk 5 for-each loop

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

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

8 files changed, 27 insertions, 45 deletions

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java
index dba009df3d..00be8636c6 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java
@@ -15,7 +15,6 @@ package org.eclipse.jdt.ui.tests.refactoring;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -239,8 +238,8 @@ public class ChangeSignatureTests extends RefactoringTest {
 	private void markAsDeleted(List<ParameterInfo> list, int[] deleted) {
 		if (deleted == null)
 			return;
-		for (int i= 0; i < deleted.length; i++) {
-			list.get(deleted[i]).markAsDeleted();
+		for (int element : deleted) {
+			list.get(element).markAsDeleted();
 		}
 	}
 
@@ -352,8 +351,7 @@ public class ChangeSignatureTests extends RefactoringTest {
 	}
 
 	private static int indexOfOldName(List<ParameterInfo> infos, String string) {
-		for (Iterator<ParameterInfo> iter= infos.iterator(); iter.hasNext();) {
-			ParameterInfo info= iter.next();
+		for (ParameterInfo info : infos) {
 			if (info.getOldName().equals(string))
 				return infos.indexOf(info);
 		}
@@ -511,16 +509,15 @@ public class ChangeSignatureTests extends RefactoringTest {
 
 
 	private void mangleExceptions(List<ExceptionInfo> list, String[] removeExceptions, String[] addExceptions, ICompilationUnit cu) throws Exception {
-		for (Iterator<ExceptionInfo> iter= list.iterator(); iter.hasNext(); ) {
-			ExceptionInfo info= iter.next();
+		for (ExceptionInfo info : list) {
 			String name= info.getFullyQualifiedName();
-			for (int i= 0; i < removeExceptions.length; i++) {
-				if (name.equals(removeExceptions[i]))
+			for (String removeException : removeExceptions) {
+				if (name.equals(removeException))
 					info.markAsDeleted();
 			}
 		}
-		for (int i= 0; i < addExceptions.length; i++) {
-			IType type= cu.getJavaProject().findType(addExceptions[i]);
+		for (String addException : addExceptions) {
+			IType type= cu.getJavaProject().findType(addException);
 			list.add(ExceptionInfo.createInfoForAddedException(type));
 		}
 	}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java
index 1b05ca089b..cba73590cf 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java
@@ -17,7 +17,6 @@ package org.eclipse.jdt.ui.tests.refactoring;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -438,8 +437,7 @@ public class IntroduceFactoryTests extends RefactoringTest {
 			doMultiUnitTest(CUs, testPath, inputFileBaseNames, null);
 
 		} finally {
-			for (Iterator<IJavaProject> iter= proj2PkgRoot.keySet().iterator(); iter.hasNext();) {
-				IJavaProject project= iter.next();
+			for (IJavaProject project : proj2PkgRoot.keySet()) {
 				if (project.exists()) {
 					try {
 						project.getProject().delete(true, null);
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PullUpTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PullUpTests.java
index 31b0fb36a8..e0cdbef79c 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PullUpTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PullUpTests.java
@@ -16,12 +16,8 @@ package org.eclipse.jdt.ui.tests.refactoring;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
@@ -48,6 +44,9 @@ import org.eclipse.jdt.internal.corext.refactoring.util.JavaElementUtil;
 
 import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class PullUpTests extends RefactoringTest {
 
 	private static final boolean BUG_91542= true;
@@ -186,12 +185,10 @@ public class PullUpTests extends RefactoringTest {
 		IMethod[] expectedMethods= getMethods(type, expectedMethodNames, expectedMethodSignatures);
 		List<IMember> expected= Arrays.asList(merge(expectedFields, expectedMethods));
 		assertEquals("incorrect size", expected.size(), required.size());
-		for (Iterator<IMember> iter= expected.iterator(); iter.hasNext();) {
-			Object each= iter.next();
+		for (IMember each : expected) {
 			assertTrue ("required does not contain " + each, required.contains(each));
 		}
-		for (Iterator<IMember> iter= required.iterator(); iter.hasNext();) {
-			Object each= iter.next();
+		for (IMember each : required) {
 			assertTrue ("expected does not contain " + each, expected.contains(each));
 		}
 	}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PushDownTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PushDownTests.java
index 2671c30072..fd24c693a3 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PushDownTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PushDownTests.java
@@ -15,12 +15,8 @@ package org.eclipse.jdt.ui.tests.refactoring;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
@@ -39,6 +35,9 @@ import org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester
 import org.eclipse.jdt.internal.corext.refactoring.structure.PushDownRefactoringProcessor;
 import org.eclipse.jdt.internal.corext.refactoring.structure.PushDownRefactoringProcessor.MemberActionInfo;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class PushDownTests extends RefactoringTest {
 
 	private static final Class<PushDownTests> clazz= PushDownTests.class;
@@ -207,12 +206,10 @@ public class PushDownTests extends RefactoringTest {
 		IMethod[] expectedMethods= getMethods(type, expectedMethodNames, expectedMethodSignatures);
 		List<IMember> expected= Arrays.asList(merge(expectedFields, expectedMethods));
 		assertEquals("incorrect size", expected.size(), required.size());
-		for (Iterator<IMember> iter= expected.iterator(); iter.hasNext();) {
-			Object each= iter.next();
+		for (IMember each : expected) {
 			assertTrue ("required does not contain " + each, required.contains(each));
 		}
-		for (Iterator<IMember> iter= required.iterator(); iter.hasNext();) {
-			Object each= iter.next();
+		for (IMember each : required) {
 			assertTrue ("expected does not contain " + each, expected.contains(each));
 		}
 	}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringScannerTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringScannerTests.java
index c13b7abe0c..2225a2506a 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringScannerTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringScannerTests.java
@@ -15,8 +15,6 @@ package org.eclipse.jdt.ui.tests.refactoring;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
-import java.util.Set;
 
 import org.eclipse.jdt.internal.corext.refactoring.rename.RefactoringScanner;
 import org.eclipse.jdt.internal.corext.refactoring.rename.RefactoringScanner.TextMatch;
@@ -80,9 +78,7 @@ public class RefactoringScannerTests extends RefactoringTest{
 			expectedMatchesList.add(Integer.valueOf(TextRangeUtil.getOffset(text, expectedMatch.fLine, expectedMatch.fColumn)));
 		}
 		ArrayList<Integer> matchesList= new ArrayList<>();
-		Set<TextMatch> matches= fScanner.getMatches();
-		for (Iterator<TextMatch> iter= matches.iterator(); iter.hasNext();) {
-			TextMatch element= iter.next();
+		for (TextMatch element : fScanner.getMatches()) {
 			matchesList.add(Integer.valueOf(element.getStartPosition()));
 		}
 		Collections.sort(matchesList);
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/DeleteTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/DeleteTest.java
index c6bf227bfd..6e60881ae5 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/DeleteTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/DeleteTest.java
@@ -17,7 +17,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.List;
 import java.util.TreeMap;
 
@@ -89,8 +88,8 @@ public class DeleteTest extends RefactoringTest {
 				suite.addTest(test);
 			}
 		}
-		for (Iterator<TestCase> iter= lastTests.values().iterator(); iter.hasNext();) {
-			suite.addTest(iter.next());
+		for (TestCase testCase : lastTests.values()) {
+			suite.addTest(testCase);
 		}
 		return new RefactoringTestSetup(suite);
 	}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/DebugUtils.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/DebugUtils.java
index f04554fea8..093d1050ce 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/DebugUtils.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/DebugUtils.java
@@ -51,8 +51,8 @@ public final class DebugUtils {
 	}
 
 	public static void dumpCollectionCollection(Collection<?> c) {
-		for (Iterator<?> iter= c.iterator(); iter.hasNext(); ){
-			dumpCollection("", (List<?>) iter.next()); //$NON-NLS-1$
+		for (Object name : c) {
+			dumpCollection("", (List<?>) name); //$NON-NLS-1$
 		}
 	}
 
@@ -62,8 +62,8 @@ public final class DebugUtils {
 			System.out.println("null"); //$NON-NLS-1$
 			return;
 		}
-		for (Iterator<?> iter= c.iterator(); iter.hasNext(); ){
-			System.out.println(iter.next().toString());
+		for (Object name : c) {
+			System.out.println(name.toString());
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockClipboard.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockClipboard.java
index ff4cd4b6a8..2a1771e29e 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockClipboard.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockClipboard.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.ui.tests.refactoring.infra;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -46,8 +45,7 @@ public class MockClipboard extends Clipboard{
 	@Override
 	public TransferData[] getAvailableTypes() {
 		Set<TransferData> result= new HashSet<>();
-		for (Iterator<Transfer> iter= fContents.keySet().iterator(); iter.hasNext();) {
-			Transfer transfer= iter.next();
+		for (Transfer transfer : fContents.keySet()) {
 			result.addAll(Arrays.asList(transfer.getSupportedTypes()));
 		}
 		return result.toArray(new TransferData[result.size()]);