Bug 548309 - Use jdk 5 for-each loop (org.eclipse.jdt.ui.*.refactoring)

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

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

45 files changed, 214 insertions, 300 deletions

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java
index acd9ad4c88..587caab453 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java
@@ -143,9 +143,7 @@ public class SearchEngine {
 		execute(search, pathCollector, pm);
 		
 		/* TODO_SEARCH */
-		IFile[] files= getFiles(pathCollector, ResourcesPlugin.getWorkspace());
-		for (int i= 0; i < files.length; i++) {
-			IFile file= files[i];
+		for (IFile file : getFiles(pathCollector, ResourcesPlugin.getWorkspace())) {
 			search.locateMatches(file, resultCollector);
 		}
 	}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java
index 66a3725e56..b3e7d8695e 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java
@@ -108,15 +108,13 @@ public class Jsp2JavaReconcileStep extends AbstractReconcileStep {
 		// the "only" thing we need to do is to adapt the positions
 		int[] smap= fJspTranslator.getLineMapping();
 
-		for (int i= 0; i < inputResults.length; i++) {				
-		
+		for (IReconcileResult inputResult : inputResults) {
 			if (isCanceled())
 				return null;
-
-			if (!(inputResults[i] instanceof AnnotationAdapter))
+			if (!(inputResult instanceof AnnotationAdapter)) {
 				continue;
-				
-			AnnotationAdapter result= (AnnotationAdapter)inputResults[i];
+			}
+			AnnotationAdapter result= (AnnotationAdapter) inputResult;
 			Position pos= result.getPosition();
 			int javaLine;
 			try {
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java
index 4bd091f655..2ee77c2ecc 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java
@@ -113,17 +113,14 @@ public class JspReconcilingStrategy implements IReconcilingStrategy, IReconcilin
 			 */
 			@Override
 			protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-				for (int i= 0; i < results.length; i++) {				
-
+				for (IReconcileResult r : results) {
 					if (fProgressMonitor != null && fProgressMonitor.isCanceled())
 						return;
-		
-					if (!(results[i] instanceof AnnotationAdapter))
+					if (!(r instanceof AnnotationAdapter)) {
 						continue;
-				
-					AnnotationAdapter result= (AnnotationAdapter)results[i];
+					}
+					AnnotationAdapter result= (AnnotationAdapter) r;
 					Position pos= result.getPosition();
-					
 					Annotation annotation= result.createAnnotation();
 					getAnnotationModel().addAnnotation(annotation, pos);
 				}
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java
index d2289684ad..aaa83cc139 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java
@@ -44,10 +44,8 @@ public class JspTypeQuery implements IIndexQuery {
 	@Override
 	public void computePathsKeyingIndexFiles(ArrayList requiredIndexKeys) {
 		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IProject[] projects= workspace.getRoot().getProjects();
 		try {
-			for (int i= 0; i < projects.length; i++) {
-				IProject project= projects[i];
+			for (IProject project : workspace.getRoot().getProjects()) {
 				if (!project.isAccessible() || !project.hasNature(JavaCore.NATURE_ID))
 					continue;
 				IPath path= project.getFullPath();
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java
index d177a646ff..ef9f227700 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java
@@ -44,11 +44,9 @@ public class ToggleJspBreakpointAction extends Action {
 	@Override
 	public void run() {
 		IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager();
-		IBreakpoint[] breakpoints = manager.getBreakpoints();
 		IResource resource = getResource();
 		int lineNumber = fRulerInfo.getLineOfLastMouseButtonActivity() + 1;
-		for (int i = 0; i < breakpoints.length; i++) {
-			IBreakpoint bp = breakpoints[i];
+		for (IBreakpoint bp : manager.getBreakpoints()) {
 			if (bp instanceof IJavaStratumLineBreakpoint) {
 				IJavaStratumLineBreakpoint breakpoint = (IJavaStratumLineBreakpoint)bp;
 				if (breakpoint.getMarker().getResource().equals(resource)) {
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java
index 786c89e86a..7aeba73b5f 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java
@@ -45,7 +45,6 @@ public class TomcatClasspathProvider extends StandardClasspathProvider {
 		if (useDefault) {
 			IRuntimeClasspathEntry[] defaults = super.computeUnresolvedClasspath(configuration);
 			IVMInstall vm = JavaRuntime.computeVMInstall(configuration);
-			LibraryLocation[] libs = JavaRuntime.getLibraryLocations(vm);
 			List rtes = new ArrayList();
 			rtes.addAll(Arrays.asList(defaults));
 			// add bootstrap.jar
@@ -56,8 +55,7 @@ public class TomcatClasspathProvider extends StandardClasspathProvider {
 			rtes.add(r);
 			// add class libraries to bootpath			
 			boolean tools = false; // keeps track of whether a tools.jar was found	
-			for (int i = 0; i < libs.length; i++) {
-				LibraryLocation lib = libs[i];
+			for (LibraryLocation lib : JavaRuntime.getLibraryLocations(vm)) {
 				if (lib.getSystemLibraryPath().toString().endsWith("tools.jar")) { //$NON-NLS-1$
 					tools = true;
 				}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/BinaryReferencesTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/BinaryReferencesTests.java
index 25c621dbf3..d00f37f7c6 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/BinaryReferencesTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/BinaryReferencesTests.java
@@ -109,10 +109,9 @@ public class BinaryReferencesTests extends TestCase {
 	private static IMethod findMethod(IType type, String methodName) throws JavaModelException {
 		IMethod method= type.getMethod(methodName, new String[0]);
 		if (! method.exists()) {
-			IMethod[] methods= type.getMethods();
-			for (int i= 0; i < methods.length; i++) {
-				if (methods[i].getElementName().equals(methodName)) {
-					method= methods[i];
+			for (IMethod m : type.getMethods()) {
+				if (m.getElementName().equals(methodName)) {
+					method= m;
 					break;
 				}
 			}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractClassTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractClassTests.java
index 66b63447e7..e0b72a470c 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractClassTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractClassTests.java
@@ -237,8 +237,7 @@ public class ExtractClassTests extends RefactoringTest {
 		RefactoringStatusEntry[] entries= status.getEntries();
 		//Warning for no IFields moved
 		assertEquals(1, entries.length);
-		for (int i= 0; i < entries.length; i++) {
-			RefactoringStatusEntry refactoringStatusEntry= entries[i];
+		for (RefactoringStatusEntry refactoringStatusEntry : entries) {
 			assertEquals("Status was:" + refactoringStatusEntry, true, refactoringStatusEntry.isFatalError());
 		}
 	}
@@ -256,8 +255,7 @@ public class ExtractClassTests extends RefactoringTest {
 		RefactoringStatusEntry[] entries= status.getEntries();
 		//Error for usage in Switch case
 		assertEquals(1, entries.length);
-		for (int i= 0; i < entries.length; i++) {
-			RefactoringStatusEntry refactoringStatusEntry= entries[i];
+		for (RefactoringStatusEntry refactoringStatusEntry : entries) {
 			assertEquals(true, refactoringStatusEntry.isError());
 		}
 	}
@@ -270,8 +268,7 @@ public class ExtractClassTests extends RefactoringTest {
 		//Warning for transient
 		//Warning for volatile
 		assertEquals(2, entries.length);
-		for (int i= 0; i < entries.length; i++) {
-			RefactoringStatusEntry refactoringStatusEntry= entries[i];
+		for (RefactoringStatusEntry refactoringStatusEntry : entries) {
 			assertEquals(true, refactoringStatusEntry.isWarning());
 		}
 	}
@@ -279,8 +276,7 @@ public class ExtractClassTests extends RefactoringTest {
 	public void testUFOGetter() throws Exception {
 		fDescriptor.setType(setupType());
 		Field[] fields= ExtractClassDescriptor.getFields(fDescriptor.getType());
-		for (int i= 0; i < fields.length; i++) {
-			Field field= fields[i];
+		for (Field field : fields) {
 			if ("homePlanet".equals(field.getFieldName()))
 				field.setCreateField(false);
 		}
@@ -355,8 +351,7 @@ public class ExtractClassTests extends RefactoringTest {
 		//Error for privateInner reference
 		//Error for OtherPackageProteced reference
 		assertEquals(2, entries.length);
-		for (int i= 0; i < entries.length; i++) {
-			RefactoringStatusEntry refactoringStatusEntry= entries[i];
+		for (RefactoringStatusEntry refactoringStatusEntry : entries) {
 			assertEquals(true, refactoringStatusEntry.isError());
 		}
 	}
@@ -406,8 +401,7 @@ public class ExtractClassTests extends RefactoringTest {
 		RefactoringStatusEntry[] entries= status.getEntries();
 		//3*Warning for semantic change
 		assertEquals(3, entries.length);
-		for (int i= 0; i < entries.length; i++) {
-			RefactoringStatusEntry refactoringStatusEntry= entries[i];
+		for (RefactoringStatusEntry refactoringStatusEntry : entries) {
 			assertEquals(true, refactoringStatusEntry.isWarning());
 		}
 	}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java
index f780174017..9805674f4b 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java
@@ -106,10 +106,10 @@ public class InlineMethodTests extends AbstractSelectionTestCase {
 	}
 
 	private IMethod getMethodToInline(IType type) throws CoreException {
-		IMethod[] methods= type.getMethods();
-		for (int i= 0; i < methods.length; i++) {
-			if ("toInline".equals(methods[i].getElementName()))
-				return methods[i];
+		for (IMethod method : type.getMethods()) {
+			if ("toInline".equals(method.getElementName())) {
+				return method;
+			}
 		}
 		return null;
 	}
@@ -128,10 +128,10 @@ public class InlineMethodTests extends AbstractSelectionTestCase {
 	}
 
 	private IMethod getFirstConstructor(IType type) throws CoreException {
-		IMethod[] methods= type.getMethods();
-		for (int i= 0; i < methods.length; i++) {
-			if (methods[i].isConstructor())
-				return methods[i];
+		for (IMethod method : type.getMethods()) {
+			if (method.isConstructor()) {
+				return method;
+			}
 		}
 		return null;
 	}
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 ded9af7411..5df89baa17 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
@@ -475,37 +475,26 @@ public class IntroduceFactoryTests extends RefactoringTest {
 	}
 
 	private void addProjectDependencies(String[] dependencies, Map<String, IJavaProject> projName2Project) throws JavaModelException {
-		for(int i= 0; i < dependencies.length; i++) {
+		for (String dependency : dependencies) {
 			// dependent:provider
-			String dependency= dependencies[i];
 			int colonIdx= dependency.indexOf(':');
 			String depName= dependency.substring(0, colonIdx);
 			String provName= dependency.substring(colonIdx+1);
-
 			IJavaProject depProj= projName2Project.get(depName);
 			IJavaProject provProj= projName2Project.get(provName);
-
 			JavaProjectHelper.addRequiredProject(depProj, provProj);
 		}
 	}
 
 	private void createProjectPackageStructure(Map<String, Set<String>> projName2PkgNames, Map<String, IJavaProject> projName2Project, Map<IJavaProject, IPackageFragmentRoot> proj2PkgRoot) throws CoreException, JavaModelException {
-		for(Iterator<String> iter= projName2PkgNames.keySet().iterator(); iter.hasNext(); ) {
-			String projName= iter.next();
-			Set<String> projPkgNames= projName2PkgNames.get(projName);
-
+		for (String projName : projName2PkgNames.keySet()) {
 			IJavaProject project= JavaProjectHelper.createJavaProject(projName, "bin");
 			IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(project, CONTAINER);
-
 			JavaProjectHelper.addRTJar(project);
-
 			Set<IPackageFragment> pkgs= new HashSet<>();
-
 			projName2Project.put(projName, project);
 			proj2PkgRoot.put(project, root);
-			for(Iterator<String> pkgIter= projPkgNames.iterator(); pkgIter.hasNext(); ) {
-				String pkgName= pkgIter.next();
-
+			for (String pkgName : projName2PkgNames.get(projName)) {
 				pkgs.add(root.createPackageFragment(pkgName, true, null));
 			}
 		}
@@ -514,8 +503,7 @@ public class IntroduceFactoryTests extends RefactoringTest {
 	private Map<String, Set<String>> collectProjectPackages(String[] inputFileBaseNames) {
 		Map<String, Set<String>> proj2Pkgs= new HashMap<>();
 
-		for(int i= 0; i < inputFileBaseNames.length; i++) {
-			String filePath= inputFileBaseNames[i];
+		for (String filePath : inputFileBaseNames) {
 			int projEnd= filePath.indexOf('/');
 			String projName= filePath.substring(0, projEnd);
 			String pkgName= filePath.substring(projEnd+1, filePath.lastIndexOf('/'));
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceParameterObjectTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceParameterObjectTests.java
index 546d1ad037..e59c98623e 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceParameterObjectTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceParameterObjectTests.java
@@ -187,9 +187,7 @@ public class IntroduceParameterObjectTests extends RefactoringTest {
 		assertNotNull(type);
 		assertTrue(type.exists());
 		IMethod fooMethod= null;
-		IMethod[] methods= type.getMethods();
-		for (int i= 0; i < methods.length; i++) {
-			IMethod method= methods[i];
+		for (IMethod method : type.getMethods()) {
 			if ("foo".equals(method.getElementName())) {
 				fooMethod= method;
 			}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java
index 0cf858cd51..0539469b06 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java
@@ -52,9 +52,7 @@ public class MoveInstanceMethodTests extends RefactoringTest {
 
 	public static void chooseNewTarget(MoveInstanceMethodProcessor processor, int newTargetType, String newTargetName) {
 		IVariableBinding target= null;
-		IVariableBinding[] targets= processor.getPossibleTargets();
-		for (int i= 0; i < targets.length; i++) {
-			IVariableBinding candidate= targets[i];
+		for (IVariableBinding candidate : processor.getPossibleTargets()) {
 			if (candidate.getName().equals(newTargetName) && typeMatches(newTargetType, candidate)) {
 				target= candidate;
 				break;
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ParticipantTesting.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ParticipantTesting.java
index 9c4114028c..db859ec960 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ParticipantTesting.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ParticipantTesting.java
@@ -63,8 +63,7 @@ public class ParticipantTesting {
 
 	public static String[] createHandles(Object[] elements) {
 		List<String> result= new ArrayList<>();
-		for (int i= 0; i < elements.length; i++) {
-			Object element= elements[i];
+		for (Object element : elements) {
 			if (element instanceof IJavaElement) {
 				result.add(((IJavaElement)element).getHandleIdentifier());
 			} else if (element instanceof IResource) {
@@ -156,8 +155,7 @@ public class ParticipantTesting {
 	}
 
 	private static void testElementsShared(String[] expected, List<String> actual) {
-		for (int i= 0; i < expected.length; i++) {
-			String handle= expected[i];
+		for (String handle : expected) {
 			Assert.assertTrue("Expected handle not found: " + handle, actual.contains(handle));
 		}
 		testNumberOfElements(expected.length, actual);
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 44560254a0..2671c30072 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
@@ -91,15 +91,14 @@ public class PushDownTests extends RefactoringTest {
 		List<IMember> membersToPushDown= Arrays.asList(merge(methodsToPushDown, fieldsToPushDown));
 		List<IMethod> methodsToDeclareAbstract= Arrays.asList(findMethods(selectedMethods, namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract));
 
-		MemberActionInfo[] infos= processor.getMemberActionInfos();
-		for (int i= 0; i < infos.length; i++) {
-			if (membersToPushDown.contains(infos[i].getMember())){
-				infos[i].setAction(MemberActionInfo.PUSH_DOWN_ACTION);
-				assertTrue(! methodsToDeclareAbstract.contains(infos[i].getMember()));
+		for (MemberActionInfo info : processor.getMemberActionInfos()) {
+			if (membersToPushDown.contains(info.getMember())) {
+				info.setAction(MemberActionInfo.PUSH_DOWN_ACTION);
+				assertTrue(!methodsToDeclareAbstract.contains(info.getMember()));
 			}
-			if (methodsToDeclareAbstract.contains(infos[i].getMember())){
-				infos[i].setAction(MemberActionInfo.PUSH_ABSTRACT_ACTION);
-				assertTrue(! membersToPushDown.contains(infos[i].getMember()));
+			if (methodsToDeclareAbstract.contains(info.getMember())) {
+				info.setAction(MemberActionInfo.PUSH_ABSTRACT_ACTION);
+				assertTrue(!membersToPushDown.contains(info.getMember()));
 			}
 		}
 	}
@@ -221,9 +220,10 @@ public class PushDownTests extends RefactoringTest {
 	private static List<IMember> getMembersToPushDown(PushDownRefactoringProcessor processor) {
 		MemberActionInfo[] infos= processor.getMemberActionInfos();
 		List<IMember> result= new ArrayList<>(infos.length);
-		for (int i= 0; i < infos.length; i++) {
-			if (infos[i].isToBePushedDown())
-				result.add(infos[i].getMember());
+		for (MemberActionInfo info : infos) {
+			if (info.isToBePushedDown()) {
+				result.add(info.getMember());
+			}
 		}
 		return result;
 	}
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 1364fb3a73..c13b7abe0c 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
@@ -76,8 +76,9 @@ public class RefactoringScannerTests extends RefactoringTest{
 		fScanner.scan(text);
 
 		ArrayList<Integer> expectedMatchesList= new ArrayList<>(expectedMatches.length);
-		for (int i= 0; i < expectedMatches.length; i++)
-			expectedMatchesList.add(Integer.valueOf(TextRangeUtil.getOffset(text, expectedMatches[i].fLine, expectedMatches[i].fColumn)));
+		for (Position expectedMatch : expectedMatches) {
+			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();) {
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTest.java
index 10bf8fb282..9cd7f1fd45 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTest.java
@@ -146,9 +146,8 @@ public abstract class RefactoringTest extends TestCase {
 		}
 
 		if (getRoot().exists()){
-			IJavaElement[] packages= getRoot().getChildren();
-			for (int i= 0; i < packages.length; i++){
-				IPackageFragment pack= (IPackageFragment)packages[i];
+			for (IJavaElement p : getRoot().getChildren()) {
+				IPackageFragment pack= (IPackageFragment) p;
 				if (!pack.equals(getPackageP()) && !pack.equals(getPackageQ()) && pack.exists() && !pack.isReadOnly())
 					if (pack.isDefaultPackage())
 						JavaProjectHelper.deletePackage(pack); // also delete packages with subpackages
@@ -173,11 +172,9 @@ public abstract class RefactoringTest extends TestCase {
 		if (javaProject.exists()) {
 			IClasspathEntry srcEntry= getRoot().getRawClasspathEntry();
 			IClasspathEntry jreEntry= RefactoringTestSetup.getJRELibrary().getRawClasspathEntry();
-			IClasspathEntry[] cpes= javaProject.getRawClasspath();
 			ArrayList<IClasspathEntry> newCPEs= new ArrayList<>();
 			boolean cpChanged= false;
-			for (int i= 0; i < cpes.length; i++) {
-				IClasspathEntry cpe= cpes[i];
+			for (IClasspathEntry cpe : javaProject.getRawClasspath()) {
 				if (cpe.equals(srcEntry) || cpe.equals(jreEntry)) {
 					newCPEs.add(cpe);
 				} else {
@@ -189,9 +186,7 @@ public abstract class RefactoringTest extends TestCase {
 				javaProject.setRawClasspath(newCPEsArray, null);
 			}
 
-			Object[] nonJavaResources= javaProject.getNonJavaResources();
-			for (int i= 0; i < nonJavaResources.length; i++) {
-				Object kid= nonJavaResources[i];
+			for (Object kid : javaProject.getNonJavaResources()) {
 				if (kid instanceof IResource) {
 					IResource resource= (IResource) kid;
 					if (! PROJECT_RESOURCE_CHILDREN.contains(resource.getName())) {
@@ -210,31 +205,29 @@ public abstract class RefactoringTest extends TestCase {
 	}
 
 	private static void tryDeletingAllNonJavaChildResources(IPackageFragment pack) throws CoreException {
-		Object[] nonJavaKids= pack.getNonJavaResources();
-		for (int i= 0; i < nonJavaKids.length; i++) {
-			if (nonJavaKids[i] instanceof IResource) {
-				IResource resource= (IResource)nonJavaKids[i];
+		for (Object nonJavaKid : pack.getNonJavaResources()) {
+			if (nonJavaKid instanceof IResource) {
+				IResource resource= (IResource) nonJavaKid;
 				JavaProjectHelper.delete(resource);
 			}
 		}
 	}
 
 	private static void tryDeletingAllNonJavaChildResources(IPackageFragmentRoot root) throws CoreException {
-		Object[] nonJavaKids= root.getNonJavaResources();
-		for (int i= 0; i < nonJavaKids.length; i++) {
-			if (nonJavaKids[i] instanceof IResource) {
-				IResource resource= (IResource)nonJavaKids[i];
+		for (Object nonJavaKid : root.getNonJavaResources()) {
+			if (nonJavaKid instanceof IResource) {
+				IResource resource= (IResource) nonJavaKid;
 				JavaProjectHelper.delete(resource);
 			}
 		}
 	}
 
 	private static void tryDeletingAllJavaChildren(IPackageFragment pack) throws CoreException {
-		IJavaElement[] kids= pack.getChildren();
-		for (int i= 0; i < kids.length; i++){
-			if (kids[i] instanceof ISourceManipulation){
-				if (kids[i].exists() && !kids[i].isReadOnly())
-					JavaProjectHelper.delete(kids[i]);
+		for (IJavaElement kid : pack.getChildren()) {
+			if (kid instanceof ISourceManipulation) {
+				if (kid.exists() && !kid.isReadOnly()) {
+					JavaProjectHelper.delete(kid);
+				}
 			}
 		}
 	}
@@ -385,11 +378,11 @@ public abstract class RefactoringTest extends TestCase {
 
 	/* ===================  helpers  ================= */
 	protected IType getType(ICompilationUnit cu, String name) throws JavaModelException {
-		IType[] types= cu.getAllTypes();
-		for (int i= 0; i < types.length; i++)
-			if (types[i].getTypeQualifiedName('.').equals(name) ||
-			    types[i].getElementName().equals(name))
-				return types[i];
+		for (IType type : cu.getAllTypes()) {
+			if (type.getTypeQualifiedName('.').equals(name) || type.getElementName().equals(name)) {
+				return type;
+			}
+		}
 		return null;
 	}
 
@@ -466,10 +459,10 @@ public abstract class RefactoringTest extends TestCase {
 	}
 
 	public static IPackageFragmentRoot getSourceFolder(IJavaProject javaProject, String name) throws JavaModelException{
-		IPackageFragmentRoot[] roots= javaProject.getPackageFragmentRoots();
-		for (int i= 0; i < roots.length; i++) {
-			if (! roots[i].isArchive() && roots[i].getElementName().equals(name))
-				return roots[i];
+		for (IPackageFragmentRoot root : javaProject.getPackageFragmentRoots()) {
+			if (!root.isArchive() && root.getElementName().equals(name)) {
+				return root;
+			}
 		}
 		return null;
 	}
@@ -523,8 +516,8 @@ public abstract class RefactoringTest extends TestCase {
 		if (names == null )
 			return new IField[0];
 		Set<IField> fields= new HashSet<>();
-		for (int i = 0; i < names.length; i++) {
-			IField field= type.getField(names[i]);
+		for (String name : names) {
+			IField field= type.getField(name);
 			assertTrue("field " + field.getElementName() + " does not exist", field.exists());
 			fields.add(field);
 		}
@@ -535,16 +528,17 @@ public abstract class RefactoringTest extends TestCase {
 		if (names == null )
 			return new IType[0];
 		Set<IType> memberTypes= new HashSet<>();
-		for (int i = 0; i < names.length; i++) {
+		for (String name : names) {
 			IType memberType;
-			if (names[i].indexOf('.') != -1) {
-				String[] path= names[i].split("\\.");
+			if (name.indexOf('.') != -1) {
+				String[] path= name.split("\\.");
 				memberType= type.getType(path[0]);
 				for (int j= 1; j < path.length; j++) {
 					memberType= memberType.getType(path[j]);
 				}
-			} else
-				memberType= type.getType(names[i]);
+			} else {
+				memberType= type.getType(name);
+			}
 			assertTrue("member type " + memberType.getElementName() + " does not exist", memberType.exists());
 			memberTypes.add(memberType);
 		}
@@ -566,10 +560,8 @@ public abstract class RefactoringTest extends TestCase {
 
 	public static IType[] findTypes(IType[] types, String[] namesOfTypesToPullUp) {
 		List<IType> found= new ArrayList<>(types.length);
-		for (int i= 0; i < types.length; i++) {
-			IType type= types[i];
-			for (int j= 0; j < namesOfTypesToPullUp.length; j++) {
-				String name= namesOfTypesToPullUp[j];
+		for (IType type : types) {
+			for (String name : namesOfTypesToPullUp) {
 				if (type.getElementName().equals(name))
 					found.add(type);
 			}
@@ -579,10 +571,8 @@ public abstract class RefactoringTest extends TestCase {
 
 	public static IField[] findFields(IField[] fields, String[] namesOfFieldsToPullUp) {
 		List<IField> found= new ArrayList<>(fields.length);
-		for (int i= 0; i < fields.length; i++) {
-			IField field= fields[i];
-			for (int j= 0; j < namesOfFieldsToPullUp.length; j++) {
-				String name= namesOfFieldsToPullUp[j];
+		for (IField field : fields) {
+			for (String name : namesOfFieldsToPullUp) {
 				if (field.getElementName().equals(name))
 					found.add(field);
 			}
@@ -592,8 +582,7 @@ public abstract class RefactoringTest extends TestCase {
 
 	public static IMethod[] findMethods(IMethod[] selectedMethods, String[] namesOfMethods, String[][] signaturesOfMethods){
 		List<IMethod> found= new ArrayList<>(selectedMethods.length);
-		for (int i= 0; i < selectedMethods.length; i++) {
-			IMethod method= selectedMethods[i];
+		for (IMethod method : selectedMethods) {
 			String[] paramTypes= method.getParameterTypes();
 			for (int j= 0; j < namesOfMethods.length; j++) {
 				String methodName= namesOfMethods[j];
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePackageTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePackageTests.java
index c5073c88fb..99a5d0af98 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePackageTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePackageTests.java
@@ -151,8 +151,8 @@ public class RenamePackageTests extends RefactoringTest {
 		IPackageFragment[] packages= new IPackageFragment[packageNames.length];
 		for (int i= 0; i < packageFiles.length; i++){
 			packages[i]= getRoot().createPackageFragment(packageNames[i], true, null);
-			for (int j= 0; j < packageFiles[i].length; j++){
-				createCUfromTestFile(packages[i], packageFiles[i][j], packageNames[i].replace('.', '/') + "/");
+			for (String packageFile : packageFiles[i]) {
+				createCUfromTestFile(packages[i], packageFile, packageNames[i].replace('.', '/') + "/");
 				//DebugUtils.dump(cu.getElementName() + "\n" + cu.getSource());
 			}
 		}
@@ -205,13 +205,12 @@ public class RenamePackageTests extends RefactoringTest {
 				createHandles= handles.toArray(new String[handles.size()]);
 				IFolder source= (IFolder)thisPackage.getResource();
 				deleteHandles= ParticipantTesting.createHandles(source);
-				IResource members[]= source.members();
 				List<IResource> movedObjects= new ArrayList<>();
-				for (int i= 0; i < members.length; i++) {
-					if (members[i] instanceof IFolder) {
+				for (IResource member : source.members()) {
+					if (member instanceof IFolder) {
 						doDelete= false;
 					} else {
-						movedObjects.add(members[i]);
+						movedObjects.add(member);
 					}
 				}
 				moveHandles= ParticipantTesting.createHandles(movedObjects.toArray());
@@ -360,14 +359,14 @@ public class RenamePackageTests extends RefactoringTest {
 				String packageName= getNewPackageName(fPackageNames[i]);
 				String packagePath= packageName.replace('.', '/') + "/";
 
-				for (int j= 0; j < fPackageFileNames[i].length; j++){
+				for (String packageFileName : fPackageFileNames[i]) {
 					String expected;
 					if (fTestWithDummyFiles) {
-						expected= getDummyContents(packageName, fPackageFileNames[i][j]);
+						expected= getDummyContents(packageName, packageFileName);
 					} else {
-						expected= getFileContents(getOutputTestFileName(fPackageFileNames[i][j], packagePath));
+						expected= getFileContents(getOutputTestFileName(packageFileName, packagePath));
 					}
-					ICompilationUnit cu= getRoot().getPackageFragment(packageName).getCompilationUnit(fPackageFileNames[i][j] + ".java");
+					ICompilationUnit cu= getRoot().getPackageFragment(packageName).getCompilationUnit(packageFileName + ".java");
 					String actual= cu.getSource();
 					assertEqualLines("invalid update in file " + cu.getElementName(), expected,	actual);
 				}
@@ -385,10 +384,9 @@ public class RenamePackageTests extends RefactoringTest {
 		}
 
 		public void checkOriginalState() throws Exception {
-			IJavaElement[] rootChildren= getRoot().getChildren();
 			ArrayList<String> existingPacks= new ArrayList<>();
-			for (int i= 0; i < rootChildren.length; i++) {
-				existingPacks.add(rootChildren[i].getElementName());
+			for (IJavaElement javaelement : getRoot().getChildren()) {
+				existingPacks.add(javaelement.getElementName());
 			}
 			assertEqualSets(Arrays.asList(fPackageNames), existingPacks);
 
@@ -397,22 +395,21 @@ public class RenamePackageTests extends RefactoringTest {
 				String packagePath= packageName.replace('.', '/') + "/";
 				IPackageFragment pack= getRoot().getPackageFragment(packageName);
 
-				IJavaElement[] packChildren= pack.getChildren();
 				ArrayList<String> existingCUs= new ArrayList<>();
-				for (int j= 0; j < packChildren.length; j++) {
-					String cuName= packChildren[j].getElementName();
+				for (IJavaElement javaelement : pack.getChildren()) {
+					String cuName= javaelement.getElementName();
 					existingCUs.add(cuName.substring(0, cuName.length() - 5));
 				}
 				assertEqualSets(Arrays.asList(fPackageFileNames[i]), existingCUs);
 
-				for (int j= 0; j < fPackageFileNames[i].length; j++){
+				for (String packageFileName : fPackageFileNames[i]) {
 					String expected;
 					if (fTestWithDummyFiles) {
-						expected= getDummyContents(packageName, fPackageFileNames[i][j]);
+						expected= getDummyContents(packageName, packageFileName);
 					} else {
-						expected= getFileContents(getInputTestFileName(fPackageFileNames[i][j], packagePath));
+						expected= getFileContents(getInputTestFileName(packageFileName, packagePath));
 					}
-					ICompilationUnit cu= pack.getCompilationUnit(fPackageFileNames[i][j] + ".java");
+					ICompilationUnit cu= pack.getCompilationUnit(packageFileName + ".java");
 					String actual= cu.getSource();
 					assertEqualLines("invalid undo in file " + cu.getElementName(), expected,	actual);
 				}
@@ -558,8 +555,7 @@ public class RenamePackageTests extends RefactoringTest {
 	}
 
 	private void checkMappingUnchanged(IJavaElementMapper jm, IResourceMapper rm, Object[] resOrJEs) {
-		for (int i= 0; i < resOrJEs.length; i++) {
-			Object resOrJE= resOrJEs[i];
+		for (Object resOrJE : resOrJEs) {
 			if (resOrJE instanceof IJavaElement) {
 				IJavaElement javaElement= (IJavaElement) resOrJE;
 				resOrJE= javaElement.getResource();
@@ -573,8 +569,7 @@ public class RenamePackageTests extends RefactoringTest {
 	}
 
 	private void checkMappingChanged(IJavaElementMapper jm, IResourceMapper rm, Object[][] resOrJeToChangeds) {
-		for (int i= 0; i < resOrJeToChangeds.length; i++) {
-			Object[] resOrJeToChanged= resOrJeToChangeds[i];
+		for (Object[] resOrJeToChanged : resOrJeToChangeds) {
 			Object resOrJE= resOrJeToChanged[0];
 			Object changed= resOrJeToChanged[1];
 			if (resOrJE instanceof IJavaElement) {
@@ -1001,9 +996,7 @@ public class RenamePackageTests extends RefactoringTest {
 
 		assertFalse(status.hasError());
 		assertTrue(status.hasWarning());
-		RefactoringStatusEntry[] statusEntries= status.getEntries();
-		for (int i= 0; i < statusEntries.length; i++) {
-			RefactoringStatusEntry entry= statusEntries[i];
+		for (RefactoringStatusEntry entry : status.getEntries()) {
 			assertTrue(entry.isWarning());
 			assertTrue(entry.getCode() == RefactoringStatusCodes.MAIN_METHOD);
 		}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeTests.java
index bd6b3bce58..6c0e92d313 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeTests.java
@@ -186,8 +186,7 @@ public class RenameTypeTests extends RefactoringTest {
 		IJavaElement[] similarElements= rtp.getSimilarElements();
 		if (similarElements == null)
 			return;
-		for (int i= 0; i < similarElements.length; i++) {
-			IJavaElement element= similarElements[i];
+		for (IJavaElement element : similarElements) {
 			if (! (element instanceof ILocalVariable)) {
 				IJavaElement newElement= mapper.getRefactoredJavaElement(element);
 				assertTrue(newElement.exists());
@@ -1647,8 +1646,8 @@ public class RenameTypeTests extends RefactoringTest {
 		IPackageFragment newPackage= (IPackageFragment)rtp.getRefactoredJavaElement(oldPackage);
 		assertEquals(oldPackage, newPackage);
 
-		for (int i= 0; i < someClassMembers.length; i++) {
-			IMember member= (IMember) someClassMembers[i];
+		for (IJavaElement someClassMember : someClassMembers) {
+			IMember member= (IMember) someClassMember;
 			IJavaElement refactoredMember= rtp.getRefactoredJavaElement(member);
 			if (member instanceof IMethod && member.getElementName().equals(type.getElementName()))
 				continue; // constructor
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RippleMethodFinderTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RippleMethodFinderTests.java
index 7dd4835ea6..5ec93096e7 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RippleMethodFinderTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RippleMethodFinderTests.java
@@ -88,9 +88,7 @@ public class RippleMethodFinderTests extends AbstractCUTestCase {
 			start++;
 		}
 
-		IMethod[] result= RippleMethodFinder2.getRelatedMethods(target, new NullProgressMonitor(), null);
-		for (int i= 0; i < result.length; i++) {
-			IMethod method= result[i];
+		for (IMethod method : RippleMethodFinder2.getRelatedMethods(target, new NullProgressMonitor(), null)) {
 			assertTrue("method not found: " + method, rippleMethods.remove(method));
 		}
 		assertEquals("found wrong ripple methods: " + rippleMethods, 0, rippleMethods.size());
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTests.java
index 0ebef7a4c9..0e51ed454c 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTests.java
@@ -107,9 +107,7 @@ public class SefTests extends AbstractSelectionTestCase {
 
 	private static IField getField(ICompilationUnit unit, String fieldName) throws Exception {
 		IField result= null;
-		IType[] types= unit.getAllTypes();
-		for (int i= 0; i < types.length; i++) {
-			IType type= types[i];
+		for (IType type : unit.getAllTypes()) {
 			result= type.getField(fieldName);
 			if (result != null && result.exists())
 				break;
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestModelProvider.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestModelProvider.java
index c2be577583..738d5592ae 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestModelProvider.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestModelProvider.java
@@ -124,8 +124,8 @@ public class TestModelProvider extends ModelProvider {
 		IResourceDelta[] affectedChildren= delta.getAffectedChildren();
 		Arrays.sort(affectedChildren, COMPARATOR);
 
-		for (int i= 0; i < affectedChildren.length; i++) {
-			appendDelta(affectedChildren[i], indent + 1, buf);
+		for (IResourceDelta resourcedelta : affectedChildren) {
+			appendDelta(resourcedelta, indent + 1, buf);
 		}
 		return buf;
 	}
@@ -196,9 +196,7 @@ public class TestModelProvider extends ModelProvider {
 
 	private static IResourceDelta[] getExpectedChildren(IResourceDelta delta) {
 		List<IResourceDelta> result= new ArrayList<>();
-		IResourceDelta[] children= delta.getAffectedChildren();
-		for (int i= 0; i < children.length; i++) {
-			IResourceDelta child= children[i];
+		for (IResourceDelta child : delta.getAffectedChildren()) {
 			IResource resource= child.getResource();
 			if (resource != null && isIgnorable(resource))
 				continue;
@@ -224,25 +222,21 @@ public class TestModelProvider extends ModelProvider {
 	private static IResourceDelta[] getActualChildren(IResourceDelta delta, IResourceDelta[] expectedChildren) {
 		List<IResourceDelta> result= new ArrayList<>();
 		if (!IS_COPY_TEST) {
-			IResourceDelta[] children= delta.getAffectedChildren();
-			for (int i= 0; i < children.length; i++) {
-				IResourceDelta child= children[i];
-				IResource resource= child.getResource();
+			for (IResourceDelta resourcedelta : delta.getAffectedChildren()) {
+				IResource resource= resourcedelta.getResource();
 				if (resource != null && isIgnorable(resource))
 					continue;
-				result.add(child);
+				result.add(resourcedelta);
 			}
 		} else {
-			IResourceDelta[] candidates= delta.getAffectedChildren();
-			for (int i= 0; i < candidates.length; i++) {
-				IResourceDelta candidate= candidates[i];
-				IResource resource= candidate.getResource();
+			for (IResourceDelta resourcedelta : delta.getAffectedChildren()) {
+				IResource resource= resourcedelta.getResource();
 				if (resource != null && isIgnorable(resource))
 					continue;
-				if (contains(expectedChildren, candidate)) {
-					result.add(candidate);
+				if (contains(expectedChildren, resourcedelta)) {
+					result.add(resourcedelta);
 				} else {
-					assertCopySource(candidate);
+					assertCopySource(resourcedelta);
 				}
 			}
 		}
@@ -251,9 +245,10 @@ public class TestModelProvider extends ModelProvider {
 
 	private static boolean contains(IResourceDelta[] expectedChildren, IResourceDelta actualDelta) {
 		IResource actualResource= actualDelta.getResource();
-		for (int i= 0; i < expectedChildren.length; i++) {
-			if (isSameResourceInCopy(expectedChildren[i].getResource(), actualResource))
+		for (IResourceDelta resourcedelta : expectedChildren) {
+			if (isSameResourceInCopy(resourcedelta.getResource(), actualResource)) {
 				return true;
+			}
 		}
 		return false;
 	}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantShared.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantShared.java
index 5ffd47c6d0..839de048a6 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantShared.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantShared.java
@@ -63,12 +63,11 @@ public class TestRenameParticipantShared extends RenameParticipant implements IS
 		if ((updating != null) && getArguments() instanceof RenameTypeArguments) {
 			RenameTypeArguments arguments= (RenameTypeArguments)getArguments();
 			if (arguments.getUpdateSimilarDeclarations()) {
-				IJavaElement[] elements= arguments.getSimilarDeclarations();
-				for (int i= 0; i < elements.length; i++) {
-					IJavaElement updated= updating.getRefactoredJavaElement(elements[i]);
+				for (IJavaElement e : arguments.getSimilarDeclarations()) {
+					IJavaElement updated= updating.getRefactoredJavaElement(e);
 					if (updated!=null) {
-						fSimilarToHandle.put(elements[i].getHandleIdentifier(), getKey(updated));
-						fSimilarToNewName.put(elements[i].getHandleIdentifier(), updated.getElementName());
+						fSimilarToHandle.put(e.getHandleIdentifier(), getKey(updated));
+						fSimilarToNewName.put(e.getHandleIdentifier(), updated.getElementName());
 					}
 				}
 			}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyTest.java
index e8248b7f61..7de95c59b9 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyTest.java
@@ -163,8 +163,8 @@ public class CopyTest extends RefactoringTest {
 		verifyValidDestination(processor, destination, location);
 		RefactoringStatus status= performRefactoring(new CopyRefactoring(processor), false);
 		assertNull("failed precondition", status);
-		for (int i= 0; i < cus.length; i++) {
-			assertEqualLines("different source in " + cus[i].getElementName(), getFileContents(getOutputTestFileName(removeExtension(cus[i].getElementName()))), cus[i].getSource());
+		for (ICompilationUnit cu : cus) {
+			assertEqualLines("different source in " + cu.getElementName(), getFileContents(getOutputTestFileName(removeExtension(cu.getElementName()))), cu.getSource());
 		}
 	}
 
@@ -2359,10 +2359,9 @@ public class CopyTest extends RefactoringTest {
 			assertTrue("source package does not exist after copying", getPackageP().exists());
 
 			IPackageFragment newPackage= null;
-			IPackageFragmentRoot[] roots= otherProject.getAllPackageFragmentRoots();
-			for (int i= 0; i < roots.length; i++) {
-				if (ReorgUtils.isSourceFolder(roots[i])){
-					newPackage= roots[i].getPackageFragment(getPackageP().getElementName());
+			for (IPackageFragmentRoot root : otherProject.getAllPackageFragmentRoots()) {
+				if (ReorgUtils.isSourceFolder(root)) {
+					newPackage= root.getPackageFragment(getPackageP().getElementName());
 					assertTrue("new package does not exist after copying", newPackage.exists());
 				}
 			}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyToClipboardActionTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyToClipboardActionTest.java
index 02bfd42af1..01cd914f45 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyToClipboardActionTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyToClipboardActionTest.java
@@ -247,12 +247,11 @@ public class CopyToClipboardActionTest extends RefactoringTest{
 	private void checkNames(IResource[] resourcesCopied, IJavaElement[] javaElementsCopied, String clipboardText){
 		List<String> stringLines= Arrays.asList(Strings.convertIntoLines(clipboardText));
 		assertEquals("different number of names", resourcesCopied.length + javaElementsCopied.length, stringLines.size());
-		for (int i= 0; i < resourcesCopied.length; i++) {
-			String name= getName(resourcesCopied[i]);
+		for (IResource resource : resourcesCopied) {
+			String name= getName(resource);
 			assertTrue("name not in set:" + name, stringLines.contains(name));
 		}
-		for (int i= 0; i < javaElementsCopied.length; i++) {
-			IJavaElement element= javaElementsCopied[i];
+		for (IJavaElement element : javaElementsCopied) {
 			if (! ReorgUtils.isInsideCompilationUnit(element)){
 				String name= getName(element);
 				assertTrue("name not in set:" + name, stringLines.contains(name));
@@ -272,8 +271,7 @@ public class CopyToClipboardActionTest extends RefactoringTest{
 
 	private static int countResources(IJavaElement[] javaElementsCopied) {
 		int count= 0;
-		for (int i= 0; i < javaElementsCopied.length; i++) {
-			IJavaElement element= javaElementsCopied[i];
+		for (IJavaElement element : javaElementsCopied) {
 			switch (element.getElementType()) {
 				case IJavaElement.JAVA_PROJECT :
 				case IJavaElement.PACKAGE_FRAGMENT_ROOT :
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 a91042dfec..c6bf227bfd 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
@@ -123,10 +123,8 @@ public class DeleteTest extends RefactoringTest {
 	}
 
 	private IPackageFragmentRoot getArchiveRoot() throws JavaModelException, Exception {
-		IPackageFragmentRoot[] roots= RefactoringTestSetup.getProject().getPackageFragmentRoots();
 		IPackageFragmentRoot archive= null;
-		for (int i= 0; i < roots.length; i++) {
-			IPackageFragmentRoot root= roots[i];
+		for (IPackageFragmentRoot root : RefactoringTestSetup.getProject().getPackageFragmentRoots()) {
 			if (root.isArchive() && root.isExternal())
 				archive= root;
 		}
@@ -232,8 +230,8 @@ public class DeleteTest extends RefactoringTest {
 
 	private void assertExist(Object[] resourceOrElements, boolean exists) {
 		if (resourceOrElements != null) {
-			for (int i= 0; i < resourceOrElements.length; i++) {
-				assertExists(resourceOrElements[i], exists);
+			for (Object resourceOrElement : resourceOrElements) {
+				assertExists(resourceOrElement, exists);
 			}
 		}
 	}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java
index 1f96a2f686..c77c94f109 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java
@@ -1856,8 +1856,8 @@ public class MoveTest extends RefactoringTest {
 		} else {
 			assertTrue(destination.exists());
 		}
-		for (int i= 0; i < resources.length; i++) {
-			assertTrue(resources[i].exists());
+		for (IResource resource : resources) {
+			assertTrue(resource.exists());
 		}
 
 		IMovePolicy policy= ReorgPolicyFactory.createMovePolicy(resources, javaElements);
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 473abd6f89..f04554fea8 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
@@ -34,8 +34,8 @@ public final class DebugUtils {
 
 	public static void dumpCharCharArray(String msg, char[][] o){
 		dump("DUMPING char[][]:" + msg); //$NON-NLS-1$
-		for (int i= 0; i < o.length; i++){
-			dump(new String(o[i]));
+		for (char[] o1 : o) {
+			dump(new String(o1));
 		}
 	}
 
@@ -45,8 +45,9 @@ public final class DebugUtils {
 			System.out.println("null"); //$NON-NLS-1$
 			return;
 		}
-		for (int i= 0; i < refs.length; i++)
-			System.out.println(refs[i].toString());
+		for (Object ref : refs) {
+			System.out.println(ref.toString());
+		}
 	}
 
 	public static void dumpCollectionCollection(Collection<?> c) {
@@ -130,8 +131,8 @@ public final class DebugUtils {
 		if (imports == null)
 			return;
 		DebugUtils.dump("Compilation Unit: " + cu.getElementName());	 //$NON-NLS-1$
-		for (int k= 0; k < imports.length; k ++){
-			DebugUtils.dump("import " + imports[k].getElementName() + " on demand: " + imports[k].isOnDemand()); //$NON-NLS-2$ //$NON-NLS-1$
+		for (IImportDeclaration i : imports) {
+			DebugUtils.dump("import " + i.getElementName() + " on demand: " + i.isOnDemand()); //$NON-NLS-2$ //$NON-NLS-1$
 		}
 	}
 
@@ -140,8 +141,8 @@ public final class DebugUtils {
 		if (cus == null)
 			return;
 		//DebugUtils.dump("Package " + pack.getElementName());
-		for (int j= 0; j < cus.length; j++){
-			dumpImports(cus[j]);
+		for (ICompilationUnit cu : cus) {
+			dumpImports(cu);
 		}
 	}
 
@@ -150,8 +151,8 @@ public final class DebugUtils {
 		if (packages == null)
 			return;
 		//DebugUtils.dump("Project " + project.getElementName());
-		for (int i= 0; i < packages.length; i++){
-			dumpImports(packages[i]);
+		for (IPackageFragment p : packages) {
+			dumpImports(p);
 		}
 	}
 }
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestRepositoryProvider.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestRepositoryProvider.java
index da3a24c53d..cbd67bc4e5 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestRepositoryProvider.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestRepositoryProvider.java
@@ -75,8 +75,8 @@ public class RefactoringTestRepositoryProvider extends RepositoryProvider {
 
 		@Override
 		public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) {
-			for (int i= 0; i < files.length; i++) {
-				fValidatedEditPaths.add(files[i].getFullPath());
+			for (IFile file : files) {
+				fValidatedEditPaths.add(file.getFullPath());
 			}
 			return makeWritable(files);
 		}
@@ -93,8 +93,7 @@ public class RefactoringTestRepositoryProvider extends RepositoryProvider {
 					new IWorkspaceRunnable() {
 						@Override
 						public void run(IProgressMonitor monitor) throws CoreException	{
-							for (int i= 0; i < resources.length; i++) {
-								IFile resource= resources[i];
+							for (IFile resource : resources) {
 								ResourceAttributes resourceAttributes = resource.getResourceAttributes();
 								if (resourceAttributes != null) {
 									resourceAttributes.setReadOnly(false);
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/ZipTools.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/ZipTools.java
index 125148d3ff..dbbde2e6f1 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/ZipTools.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/ZipTools.java
@@ -79,12 +79,9 @@ public class ZipTools {
 				}
 			}
 
-			IJavaElement[] packageFragments= src.getChildren();
-			for (int i= 0; i < packageFragments.length; i++) {
-				IPackageFragment packageFragment= (IPackageFragment) packageFragments[i];
-				ICompilationUnit[] cus= packageFragment.getCompilationUnits();
-				for (int j= 0; j < cus.length; j++) {
-					ICompilationUnit cu= cus[j];
+			for (IJavaElement javaelement : src.getChildren()) {
+				IPackageFragment packageFragment= (IPackageFragment) javaelement;
+				for (ICompilationUnit cu : packageFragment.getCompilationUnits()) {
 					String cuDescr= packageFragment.getElementName() + "/" + cu.getElementName();
 					Assert.assertTrue(cuDescr, zipCus.remove(cuDescr));
 				}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NLSSubstitutionTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NLSSubstitutionTest.java
index 718d0d7063..235772a317 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NLSSubstitutionTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NLSSubstitutionTest.java
@@ -87,8 +87,9 @@ public class NLSSubstitutionTest extends TestCase {
 	}
 
 	private void setPrefix(String prefix, NLSSubstitution[] subs) {
-		for (int i= 0; i < subs.length; i++)
-			subs[i].setPrefix(prefix);
+		for (NLSSubstitution sub : subs) {
+			sub.setPrefix(prefix);
+		}
 	}
 
 }
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NlsRefactoringCheckFinalConditionsTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NlsRefactoringCheckFinalConditionsTest.java
index a7422b0ddd..3f333c88cd 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NlsRefactoringCheckFinalConditionsTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NlsRefactoringCheckFinalConditionsTest.java
@@ -167,9 +167,9 @@ public class NlsRefactoringCheckFinalConditionsTest extends TestCase {
 		NLSRefactoring refac= NLSRefactoring.create(cu);
 		NLSSubstitution[] subs= refac.getSubstitutions();
 		refac.setPrefix("");
-		for (int i= 0; i < subs.length; i++) {
-			subs[i].setState(NLSSubstitution.EXTERNALIZED);
-			subs[i].generateKey(subs, new Properties());
+		for (NLSSubstitution sub : subs) {
+			sub.setState(NLSSubstitution.EXTERNALIZED);
+			sub.generateKey(subs, new Properties());
 		}
 		fillInValues(refac);
 		return refac;
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/PropertyFileDocumentModellTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/PropertyFileDocumentModellTest.java
index cb457006c8..a9d75337b4 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/PropertyFileDocumentModellTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/PropertyFileDocumentModellTest.java
@@ -49,8 +49,7 @@ public class PropertyFileDocumentModellTest extends TestCase {
 	private static void insert(IDocument document, KeyValuePair[] pairs) throws CoreException {
 		PropertyFileDocumentModel model= new PropertyFileDocumentModel(document);
 
-		for (int i= 0; i < pairs.length; i++) {
-			KeyValuePair pair= pairs[i];
+		for (KeyValuePair pair : pairs) {
 			pair.setValue(PropertyFileDocumentModel.escape(pair.getValue(), true) + model.getLineDelimiter());
 			pair.setKey(PropertyFileDocumentModel.escape(pair.getKey(), false));
 		}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfaceHeapAcceptanceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfaceHeapAcceptanceTests.java
index 3c608f26f4..2de5c0d63b 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfaceHeapAcceptanceTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfaceHeapAcceptanceTests.java
@@ -66,10 +66,8 @@ public class ExtractInterfaceHeapAcceptanceTests extends RefactoringHeapTestCase
 		ExtractInterfaceProcessor processor= new ExtractInterfaceProcessor(control, JavaPreferencesSettings.getCodeGenerationSettings(fProject.getProject()));
 		fRefactoring= new ProcessorBasedRefactoring(processor);
 
-		IMethod[] methods= control.getMethods();
 		List<IMethod> extractedMembers= new ArrayList<>();
-		for (int i= 0; i < methods.length; i++) {
-			IMethod method= methods[i];
+		for (IMethod method : control.getMethods()) {
 			int flags= method.getFlags();
 			if (Flags.isPublic(flags) && !Flags.isStatic(flags) && !method.isConstructor()) {
 				extractedMembers.add(method);
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java
index e6bcfd5419..db96865668 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java
@@ -67,10 +67,8 @@ public class ExtractInterfacePerfAcceptanceTests extends RefactoringPerformanceT
 		ExtractInterfaceProcessor processor= new ExtractInterfaceProcessor(control, JavaPreferencesSettings.getCodeGenerationSettings(fProject.getProject()));
 		fRefactoring= new ProcessorBasedRefactoring(processor);
 
-		IMethod[] methods= control.getMethods();
 		List<IMethod> extractedMembers= new ArrayList<>();
-		for (int i= 0; i < methods.length; i++) {
-			IMethod method= methods[i];
+		for (IMethod method : control.getMethods()) {
 			int flags= method.getFlags();
 			if (Flags.isPublic(flags) && !Flags.isStatic(flags) && !method.isConstructor()) {
 				extractedMembers.add(method);
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/typeconstraints/TypeConstraintTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/typeconstraints/TypeConstraintTests.java
index 8f00b470c8..d92c774758 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/typeconstraints/TypeConstraintTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/typeconstraints/TypeConstraintTests.java
@@ -122,8 +122,8 @@ public class TypeConstraintTests extends RefactoringTest {
 
 		List<String> externals= allToStrings(constraints);
 		assertEquals("length", constraintStrings.length, constraints.length);
-		for (int i= 0; i < constraintStrings.length; i++) {
-			assertTrue("missing constraint:" + constraintStrings[i], externals.remove(constraintStrings[i]));
+		for (String constraintString : constraintStrings) {
+			assertTrue("missing constraint:" + constraintString, externals.remove(constraintString));
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/typeconstraints/TypeEnvironmentTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/typeconstraints/TypeEnvironmentTests.java
index b7916c912c..d68dfcb250 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/typeconstraints/TypeEnvironmentTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/typeconstraints/TypeEnvironmentTests.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.ui.tests.refactoring.typeconstraints;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.jdt.core.ICompilationUnit;
@@ -35,6 +34,7 @@ import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 
 import org.eclipse.jdt.internal.corext.dom.HierarchicalASTVisitor;
+import org.eclipse.jdt.internal.corext.dom.IASTSharedValues;
 import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.types.TType;
 import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.types.TypeEnvironment;
 
@@ -42,8 +42,6 @@ import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
 import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractCUTestCase;
 import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringTestPlugin;
 
-import org.eclipse.jdt.internal.corext.dom.IASTSharedValues;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -117,13 +115,11 @@ public class TypeEnvironmentTests extends AbstractCUTestCase {
 		}
 		@Override
 		public void endVisit(CompilationUnit node) {
-			for (Iterator<ITypeBinding> iter= fResult.iterator(); iter.hasNext();) {
-				ITypeBinding binding= iter.next();
+			for (ITypeBinding binding : fResult) {
 				if (binding.isParameterizedType()) {
-					ITypeBinding[] args= binding.getTypeArguments();
-					for (int i= 0; i < args.length; i++) {
-						if (args[i].isWildcardType()) {
-							fWildcards.add(args[i]);
+					for (ITypeBinding arg : binding.getTypeArguments()) {
+						if (arg.isWildcardType()) {
+							fWildcards.add(arg);
 						}
 					}
 				}
@@ -150,9 +146,7 @@ public class TypeEnvironmentTests extends AbstractCUTestCase {
 		private void collectTypeArgumentBindings(ITypeBinding typeBinding, List<ITypeBinding> result) {
 			if (! typeBinding.isParameterizedType())
 				return;
-			ITypeBinding[] typeArguments= typeBinding.getTypeArguments();
-			for (int i= 0; i < typeArguments.length; i++) {
-				ITypeBinding typeArgument= typeArguments[i];
+			for (ITypeBinding typeArgument : typeBinding.getTypeArguments()) {
 				if (BUG_83616_core_wildcard_assignments && typeArgument.isParameterizedType() && typeArgument.getTypeArguments()[0].isWildcardType())
 					continue;
 				result.add(typeArgument);
diff --git a/org.eclipse.ltk.core.refactoring.tests/META-INF/MANIFEST.MF b/org.eclipse.ltk.core.refactoring.tests/META-INF/MANIFEST.MF
index e29b826be2..1840c33f61 100644
--- a/org.eclipse.ltk.core.refactoring.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ltk.core.refactoring.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.ltk.core.refactoring.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ltk.core.refactoring.tests; singleton:=true
-Bundle-Version: 3.8.600.qualifier
+Bundle-Version: 3.8.700.qualifier
 Bundle-Activator: org.eclipse.ltk.core.refactoring.tests.RefactoringCoreTestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.ltk.core.refactoring.tests/pom.xml b/org.eclipse.ltk.core.refactoring.tests/pom.xml
index c0fe30c282..c92d0ac44c 100644
--- a/org.eclipse.ltk.core.refactoring.tests/pom.xml
+++ b/org.eclipse.ltk.core.refactoring.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.ltk</groupId>
   <artifactId>org.eclipse.ltk.core.refactoring.tests</artifactId>
-  <version>3.8.600-SNAPSHOT</version>
+  <version>3.8.700-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
   	<testSuite>${project.artifactId}</testSuite>
diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistorySerializationTests.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistorySerializationTests.java
index 44e91b45ee..98183efddc 100644
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistorySerializationTests.java
+++ b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistorySerializationTests.java
@@ -42,8 +42,8 @@ public class RefactoringHistorySerializationTests extends TestCase {
 
 	private static void compareReadHistory(RefactoringDescriptor[] descriptors, int flags, String xml, boolean ioException) throws CoreException {
 		List<RefactoringDescriptorProxyAdapter> list= new ArrayList<>();
-		for (int index= 0; index < descriptors.length; index++) {
-			list.add(new RefactoringDescriptorProxyAdapter(descriptors[index]));
+		for (RefactoringDescriptor descriptor : descriptors) {
+			list.add(new RefactoringDescriptorProxyAdapter(descriptor));
 		}
 		try {
 			ByteArrayInputStream stream= null;
diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistoryServiceTests.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistoryServiceTests.java
index c67752ca30..f8733d3a0c 100644
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistoryServiceTests.java
+++ b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistoryServiceTests.java
@@ -244,8 +244,9 @@ public class RefactoringHistoryServiceTests extends TestCase {
 		RefactoringHistory workspaceHistory= service.getWorkspaceHistory(null);
 		final RefactoringDescriptorProxy[] descriptors= workspaceHistory.getDescriptors();
 		assertEquals("Refactoring history has wrong size:", COMMON_NUMBER, descriptors.length);
-		for (int index= 0; index < descriptors.length; index++)
-			assertTrue("Workspace refactoring should have no project attribute set:\n\n" + descriptors[index].toString(), descriptors[index].getProject() == null);
+		for (RefactoringDescriptorProxy descriptor : descriptors) {
+			assertTrue("Workspace refactoring should have no project attribute set:\n\n" + descriptor.toString(), descriptor.getProject() == null);
+		}
 	}
 
 	public void testDeleteProjectHistory1() throws Exception {
@@ -253,11 +254,11 @@ public class RefactoringHistoryServiceTests extends TestCase {
 		final IProject project= fProject.getProject();
 		final RefactoringHistoryService service= RefactoringHistoryService.getInstance();
 		RefactoringHistory workspaceHistory= service.getWorkspaceHistory(null);
-		RefactoringDescriptorProxy[] descriptors= workspaceHistory.getDescriptors();
 		Set<RefactoringDescriptorProxy> set= new HashSet<>();
-		for (int index= 0; index < descriptors.length; index++) {
-			if (descriptors[index].getProject() == null)
-				set.add(descriptors[index]);
+		for (RefactoringDescriptorProxy descriptor : workspaceHistory.getDescriptors()) {
+			if (descriptor.getProject() == null) {
+				set.add(descriptor);
+			}
 		}
 		service.deleteRefactoringDescriptors(set.toArray(new RefactoringDescriptorProxy[set.size()]), null);
 		workspaceHistory= service.getWorkspaceHistory(null);
diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/resource/ResourceRefactoringUndoTests.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/resource/ResourceRefactoringUndoTests.java
index 1eb43aa0e2..2fe4f15130 100644
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/resource/ResourceRefactoringUndoTests.java
+++ b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/resource/ResourceRefactoringUndoTests.java
@@ -132,8 +132,8 @@ public class ResourceRefactoringUndoTests extends TestCase {
 		fProject.delete();
 		final IFileStore[] toDelete= storesToDelete.toArray(new IFileStore[storesToDelete.size()]);
 		storesToDelete.clear();
-		for (int i= 0; i < toDelete.length; i++) {
-			clear(toDelete[i]);
+		for (IFileStore d : toDelete) {
+			clear(d);
 		}
 	}
 
@@ -518,8 +518,8 @@ public class ResourceRefactoringUndoTests extends TestCase {
 			if (!contentMatch) {
 				return false;
 			}
-			for (int i= 0; i < markerSnapshots.length; i++) {
-				if (!markerSnapshots[i].existsOn(resource)) {
+			for (MarkerSnapshot markerSnapshot : markerSnapshots) {
+				if (!markerSnapshot.existsOn(resource)) {
 					return false;
 				}
 			}
@@ -556,9 +556,9 @@ public class ResourceRefactoringUndoTests extends TestCase {
 					return false;
 				}
 			}
-			for (int i= 0; i < memberSnapshots.length; i++) {
-				if (!fileNameExcludes.contains(memberSnapshots[i].name)) {
-					if (!memberSnapshots[i].isValid(folder)) {
+			for (ResourceSnapshot memberSnapshot : memberSnapshots) {
+				if (!fileNameExcludes.contains(memberSnapshot.name)) {
+					if (!memberSnapshot.isValid(folder)) {
 						return false;
 					}
 				}
@@ -580,9 +580,8 @@ public class ResourceRefactoringUndoTests extends TestCase {
 		boolean existsOn(IResource resource) throws CoreException {
 			// comparison is based on equality of attributes, since id will
 			// change on create/delete/recreate sequence
-			IMarker[] markers= resource.findMarkers(type, false, IResource.DEPTH_ZERO);
-			for (int i= 0; i < markers.length; i++) {
-				if (markers[i].getAttributes().equals(attributes)) {
+			for (IMarker marker : resource.findMarkers(type, false, IResource.DEPTH_ZERO)) {
+				if (marker.getAttributes().equals(attributes)) {
 					return true;
 				}
 			}
@@ -623,9 +622,9 @@ public class ResourceRefactoringUndoTests extends TestCase {
 				project.open(null);
 			}
 
-			for (int i= 0; i < memberSnapshots.length; i++) {
-				if (!fileNameExcludes.contains(memberSnapshots[i].name)) {
-					if (!memberSnapshots[i].isValid(resource)) {
+			for (ResourceSnapshot memberSnapshot : memberSnapshots) {
+				if (!fileNameExcludes.contains(memberSnapshot.name)) {
+					if (!memberSnapshot.isValid(resource)) {
 						return false;
 					}
 				}
diff --git a/org.eclipse.ltk.ui.refactoring.tests/META-INF/MANIFEST.MF b/org.eclipse.ltk.ui.refactoring.tests/META-INF/MANIFEST.MF
index b5592db4b3..da29b1ff4f 100644
--- a/org.eclipse.ltk.ui.refactoring.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ltk.ui.refactoring.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.ltk.ui.refactoring.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ltk.ui.refactoring.tests;singleton:=true
-Bundle-Version: 3.9.400.qualifier
+Bundle-Version: 3.9.500.qualifier
 Bundle-Activator: org.eclipse.ltk.ui.refactoring.tests.RefactoringUITestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.ltk.ui.refactoring.tests/pom.xml b/org.eclipse.ltk.ui.refactoring.tests/pom.xml
index 57fbcee3b0..7d6f2666ce 100644
--- a/org.eclipse.ltk.ui.refactoring.tests/pom.xml
+++ b/org.eclipse.ltk.ui.refactoring.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.ltk</groupId>
   <artifactId>org.eclipse.ltk.ui.refactoring.tests</artifactId>
-  <version>3.9.400-SNAPSHOT</version>
+  <version>3.9.500-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <testSuite>${project.artifactId}</testSuite>
diff --git a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/examples/DeleteResourcesRefactoringAction.java b/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/examples/DeleteResourcesRefactoringAction.java
index 50d7753b19..922de31cc7 100644
--- a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/examples/DeleteResourcesRefactoringAction.java
+++ b/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/examples/DeleteResourcesRefactoringAction.java
@@ -78,10 +78,11 @@ public class DeleteResourcesRefactoringAction extends Action implements IActionD
 		}
 	}
 
-	private static boolean isDeleteAvailable(IResource[] resource) {
-		for (int i= 0; i < resource.length; i++) {
-			if (!resource[i].exists())
+	private static boolean isDeleteAvailable(IResource[] resources) {
+		for (IResource resource : resources) {
+			if (!resource.exists()) {
 				return false;
+			}
 		}
 		return true;
 	}
@@ -97,9 +98,7 @@ public class DeleteResourcesRefactoringAction extends Action implements IActionD
 
 	private static IResource[] evaluateResources(IStructuredSelection sel) {
 		ArrayList<IResource> res= new ArrayList<>();
-		Object[] objects= sel.toArray();
-		for (int i= 0; i < objects.length; i++) {
-			Object curr= objects[i];
+		for (Object curr : sel.toArray()) {
 			if (curr instanceof IFile || curr instanceof IFolder) {
 				if (!addFileOrFolder(res, (IResource) curr)) {
 					return null;
diff --git a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/examples/MoveResourcesRefactoringAction.java b/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/examples/MoveResourcesRefactoringAction.java
index a831abeec6..65d5437dd9 100644
--- a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/examples/MoveResourcesRefactoringAction.java
+++ b/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/examples/MoveResourcesRefactoringAction.java
@@ -75,10 +75,11 @@ public class MoveResourcesRefactoringAction extends Action implements IActionDel
 		}
 	}
 
-	private static boolean isMoveAvailable(IResource[] resource) {
-		for (int i= 0; i < resource.length; i++) {
-			if (!resource[i].exists())
+	private static boolean isMoveAvailable(IResource[] resources) {
+		for (IResource resource : resources) {
+			if (!resource.exists()) {
 				return false;
+			}
 		}
 		return true;
 	}
@@ -93,11 +94,9 @@ public class MoveResourcesRefactoringAction extends Action implements IActionDel
 	}
 
 	private static IResource[] evaluateResources(IStructuredSelection sel) {
-		Object[] objects= sel.toArray();
 		ArrayList<IResource> res= new ArrayList<>();
 		IContainer parent= null;
-		for (int i= 0; i < objects.length; i++) {
-			Object curr= objects[i];
+		for (Object curr : sel.toArray()) {
 			if (curr instanceof IFile || curr instanceof IFolder) {
 				IResource resource= (IResource) curr;
 				if (parent == null) {