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

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

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

85 files changed, 482 insertions, 688 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/HierarchyInformationControl.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/HierarchyInformationControl.java
index ae4e4b0e01..fe3e21beaf 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/HierarchyInformationControl.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/HierarchyInformationControl.java
@@ -95,8 +95,8 @@ public class HierarchyInformationControl extends AbstractInformationControl {
 					if (sequences == null)
 						return;
 
-					for (int i= 0; i < sequences.length; i++) {
-						if (sequences[i].equals(keySequence)) {
+					for (TriggerSequence sequence : sequences) {
+						if (sequence.equals(keySequence)) {
 							e.doit= false;
 							toggleHierarchy();
 							return;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/HierarchyLabelProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/HierarchyLabelProvider.java
index e8230517b1..9aa9f19fad 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/HierarchyLabelProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/HierarchyLabelProvider.java
@@ -81,16 +81,16 @@ public class HierarchyLabelProvider extends AppearanceAwareLabelProvider {
 		IJavaElement[] input= fHierarchy.getInputElements();
 		if (input == null)
 			return false;
-		for (int i= 0; i < input.length; i++) {
-			if (input[i] == null || input[i].getElementType() == IJavaElement.TYPE) {
+		for (IJavaElement element : input) {
+			if (element == null || element.getElementType() == IJavaElement.TYPE) {
 				return false;
 			}
-			IJavaElement parent= type.getAncestor(input[i].getElementType());
-			if (input[i].getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
-				if (parent == null || parent.getElementName().equals(input[i].getElementName())) {
+			IJavaElement parent= type.getAncestor(element.getElementType());
+			if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
+				if (parent == null || parent.getElementName().equals(element.getElementName())) {
 					return false;
 				}
-			} else if (input[i].equals(parent)) {
+			} else if (element.equals(parent)) {
 				return false;
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsViewer.java
index 66fd7c56c9..628c53ffe7 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsViewer.java
@@ -298,10 +298,9 @@ public class MethodsViewer extends ProblemTableViewer {
 		String[] paramTypes= meth.getParameterTypes();
 		boolean isConstructor= meth.isConstructor();
 
-		for (int i= 0; i < elements.length; i++) {
-			Object curr= elements[i];
-			if (curr instanceof IMethod && JavaModelUtil.isSameMethodSignature(name, paramTypes, isConstructor, (IMethod) curr)) {
-				return (IMethod) curr;
+		for (Object element : elements) {
+			if (element instanceof IMethod && JavaModelUtil.isSameMethodSignature(name, paramTypes, isConstructor, (IMethod) element)) {
+				return (IMethod) element;
 			}
 		}
 		return null;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/SubTypeHierarchyViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/SubTypeHierarchyViewer.java
index 61089d06ef..0ffa280d0a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/SubTypeHierarchyViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/SubTypeHierarchyViewer.java
@@ -64,10 +64,9 @@ public class SubTypeHierarchyViewer extends TypeHierarchyViewer {
 			if (hierarchy != null) {
 				IType[] types= hierarchy.getSubtypes(type);
 				if (isObject(type)) {
-					for (int i= 0; i < types.length; i++) {
-						IType curr= types[i];
-						if (!isAnonymousFromInterface(curr)) {
-							res.add(curr);
+					for (IType t : types) {
+						if (!isAnonymousFromInterface(t)) {
+							res.add(t);
 						}
 					}
 				} else {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TraditionalHierarchyViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TraditionalHierarchyViewer.java
index f82cec388e..72494f697f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TraditionalHierarchyViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TraditionalHierarchyViewer.java
@@ -104,9 +104,9 @@ public class TraditionalHierarchyViewer extends TypeHierarchyViewer {
 						res.add(hierarchy.getSuperInterfaces(input)[0]);
 					} else {
 						IType[] roots= hierarchy.getRootClasses();
-						for (int i= 0; i < roots.length; i++) {
-							if (isObject(roots[i])) {
-								res.add(roots[i]);
+						for (IType t : roots) {
+							if (isObject(t)) {
+								res.add(t);
 								return;
 							}
 						}
@@ -125,10 +125,9 @@ public class TraditionalHierarchyViewer extends TypeHierarchyViewer {
 			if (hierarchy != null) {
 				IType[] types= hierarchy.getSubtypes(type);
 				if (isObject(type)) {
-					for (int i= 0; i < types.length; i++) {
-						IType curr= types[i];
-						if (!isAnonymousFromInterface(curr)) { // no anonymous classes on 'Object' -> will be children of interface
-							res.add(curr);
+					for (IType t : types) {
+						if (!isAnonymousFromInterface(t)) { // no anonymous classes on 'Object' -> will be children of interface
+							res.add(t);
 						}
 					}
 				} else {
@@ -137,11 +136,10 @@ public class TraditionalHierarchyViewer extends TypeHierarchyViewer {
 					if (isClass || isHierarchyOnType) {
 						res.addAll(Arrays.asList(types));
 					} else {
-						for (int i= 0; i < types.length; i++) {
-							IType curr= types[i];
+						for (IType t : types) {
 							// no classes implementing interfaces, only if anonymous
-							if (Flags.isInterface(hierarchy.getCachedFlags(curr)) || isAnonymous(curr)) {
-								res.add(curr);
+							if (Flags.isInterface(hierarchy.getCachedFlags(t)) || isAnonymous(t)) {
+								res.add(t);
 							}
 						}
 					}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyContentProvider.java
index 039f32dfc8..560a079116 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyContentProvider.java
@@ -102,14 +102,12 @@ public abstract class TypeHierarchyContentProvider implements ITreeContentProvid
 			return;
 		synchronized (fTypeHierarchyLifeCycleListener) {
 			boolean filterMethodOverrides= initializeMethodOverrideTester(filterMethod, typeToFindIn);
-			IMethod[] methods= typeToFindIn.getMethods();
-			for (int i= 0; i < methods.length; i++) {
-				IMethod curr= methods[i];
-				flags= curr.getFlags();
-				if (Flags.isPrivate(flags) || Flags.isStatic(flags) || curr.isConstructor())
+			for (IMethod m : typeToFindIn.getMethods()) {
+				flags= m.getFlags();
+				if (Flags.isPrivate(flags) || Flags.isStatic(flags) || m.isConstructor())
 					continue;
-				if (isCompatibleMethod(filterMethod, curr, filterMethodOverrides) && !children.contains(curr)) {
-					children.add(curr);
+				if (isCompatibleMethod(filterMethod, m, filterMethodOverrides) && !children.contains(m)) {
+					children.add(m);
 				}
 			}
 		}
@@ -121,13 +119,11 @@ public abstract class TypeHierarchyContentProvider implements ITreeContentProvid
 			return false;
 		synchronized (fTypeHierarchyLifeCycleListener) {
 			boolean filterMethodOverrides= initializeMethodOverrideTester(filterMethod, typeToFindIn);
-			IMethod[] methods= typeToFindIn.getMethods();
-			for (int i= 0; i < methods.length; i++) {
-				IMethod curr= methods[i];
-				flags= curr.getFlags();
-				if (Flags.isPrivate(flags) || Flags.isStatic(flags) || curr.isConstructor())
+			for (IMethod m : typeToFindIn.getMethods()) {
+				flags= m.getFlags();
+				if (Flags.isPrivate(flags) || Flags.isStatic(flags) || m.isConstructor())
 					continue;
-				if (isCompatibleMethod(filterMethod, curr, filterMethodOverrides)) {
+				if (isCompatibleMethod(filterMethod, m, filterMethodOverrides)) {
 					return true;
 				}
 			}
@@ -226,18 +222,17 @@ public abstract class TypeHierarchyContentProvider implements ITreeContentProvid
 		IJavaElement[] input= fTypeHierarchy.getInputElements();
 		if (input == null)
 			return false;
-		for (int i= 0; i < input.length; i++) {
-			int inputType= input[i].getElementType();
+		for (IJavaElement e : input) {
+			int inputType= e.getElementType();
 			if (inputType == IJavaElement.TYPE) {
 				return true;
 			}
-
 			IJavaElement parent= type.getAncestor(inputType);
 			if (inputType == IJavaElement.PACKAGE_FRAGMENT) {
-				if (parent == null || parent.getElementName().equals(input[i].getElementName())) {
+				if (parent == null || parent.getElementName().equals(e.getElementName())) {
 					return true;
 				}
-			} else if (input[i].equals(parent)) {
+			} else if (e.equals(parent)) {
 				return true;
 			}
 		}
@@ -286,8 +281,7 @@ public abstract class TypeHierarchyContentProvider implements ITreeContentProvid
 	}
 
 	private void addFilteredMemberChildren(IType parent, List<IMember> children) throws JavaModelException {
-		for (int i= 0; i < fMemberFilter.length; i++) {
-			IMember member= fMemberFilter[i];
+		for (IMember member : fMemberFilter) {
 			if (parent.equals(member.getDeclaringType())) {
 				if (!children.contains(member)) {
 					children.add(member);
@@ -322,8 +316,7 @@ public abstract class TypeHierarchyContentProvider implements ITreeContentProvid
 	}
 
 	private boolean hasMemberFilterChildren(IType type) throws JavaModelException {
-		for (int i= 0; i < fMemberFilter.length; i++) {
-			IMember member= fMemberFilter[i];
+		for (IMember member : fMemberFilter) {
 			if (type.equals(member.getDeclaringType())) {
 				return true;
 			} else if (member instanceof IMethod) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java
index 55eacfeda9..d2f0317ca5 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java
@@ -189,8 +189,8 @@ public class TypeHierarchyLifeCycle implements ITypeHierarchyChangedListener, IE
 			freeHierarchy();
 			return;
 		}
-		for (int i= 0; i < elements.length; i++) {
-			if (elements[i] == null || !elements[i].exists()) {
+		for (IJavaElement element : elements) {
+			if (element == null || !element.exists()) {
 				freeHierarchy();
 				return;
 			}
@@ -305,17 +305,16 @@ public class TypeHierarchyLifeCycle implements ITypeHierarchyChangedListener, IE
 			}
 		} else {
 			IRegion region= JavaCore.newRegion();
-			for (int i= 0; i < elements.length; i++) {
-				if (elements[i].getElementType() == IJavaElement.JAVA_PROJECT) {
+			for (IJavaElement element : elements) {
+				if (element.getElementType() == IJavaElement.JAVA_PROJECT) {
 					// for projects only add the contained source folders
-					IPackageFragmentRoot[] roots= ((IJavaProject)elements[i]).getPackageFragmentRoots();
-					for (int j= 0; j < roots.length; j++) {
-						if (!roots[j].isExternal()) {
-							region.add(roots[j]);
+					for (IPackageFragmentRoot root : ((IJavaProject) element).getPackageFragmentRoots()) {
+						if (!root.isExternal()) {
+							region.add(root);
 						}
 					}
 				} else {
-					region.add(elements[i]);
+					region.add(element);
 				}
 			}
 			return JavaCore.newTypeHierarchy(region, null, pm);
@@ -401,9 +400,8 @@ public class TypeHierarchyLifeCycle implements ITypeHierarchyChangedListener, IE
 				if (delta.getKind() == IJavaElementDelta.CHANGED && isPossibleStructuralChange(delta.getFlags())) {
 					try {
 						if (cu.exists()) {
-							IType[] types= cu.getAllTypes();
-							for (int i= 0; i < types.length; i++) {
-								processTypeDelta(types[i], changedTypes);
+							for (IType type : cu.getAllTypes()) {
+								processTypeDelta(type, changedTypes);
 							}
 						}
 					} catch (JavaModelException e) {
@@ -436,9 +434,8 @@ public class TypeHierarchyLifeCycle implements ITypeHierarchyChangedListener, IE
 	}
 
 	private void processChildrenDelta(IJavaElementDelta delta, ArrayList<IType> changedTypes) {
-		IJavaElementDelta[] children= delta.getAffectedChildren();
-		for (int i= 0; i < children.length; i++) {
-			processDelta(children[i], changedTypes); // recursive
+		for (IJavaElementDelta child : delta.getAffectedChildren()) {
+			processDelta(child, changedTypes); // recursive
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
index f65c9b0d18..bd73fe4642 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.typehierarchy;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.help.IContextProvider;
@@ -388,8 +387,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 	 * @param entry The new entry
 	 */
 	private void addHistoryEntry(IJavaElement[] entry) {
-		for (Iterator<IJavaElement[]> iter= fInputHistory.iterator(); iter.hasNext();) {
-			IJavaElement[] elem= iter.next();
+		for (IJavaElement[] elem : fInputHistory) {
 			if (Arrays.equals(elem, entry)) {
 				fInputHistory.remove(elem);
 				break;
@@ -401,9 +399,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 
 	private void updateHistoryEntries() {
 		for (int i= fInputHistory.size() - 1; i >= 0; i--) {
-			IJavaElement[] entries= fInputHistory.get(i);
-			for (int j= 0; j < entries.length; j++) {
-				IJavaElement elem= entries[j];
+			for (IJavaElement elem : fInputHistory.get(i)) {
 				if (elem != null && !elem.exists()) {
 					fInputHistory.remove(i);
 					break;
@@ -454,8 +450,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 	 */
 	public void setHistoryEntries(List<IJavaElement[]> elems) {
 		fInputHistory.clear();
-		for (Iterator<IJavaElement[]> iterator= elems.iterator(); iterator.hasNext();) {
-			IJavaElement[] elements= iterator.next();
+		for (IJavaElement[] elements : elems) {
 			if (elements != null && elements.length != 0)
 				fInputHistory.add(elements);
 		}
@@ -619,8 +614,8 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 			clearInput();
 		} else {
 			if (!inputElements.equals(prevInput)) {
-				for (int i= 0; i < fAllViewers.length; i++) {
-					fAllViewers[i].setInput(null);
+				for (TypeHierarchyViewer viewer : fAllViewers) {
+					viewer.setInput(null);
 				}
 			}
 			fInputElements= inputElements;
@@ -782,8 +777,8 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 
 		fEmptyTypesViewer= new Label(fViewerbook, SWT.TOP | SWT.LEFT | SWT.WRAP);
 
-		for (int i= 0; i < fAllViewers.length; i++) {
-			fAllViewers[i].setInput(fAllViewers[i]);
+		for (TypeHierarchyViewer viewer : fAllViewers) {
+			viewer.setInput(viewer);
 		}
 
 		// force the update
@@ -879,9 +874,9 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 	}
 
 	private void initDragAndDrop() {
-		for (int i= 0; i < fAllViewers.length; i++) {
-			addDragAdapters(fAllViewers[i]);
-			addDropAdapters(fAllViewers[i]);
+		for (TypeHierarchyViewer viewer : fAllViewers) {
+			addDragAdapters(viewer);
+			addDropAdapters(viewer);
 		}
 		addDragAdapters(fMethodsViewer);
 		fMethodsViewer.addDropSupport(DND.DROP_NONE, new Transfer[0], new DropTargetAdapter());
@@ -983,8 +978,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 		// set the filter menu items
 		IActionBars actionBars= getViewSite().getActionBars();
 		IMenuManager viewMenu= actionBars.getMenuManager();
-		for (int i= 0; i < fViewActions.length; i++) {
-			ToggleViewAction action= fViewActions[i];
+		for (ToggleViewAction action : fViewActions) {
 			viewMenu.add(action);
 			action.setEnabled(false);
 		}
@@ -996,8 +990,8 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 
 		IMenuManager layoutSubMenu= new MenuManager(TypeHierarchyMessages.TypeHierarchyViewPart_layout_submenu);
 		viewMenu.add(layoutSubMenu);
-		for (int i= 0; i < fToggleOrientationActions.length; i++) {
-			layoutSubMenu.add(fToggleOrientationActions[i]);
+		for (ToggleOrientationAction action : fToggleOrientationActions) {
+			layoutSubMenu.add(action);
 		}
 		viewMenu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 		viewMenu.add(fShowQualifiedTypeNamesAction);
@@ -1134,8 +1128,8 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 	}
 
 	private void updateCheckedState() {
-		for (int i= 0; i < fToggleOrientationActions.length; i++) {
-			fToggleOrientationActions[i].setChecked(getViewLayout() == fToggleOrientationActions[i].getOrientation());
+		for (ToggleOrientationAction action : fToggleOrientationActions) {
+			action.setChecked(getViewLayout() == action.getOrientation());
 		}
 	}
 
@@ -1156,8 +1150,8 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 
 	private void fillMainToolBar(IToolBarManager tbmanager) {
 		tbmanager.removeAll();
-		for (int i= 0; i < fViewActions.length; i++) {
-			tbmanager.add(fViewActions[i]);
+		for (ToggleViewAction action : fViewActions) {
+			tbmanager.add(action);
 		}
 		tbmanager.add(fHistoryDropDownAction);
 		tbmanager.update(false);
@@ -1216,8 +1210,8 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 	 */
 	private void setMemberFilter(IMember[] memberFilter) {
 		Assert.isNotNull(fAllViewers);
-		for (int i= 0; i < fAllViewers.length; i++) {
-			fAllViewers[i].setMemberFilter(memberFilter);
+		for (TypeHierarchyViewer viewer : fAllViewers) {
+			viewer.setMemberFilter(memberFilter);
 		}
 	}
 
@@ -1383,10 +1377,10 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 	}
 
 	private boolean isChildVisible(Composite pb, Control child) {
-		Control[] children= pb.getChildren();
-		for (int i= 0; i < children.length; i++) {
-			if (children[i] == child && children[i].isVisible())
+		for (Control c : pb.getChildren()) {
+			if (c == child && c.isVisible()) {
 				return true;
+			}
 		}
 		return false;
 	}
@@ -1442,8 +1436,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 	private void updateToolbarButtons() {
 		boolean isNull= fInputElements == null;
 		boolean isType= !isNull && fInputElements.length == 1 && fInputElements[0] instanceof IType;
-		for (int i= 0; i < fViewActions.length; i++) {
-			ToggleViewAction action= fViewActions[i];
+		for (ToggleViewAction action : fViewActions) {
 			if (action.getViewerIndex() == HIERARCHY_MODE_CLASSIC) {
 				action.setEnabled(!isNull);
 			} else {
@@ -1503,8 +1496,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 			};
 
 		}
-		for (int i= 0; i < fViewActions.length; i++) {
-			ToggleViewAction action= fViewActions[i];
+		for (ToggleViewAction action : fViewActions) {
 			action.setChecked(fCurrentViewerIndex == action.getViewerIndex());
 		}
 	}
@@ -1554,8 +1546,8 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 		if (on != fShowQualifiedTypeNames) {
 			fShowQualifiedTypeNames= on;
 			if (fAllViewers != null) {
-				for (int i= 0; i < fAllViewers.length; i++) {
-					fAllViewers[i].setQualifiedTypeName(on);
+				for (TypeHierarchyViewer viewer : fAllViewers) {
+					viewer.setQualifiedTypeName(on);
 				}
 			}
 		}
@@ -1944,8 +1936,8 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie
 	 * @since 3.6
 	 */
 	public void setViewersInput() {
-		for (int i= 0; i < fAllViewers.length; i++) {
-			fAllViewers[i].setInput(fAllViewers[i]);
+		for (TypeHierarchyViewer viewer : fAllViewers) {
+			viewer.setInput(viewer);
 		}
 		setKeepShowingEmptyViewers(false);
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/ClasspathVMUtil.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/ClasspathVMUtil.java
index bc0e57d087..e9bf9e4f89 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/ClasspathVMUtil.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/ClasspathVMUtil.java
@@ -40,34 +40,30 @@ public class ClasspathVMUtil {
 		}
 		String bestMatchingCompliance= null;
 		IVMInstall bestMatchingVMInstall= null;
-		IVMInstallType[] installTypes= JavaRuntime.getVMInstallTypes();
-		for (int i= 0; i < installTypes.length; i++) {
-			IVMInstall[] installs= installTypes[i].getVMInstalls();
-			for (int k= 0; k < installs.length; k++) {
-				String vmInstallCompliance= getVMInstallCompliance(installs[k], allowNullCompliance);
-
+		for (IVMInstallType installType : JavaRuntime.getVMInstallTypes()) {
+			for (IVMInstall install : installType.getVMInstalls()) {
+				String vmInstallCompliance= getVMInstallCompliance(install, allowNullCompliance);
 				if (requiredVersion.equals(vmInstallCompliance)) {
 					if (!getHighestVersion) {
-						return installs[k]; // perfect match
+						return install; // perfect match
 					}
 				} else if (JavaModelUtil.isVersionLessThan(vmInstallCompliance, requiredVersion)) {
 					continue; // no match
 
 				} else if (bestMatchingVMInstall != null) {
 					if ((!getHighestVersion && JavaModelUtil.isVersionLessThan(bestMatchingCompliance, vmInstallCompliance))
-							|| (getHighestVersion && JavaModelUtil.isVersionLessThan(vmInstallCompliance, bestMatchingCompliance))) {
+						|| (getHighestVersion && JavaModelUtil.isVersionLessThan(vmInstallCompliance, bestMatchingCompliance))) {
 						continue; // the other one is the least matching
 					}
 				}
 				if (getHighestVersion) {
 					if (JavaModelUtil.isVersionLessThan(bestMatchingCompliance, vmInstallCompliance)) {
 						bestMatchingCompliance= vmInstallCompliance;
-						bestMatchingVMInstall= installs[k];
+						bestMatchingVMInstall= install;
 					}
-				}
-				else {
+				} else {
 					bestMatchingCompliance= vmInstallCompliance;
-					bestMatchingVMInstall= installs[k];
+					bestMatchingVMInstall= install;
 				}
 			}
 		}
@@ -93,12 +89,10 @@ public class ClasspathVMUtil {
 
 	public static IExecutionEnvironment findBestMatchingEE(String requiredVersion) {
 		IExecutionEnvironmentsManager eeManager= JavaRuntime.getExecutionEnvironmentsManager();
-		IExecutionEnvironment[] ees= eeManager.getExecutionEnvironments();
 		IExecutionEnvironment bestEE= null;
 		String bestEECompliance= null;
 
-		for (int i= 0; i < ees.length; i++) {
-			IExecutionEnvironment ee= ees[i];
+		for (IExecutionEnvironment ee : eeManager.getExecutionEnvironments()) {
 			String eeCompliance= JavaModelUtil.getExecutionEnvironmentCompliance(ee);
 			String eeId= ee.getId();
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/CoreUtility.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/CoreUtility.java
index a158bb4bb8..8f28601742 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/CoreUtility.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/CoreUtility.java
@@ -145,16 +145,14 @@ public class CoreUtility {
 				if (monitor.isCanceled()) {
 					return Status.CANCEL_STATUS;
 				}
-		        Job[] buildJobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_MANUAL_BUILD);
-		        for (int i= 0; i < buildJobs.length; i++) {
-		        	Job curr= buildJobs[i];
+		        for (Job curr : Job.getJobManager().find(ResourcesPlugin.FAMILY_MANUAL_BUILD)) {
 		        	if (curr != this && curr instanceof BuildJob) {
 		        		BuildJob job= (BuildJob) curr;
 		        		if (job.isCoveredBy(this)) {
 		        			curr.cancel(); // cancel all other build jobs of our kind
 		        		}
 		        	}
-				}
+		        }
 			}
 			try {
 				if (fProject != null) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/ElementValidator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/ElementValidator.java
index 7838696fb1..ddc468bb7f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/ElementValidator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/ElementValidator.java
@@ -193,8 +193,7 @@ public class ElementValidator {
 
 	private static IResource[] getResources(IAdaptable[] elements) {
 		Set<IResource> result= new HashSet<>();
-		for (int i= 0; i < elements.length; i++) {
-			IAdaptable element= elements[i];
+		for (IAdaptable element : elements) {
 			IResource resource= null;
 			if (element instanceof IJavaElement) {
 				IJavaElement je= (IJavaElement)element;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/JavadocHelpContext.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/JavadocHelpContext.java
index 4825720fc6..83ade6b5d4 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/JavadocHelpContext.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/JavadocHelpContext.java
@@ -104,13 +104,12 @@ public class JavadocHelpContext implements IContext2 {
 		List<IHelpResource> helpResources= new ArrayList<>();
 
 		String javadocSummary= null;
-		for (int i= 0; i < elements.length; i++) {
-			if (elements[i] instanceof IJavaElement) {
-				IJavaElement element= (IJavaElement) elements[i];
+		for (Object e : elements) {
+			if (e instanceof IJavaElement) {
+				IJavaElement element= (IJavaElement) e;
 				// if element isn't on the build path skip it
 				if (!ActionUtil.isOnBuildPath(element))
 					continue;
-
 				// Create Javadoc summary
 				if (BUG_85721_FIXED) {
 					if (javadocSummary == null) {
@@ -125,7 +124,6 @@ public class JavadocHelpContext implements IContext2 {
 						javadocSummary= ""; // no Javadoc summary for multiple selection //$NON-NLS-1$
 					}
 				}
-
 				URL url= JavaUI.getJavadocLocation(element, true);
 				if (url == null || doesNotExist(url)) {
 					IPackageFragmentRoot root= JavaModelUtil.getPackageFragmentRoot(element);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/RowLayouter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/RowLayouter.java
index a77d73c56d..113ede8e16 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/RowLayouter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/RowLayouter.java
@@ -161,8 +161,7 @@ public class RowLayouter {
 		if (!fOrder)
 			return;
 
-		for (int i= 0; i < controls.length; i++) {
-			Control control= controls[i];
+		for (Control control : controls) {
 			control.moveBelow(fLastControl);
 			fLastControl= control;
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/SelectionUtil.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/SelectionUtil.java
index 1d128ce2ea..2a872a0b5e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/SelectionUtil.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/SelectionUtil.java
@@ -85,17 +85,15 @@ public class SelectionUtil {
 
 		// get all the view and editor parts
 		List<IWorkbenchPart> parts= new ArrayList<>();
-		IWorkbenchPartReference refs[]= page.getViewReferences();
-		for (int i= 0; i < refs.length; i++) {
-			IWorkbenchPart part= refs[i].getPart(false);
+		for (IWorkbenchPartReference ref : page.getViewReferences()) {
+			IWorkbenchPart part= ref.getPart(false);
 			if (part != null) {
 				parts.add(part);
 			}
 		}
-		refs= page.getEditorReferences();
-		for (int i= 0; i < refs.length; i++) {
-			if (refs[i].getPart(false) != null) {
-				parts.add(refs[i].getPart(false));
+		for (IWorkbenchPartReference ref : page.getEditorReferences()) {
+			if (ref.getPart(false) != null) {
+				parts.add(ref.getPart(false));
 			}
 		}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/BindingLinkedLabelComposer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/BindingLinkedLabelComposer.java
index c92988c6de..7c995d8f52 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/BindingLinkedLabelComposer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/BindingLinkedLabelComposer.java
@@ -609,9 +609,11 @@ public class BindingLinkedLabelComposer extends JavaElementLinkedLabelComposer {
 	// consider only relevant bounds / ignore j.l.Object
 	private boolean hasRelevantBound(ITypeBinding[] bounds) {
 		if (bounds != null) {
-			for (int i= 0; i < bounds.length; i++)
-				if (bounds[i].isInterface() || bounds[i].getSuperclass() != null)
+			for (ITypeBinding bound : bounds) {
+				if (bound.isInterface() || bound.getSuperclass() != null) {
 					return true;
+				}
+			}
 		}
 		return false;
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ColoredViewersManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ColoredViewersManager.java
index a3eb9c3cad..107267313c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ColoredViewersManager.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ColoredViewersManager.java
@@ -14,7 +14,6 @@
 package org.eclipse.jdt.internal.ui.viewsupport;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.eclipse.swt.widgets.Display;
@@ -87,8 +86,7 @@ public class ColoredViewersManager implements IPropertyChangeListener {
 	}
 
 	protected final void updateAllViewers() {
-		for (Iterator<ColoringLabelProvider> iterator= fManagedLabelProviders.iterator(); iterator.hasNext();) {
-			ColoringLabelProvider lp= iterator.next();
+		for (ColoringLabelProvider lp : fManagedLabelProviders) {
 			lp.update();
 		}
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilterUpdater.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilterUpdater.java
index 34346f2782..7101779fe3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilterUpdater.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilterUpdater.java
@@ -43,11 +43,9 @@ public class FilterUpdater implements IResourceChangeListener {
 		IResourceDelta delta= event.getDelta();
 		if (delta == null)
 			return;
-		IResourceDelta[] projDeltas = delta.getAffectedChildren(IResourceDelta.CHANGED);
-		for (int i= 0; i < projDeltas.length; i++) {
-			IResourceDelta pDelta= projDeltas[i];
-			if ((pDelta.getFlags() & IResourceDelta.DESCRIPTION) != 0) {
-				IProject project= (IProject) pDelta.getResource();
+		for (IResourceDelta deltachild : delta.getAffectedChildren(IResourceDelta.CHANGED)) {
+			if ((deltachild.getFlags() & IResourceDelta.DESCRIPTION) != 0) {
+				IProject project= (IProject) deltachild.getResource();
 				if (needsRefiltering(project)) {
 					final Control ctrl= fViewer.getControl();
 					if (ctrl != null && !ctrl.isDisposed()) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilteredElementTreeSelectionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilteredElementTreeSelectionDialog.java
index da1975bf25..06dba204a3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilteredElementTreeSelectionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/FilteredElementTreeSelectionDialog.java
@@ -85,8 +85,8 @@ public class FilteredElementTreeSelectionDialog extends ElementTreeSelectionDial
 				if (fMatchers == null || fMatchers.length == 0) {
 					return true;
 				}
-				for (int i= 0; i < fMatchers.length; i++) {
-					if (fMatchers[i].match(text)) {
+				for (StringMatcher matcher : fMatchers) {
+					if (matcher.match(text)) {
 						return true;
 					}
 				}
@@ -106,12 +106,13 @@ public class FilteredElementTreeSelectionDialog extends ElementTreeSelectionDial
 					return false;
 
 				// Also apply deep filtering to the other registered filters
-				ViewerFilter[] filters= ((TreeViewer)viewer).getFilters();
-				for (int i= 0; i < filters.length; i++) {
-					if (filters[i] == this)
+				for (ViewerFilter filter : ((TreeViewer)viewer).getFilters()) {
+					if (filter == this) {
 						continue;
-					if (!filters[i].select(viewer, element, element))
+					}
+					if (!filter.select(viewer, element, element)) {
 						return false;
+					}
 				}
 				return true;
 			}
@@ -172,9 +173,7 @@ public class FilteredElementTreeSelectionDialog extends ElementTreeSelectionDial
 						redrawFalseControl.setRedraw(false);
 						if (!narrowingDown) {
 							// collapse all
-							TreeItem[] is= treeViewer.getTree().getItems();
-							for (int i= 0; i < is.length; i++) {
-								TreeItem item= is[i];
+							for (TreeItem item : treeViewer.getTree().getItems()) {
 								if (item.getExpanded()) {
 									treeViewer.setExpandedState(item.getData(), false);
 								}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImageDisposer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImageDisposer.java
index 4757082eef..821e7e299b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImageDisposer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImageDisposer.java
@@ -43,8 +43,8 @@ public class ImageDisposer implements DisposeListener {
 	@Override
 	public void widgetDisposed(DisposeEvent e) {
 		if (fImages != null) {
-			for (int i= 0; i < fImages.length; i++) {
-				fImages[i].dispose();
+			for (Image image : fImages) {
+				image.dispose();
 			}
 		}
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImagesOnFileSystemRegistry.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImagesOnFileSystemRegistry.java
index 5d0cef43a3..969b31bf98 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImagesOnFileSystemRegistry.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ImagesOnFileSystemRegistry.java
@@ -73,9 +73,8 @@ public class ImagesOnFileSystemRegistry {
 
 	private void delete(File file) {
 		if (file.isDirectory()) {
-			File[] listFiles= file.listFiles();
-			for (int i= 0; i < listFiles.length; i++) {
-				delete(listFiles[i]);
+			for (File f : file.listFiles()) {
+				delete(f);
 			}
 		}
 		file.delete();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabelComposer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabelComposer.java
index d62a35998d..b87a9bcb5c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabelComposer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabelComposer.java
@@ -369,9 +369,7 @@ public class JavaElementLabelComposer extends JavaElementLabelComposerCore {
 
 		if (fgPkgNameAbbreviation != null && fgPkgNameAbbreviation.length != 0) {
 
-			for (int i= 0; i < fgPkgNameAbbreviation.length; i++) {
-				PackageNameAbbreviation abbr= fgPkgNameAbbreviation[i];
-
+			for (PackageNameAbbreviation abbr : fgPkgNameAbbreviation) {
 				String abbrPrefix= abbr.getPackagePrefix();
 				if (pkgName.startsWith(abbrPrefix)) {
 					int abbrPrefixLength= abbrPrefix.length();
@@ -547,29 +545,20 @@ public class JavaElementLabelComposer extends JavaElementLabelComposerCore {
 	}
 
 	public static PackageNameAbbreviation[] parseAbbreviationPattern(String pattern) {
-		String[] parts= pattern.split("\\s*(?:\r\n?|\n)\\s*"); //$NON-NLS-1$
-
 		ArrayList<PackageNameAbbreviation> result= new ArrayList<>();
 
-		for (int i= 0; i < parts.length; i++) {
-			String part= parts[i].trim();
-
+		for (String p : pattern.split("\\s*(?:\r\n?|\n)\\s*")) { //$NON-NLS-1$
+			String part= p.trim();
 			if (part.length() == 0)
 				continue;
-
 			String[] parts2= part.split("\\s*=\\s*", 2); //$NON-NLS-1$
-
 			if (parts2.length != 2)
 				return null;
-
 			String prefix= parts2[0].trim();
 			String abbr= parts2[1].trim();
-
 			if (prefix.startsWith("#")) //$NON-NLS-1$
 				continue;
-
 			PackageNameAbbreviation pkgAbbr= new PackageNameAbbreviation(prefix, abbr);
-
 			result.add(pkgAbbr);
 		}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLinks.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLinks.java
index f060cddf2c..95ba196a67 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLinks.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLinks.java
@@ -149,12 +149,10 @@ public class JavaElementLinks {
 		private String getPackageFragmentElementName(IJavaElement javaElement) {
 			IPackageFragmentRoot root= (IPackageFragmentRoot) javaElement.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
 			String javaElementName= javaElement.getElementName();
-			String[] individualSegmentNames= javaElementName.split("\\."); //$NON-NLS-1$
 			String packageName= null;
 			StringBuilder strBuffer= new StringBuilder();
 
-			for (int i= 0; i < individualSegmentNames.length; i++) {
-				String lastSegmentName= individualSegmentNames[i];
+			for (String lastSegmentName : javaElementName.split("\\.")) { //$NON-NLS-1$
 				if (packageName != null) {
 					strBuffer.append('.');
 					packageName= packageName + '.' + lastSegmentName;
@@ -463,9 +461,8 @@ public class JavaElementLinks {
 									// easily, since the Javadoc references are erasures
 
 									//Shortcut: only check name and parameter count:
-									methods= type.getMethods();
-									for (int i= 0; i < methods.length; i++) {
-										method= methods[i];
+									for (IMethod method1 : type.getMethods()) {
+										method= method1;
 										if (method.getElementName().equals(refMemberName) && method.getNumberOfParameters() == paramSignatures.length)
 											return method;
 									}
@@ -481,9 +478,7 @@ public class JavaElementLinks {
 								if (field.exists()) {
 									return field;
 								} else {
-									IMethod[] methods= type.getMethods();
-									for (int i= 0; i < methods.length; i++) {
-										IMethod method= methods[i];
+									for (IMethod method : type.getMethods()) {
 										if (method.getElementName().equals(refMemberName))
 											return method;
 									}
@@ -587,27 +582,23 @@ public class JavaElementLinks {
 		while (baseElement != null) {
 			switch (baseElement.getElementType()) {
 				case IJavaElement.METHOD:
-					IMethod method= (IMethod)baseElement;
-					ITypeParameter[] typeParameters= method.getTypeParameters();
-					for (int i= 0; i < typeParameters.length; i++) {
-						ITypeParameter typeParameter= typeParameters[i];
+					for (ITypeParameter typeParameter : ((IMethod)baseElement).getTypeParameters()) {
 						if (typeParameter.getElementName().equals(typeVariableName)) {
 							return typeParameter;
 						}
 					}
 					break;
 
+
 				case IJavaElement.TYPE:
-					IType type= (IType)baseElement;
-					typeParameters= type.getTypeParameters();
-					for (int i= 0; i < typeParameters.length; i++) {
-						ITypeParameter typeParameter= typeParameters[i];
+					for (ITypeParameter typeParameter : ((IType)baseElement).getTypeParameters()) {
 						if (typeParameter.getElementName().equals(typeVariableName)) {
 							return typeParameter;
 						}
 					}
 					break;
 
+
 				case IJavaElement.JAVA_MODEL:
 				case IJavaElement.JAVA_PROJECT:
 				case IJavaElement.PACKAGE_FRAGMENT:
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/LinkedProposalModelPresenter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/LinkedProposalModelPresenter.java
index d2c949d2aa..9f577a5517 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/LinkedProposalModelPresenter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/LinkedProposalModelPresenter.java
@@ -47,6 +47,7 @@ import org.eclipse.ui.texteditor.link.EditorLinkedModeUI;
 
 import org.eclipse.jdt.internal.corext.fix.LinkedProposalModel;
 import org.eclipse.jdt.internal.corext.fix.LinkedProposalPositionGroup;
+import org.eclipse.jdt.internal.corext.fix.LinkedProposalPositionGroupCore.PositionInformation;
 
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
@@ -79,8 +80,7 @@ public class LinkedProposalModelPresenter {
 			if (positions.length > 0) {
 				LinkedProposalPositionGroup.Proposal[] linkedModeProposals= curr.getProposals();
 				if (linkedModeProposals.length <= 1) {
-					for (int i= 0; i < positions.length; i++) {
-						LinkedProposalPositionGroup.PositionInformation pos= positions[i];
+					for (PositionInformation pos : positions) {
 						if (pos.getOffset() != -1) {
 							group.addPosition(new LinkedPosition(document, pos.getOffset(), pos.getLength(), pos.getSequenceRank()));
 						}
@@ -91,8 +91,7 @@ public class LinkedProposalModelPresenter {
 						proposalImpls[i]= new LinkedPositionProposalImpl(linkedModeProposals[i], model);
 					}
 
-					for (int i= 0; i < positions.length; i++) {
-						LinkedProposalPositionGroup.PositionInformation pos= positions[i];
+					for (PositionInformation pos : positions) {
 						if (pos.getOffset() != -1) {
 							group.addPosition(new ProposalPosition(document, pos.getOffset(), pos.getLength(), pos.getSequenceRank(), proposalImpls));
 						}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemMarkerManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemMarkerManager.java
index f87a85d266..3c43b6b676 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemMarkerManager.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemMarkerManager.java
@@ -90,14 +90,13 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio
 
 		private boolean isErrorDelta(IResourceDelta delta) {
 			if ((delta.getFlags() & IResourceDelta.MARKERS) != 0) {
-				IMarkerDelta[] markerDeltas= delta.getMarkerDeltas();
-				for (int i= 0; i < markerDeltas.length; i++) {
-					if (markerDeltas[i].isSubtypeOf(IMarker.PROBLEM)) {
-						int kind= markerDeltas[i].getKind();
+				for (IMarkerDelta markerDelta : delta.getMarkerDeltas()) {
+					if (markerDelta.isSubtypeOf(IMarker.PROBLEM)) {
+						int kind= markerDelta.getKind();
 						if (kind == IResourceDelta.ADDED || kind == IResourceDelta.REMOVED)
 							return true;
-						int severity= markerDeltas[i].getAttribute(IMarker.SEVERITY, -1);
-						int newSeverity= markerDeltas[i].getMarker().getAttribute(IMarker.SEVERITY, -1);
+						int severity= markerDelta.getAttribute(IMarker.SEVERITY, -1);
+						int newSeverity= markerDelta.getMarker().getAttribute(IMarker.SEVERITY, -1);
 						if (newSeverity != severity)
 							return true;
 					}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemTableViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemTableViewer.java
index b533f19763..21ec5ea273 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemTableViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemTableViewer.java
@@ -125,8 +125,7 @@ public class ProblemTableViewer extends TableViewer implements ResourceToItemsMa
 		Object[] changed= event.getElements();
 		if (changed != null && !fResourceToItemsMapper.isEmpty()) {
 			ArrayList<Object> others= new ArrayList<>(changed.length);
-			for (int i= 0; i < changed.length; i++) {
-				Object curr= changed[i];
+			for (Object curr : changed) {
 				if (curr instanceof IResource) {
 					fResourceToItemsMapper.resourceChanged((IResource) curr);
 				} else {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemTreeViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemTreeViewer.java
index 2c64c911ec..d479a2985a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemTreeViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemTreeViewer.java
@@ -132,8 +132,7 @@ public class ProblemTreeViewer extends TreeViewer implements ResourceToItemsMapp
 	@Override
 	public void setFilters(ViewerFilter... filters) {
 		ViewerFilter[] oldFilters= getFilters();
-		for (int i= 0; i < filters.length; i++) {
-			ViewerFilter curr= filters[i];
+		for (ViewerFilter curr : filters) {
 			if (curr instanceof JavaViewerFilter && !findAndRemove(oldFilters, curr)) {
 				((JavaViewerFilter) curr).filteringStart();
 			}
@@ -159,8 +158,7 @@ public class ProblemTreeViewer extends TreeViewer implements ResourceToItemsMapp
 	}
 
 	private void endFilterSessions(ViewerFilter[] filters) {
-		for (int i= 0; i < filters.length; i++) {
-			ViewerFilter curr= filters[i];
+		for (ViewerFilter curr : filters) {
 			if (curr instanceof JavaViewerFilter) {
 				((JavaViewerFilter) curr).filteringEnd();
 			}
@@ -189,8 +187,7 @@ public class ProblemTreeViewer extends TreeViewer implements ResourceToItemsMapp
 
 		if (changed != null && !fResourceToItemsMapper.isEmpty()) {
 			ArrayList<Object> others= new ArrayList<>();
-			for (int i= 0; i < changed.length; i++) {
-				Object curr= changed[i];
+			for (Object curr : changed) {
 				if (curr instanceof IResource) {
 					fResourceToItemsMapper.resourceChanged((IResource) curr);
 				} else {
@@ -260,8 +257,7 @@ public class ProblemTreeViewer extends TreeViewer implements ResourceToItemsMapp
 		}
 		List<Object> list= new ArrayList<>(elements.length);
 		ViewerFilter[] filters = getFilters();
-		for (int i = 0; i < elements.length; i++) {
-			Object object = elements[i];
+		for (Object object : elements) {
 			if (!isFiltered(object, parent, filters)) {
 				list.add(object);
 			}
@@ -277,8 +273,7 @@ public class ProblemTreeViewer extends TreeViewer implements ResourceToItemsMapp
 			return true;
 		}
 		ViewerFilter[] filters = getFilters();
-		for (int i = 0; i < elements.length; i++) {
-			Object object = elements[i];
+		for (Object object : elements) {
 			if (!isFiltered(object, parent, filters)) {
 				return true;
 			}
@@ -296,8 +291,7 @@ public class ProblemTreeViewer extends TreeViewer implements ResourceToItemsMapp
 	 * @return true if the element is filtered
 	 */
 	protected boolean isFiltered(Object object, Object parent, ViewerFilter[] filters) {
-		for (int i = 0; i < filters.length; i++) {
-			ViewerFilter filter = filters[i];
+		for (ViewerFilter filter : filters) {
 			if (!filter.select(this, parent, object))
 				return true;
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/SelectionProviderMediator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/SelectionProviderMediator.java
index 5c63dd2095..579791ffdd 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/SelectionProviderMediator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/SelectionProviderMediator.java
@@ -88,8 +88,7 @@ public class SelectionProviderMediator implements IPostSelectionProvider {
 		fPostSelectionChangedListeners= new ListenerList<>();
 		fViewerInFocus= viewerInFocus;
 
-		for (int i= 0; i < fViewers.length; i++) {
-			StructuredViewer viewer= fViewers[i];
+		for (StructuredViewer viewer : fViewers) {
 			viewer.addSelectionChangedListener(listener);
 			viewer.addPostSelectionChangedListener(new InternalPostSelectionListener());
 			Control control= viewer.getControl();
@@ -98,9 +97,9 @@ public class SelectionProviderMediator implements IPostSelectionProvider {
 	}
 
 	private void doFocusChanged(Widget control) {
-		for (int i= 0; i < fViewers.length; i++) {
-			if (fViewers[i].getControl() == control) {
-				propagateFocusChanged(fViewers[i]);
+		for (StructuredViewer viewer : fViewers) {
+			if (viewer.getControl() == control) {
+				propagateFocusChanged(viewer);
 				return;
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/TreeHierarchyLayoutProblemsDecorator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/TreeHierarchyLayoutProblemsDecorator.java
index 2f6a9360e9..5eef0b5f0a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/TreeHierarchyLayoutProblemsDecorator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/TreeHierarchyLayoutProblemsDecorator.java
@@ -55,10 +55,9 @@ public class TreeHierarchyLayoutProblemsDecorator extends ProblemsLabelDecorator
 		if (element instanceof IPackageFragment) {
 			return computePackageAdornmentFlags((IPackageFragment) element);
 		} else if (element instanceof LogicalPackage) {
-			IPackageFragment[] fragments= ((LogicalPackage) element).getFragments();
 			int res= 0;
-			for (int i= 0; i < fragments.length; i++) {
-				int flags= computePackageAdornmentFlags(fragments[i]);
+			for (IPackageFragment fragment : ((LogicalPackage) element).getFragments()) {
+				int flags= computePackageAdornmentFlags(fragment);
 				if (flags == JavaElementImageDescriptor.ERROR) {
 					return flags;
 				} else if (flags != 0 && res != JavaElementImageDescriptor.WARNING) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewTypeDropDownAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewTypeDropDownAction.java
index 10d65c181d..4519a1b044 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewTypeDropDownAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewTypeDropDownAction.java
@@ -151,9 +151,7 @@ public class NewTypeDropDownAction extends Action implements IMenuCreator, IWork
 	public Menu getMenu(Control parent) {
 		if (fMenu == null) {
 			fMenu= new Menu(parent);
-			OpenTypeWizardAction[] actions= getActionFromDescriptors();
-			for (int i= 0; i < actions.length; i++) {
-				OpenTypeWizardAction curr= actions[i];
+			for (OpenTypeWizardAction curr : getActionFromDescriptors()) {
 				curr.setShell(fWizardShell);
 				ActionContributionItem item= new ActionContributionItem(curr);
 				item.fill(fMenu, -1);
@@ -173,9 +171,7 @@ public class NewTypeDropDownAction extends Action implements IMenuCreator, IWork
 
 		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(PlatformUI.PLUGIN_ID, PL_NEW);
 		if (extensionPoint != null) {
-			IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-			for (int i = 0; i < elements.length; i++) {
-				IConfigurationElement element= elements[i];
+			for (IConfigurationElement element : extensionPoint.getConfigurationElements()) {
 				if (element.getName().equals(TAG_WIZARD) && isJavaTypeWizard(element)) {
 					containers.add(new OpenTypeWizardAction(element));
 				}
@@ -185,15 +181,10 @@ public class NewTypeDropDownAction extends Action implements IMenuCreator, IWork
 	}
 
 	private static boolean isJavaTypeWizard(IConfigurationElement element) {
-		IConfigurationElement[] classElements= element.getChildren(TAG_CLASS);
-		if (classElements.length > 0) {
-			for (int i= 0; i < classElements.length; i++) {
-				IConfigurationElement[] paramElements= classElements[i].getChildren(TAG_PARAMETER);
-				for (int k = 0; k < paramElements.length; k++) {
-					IConfigurationElement curr= paramElements[k];
-					if (ATT_JAVATYPE.equals(curr.getAttribute(TAG_NAME))) {
-						return Boolean.valueOf(curr.getAttribute(TAG_VALUE)).booleanValue();
-					}
+		for (IConfigurationElement classElement : element.getChildren(TAG_CLASS)) {
+			for (IConfigurationElement curr : classElement.getChildren(TAG_PARAMETER)) {
+				if (ATT_JAVATYPE.equals(curr.getAttribute(TAG_NAME))) {
+					return Boolean.valueOf(curr.getAttribute(TAG_VALUE)).booleanValue();
 				}
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/TypedElementSelectionValidator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/TypedElementSelectionValidator.java
index a4b4bc9942..e719d5ba17 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/TypedElementSelectionValidator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/TypedElementSelectionValidator.java
@@ -70,8 +70,8 @@ public class TypedElementSelectionValidator implements ISelectionStatusValidator
 	}
 
 	private boolean isOfAcceptedType(Object o) {
-		for (int i= 0; i < fAcceptedTypes.length; i++) {
-			if (fAcceptedTypes[i].isInstance(o)) {
+		for (Class<?> type : fAcceptedTypes) {
+			if (type.isInstance(o)) {
 				return true;
 			}
 		}
@@ -99,8 +99,7 @@ public class TypedElementSelectionValidator implements ISelectionStatusValidator
 			return false;
 		}
 
-		for (int i= 0; i < selection.length; i++) {
-			Object o= selection[i];
+		for (Object o : selection) {
 			if (!isOfAcceptedType(o) || isRejectedElement(o) || !isSelectedValid(o)) {
 				return false;
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/TypedViewerFilter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/TypedViewerFilter.java
index c64c31280b..02d0e07d32 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/TypedViewerFilter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/TypedViewerFilter.java
@@ -53,14 +53,14 @@ public class TypedViewerFilter extends ViewerFilter {
 	@Override
 	public boolean select(Viewer viewer, Object parentElement, Object element) {
 		if (fRejectedElements != null) {
-			for (int i= 0; i < fRejectedElements.length; i++) {
-				if (element.equals(fRejectedElements[i])) {
+			for (Object rejectedelement : fRejectedElements) {
+				if (element.equals(rejectedelement)) {
 					return false;
 				}
 			}
 		}
-		for (int i= 0; i < fAcceptedTypes.length; i++) {
-			if (fAcceptedTypes[i].isInstance(element)) {
+		for (Class<?> type : fAcceptedTypes) {
+			if (type.isInstance(element)) {
 				return true;
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java
index 48575ba354..a581e90511 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java
@@ -18,7 +18,6 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -238,8 +237,7 @@ public class AddSourceFolderWizardPage extends NewElementWizardPage {
 		fOrginalInclusionFilters= new Hashtable<>();
 		fOrginalExlusionFiltersCopy= new Hashtable<>();
 		fOrginalInclusionFiltersCopy= new Hashtable<>();
-		for (Iterator<CPListElement> iter= existingEntries.iterator(); iter.hasNext();) {
-			CPListElement element= iter.next();
+		for (CPListElement element : existingEntries) {
 			IPath[] exlusions= (IPath[])element.getAttribute(CPListElement.EXCLUSION);
 			if (exlusions != null) {
 				IPath[] save= new IPath[exlusions.length];
@@ -542,8 +540,7 @@ public class AddSourceFolderWizardPage extends NewElementWizardPage {
 	}
 
 	public void restore() {
-		for (Iterator<CPListElement> iter= fExistingEntries.iterator(); iter.hasNext();) {
-			CPListElement element= iter.next();
+		for (CPListElement element : fExistingEntries) {
 			if (fOrginalExlusionFilters.containsKey(element)) {
 				element.setAttribute(CPListElement.EXCLUSION, fOrginalExlusionFiltersCopy.get(element));
 			}
@@ -556,8 +553,7 @@ public class AddSourceFolderWizardPage extends NewElementWizardPage {
 
 	private void restoreCPElements() {
 		if (fNewElement.getPath() != null) {
-			for (Iterator<CPListElement> iter= fExistingEntries.iterator(); iter.hasNext();) {
-				CPListElement element= iter.next();
+			for (CPListElement element : fExistingEntries) {
 				if (fOrginalExlusionFilters.containsKey(element)) {
 					element.setAttribute(CPListElement.EXCLUSION, fOrginalExlusionFilters.get(element));
 				}
@@ -587,8 +583,7 @@ public class AddSourceFolderWizardPage extends NewElementWizardPage {
 			newPath= newPath.removeFirstSegments(projPath.segmentCount()).addTrailingSeparator();
 		}
 
-		for (Iterator<CPListElement> iter= fExistingEntries.iterator(); iter.hasNext();) {
-			CPListElement element= iter.next();
+		for (CPListElement element : fExistingEntries) {
 			IPath elementPath= element.getPath();
 			if (projPath.isPrefixOf(elementPath)) {
 				elementPath= elementPath.removeFirstSegments(projPath.segmentCount());
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ArchiveFileFilter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ArchiveFileFilter.java
index 57b4675904..20d8906575 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ArchiveFileFilter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ArchiveFileFilter.java
@@ -72,10 +72,9 @@ public class ArchiveFileFilter extends ViewerFilter {
 			if (element instanceof IProject && !((IProject)element).isOpen())
 				return false;
 			try {
-				IResource[] resources= ((IContainer)element).members();
-				for (int i= 0; i < resources.length; i++) {
+				for (IResource resource : ((IContainer)element).members()) {
 					// recursive! Only show containers that contain an archive
-					if (select(viewer, parent, resources[i])) {
+					if (select(viewer, parent, resource)) {
 						return true;
 					}
 				}
@@ -98,8 +97,8 @@ public class ArchiveFileFilter extends ViewerFilter {
 	}
 
 	public static boolean isArchiveFileExtension(String ext) {
-		for (int i= 0; i < fgArchiveExtensions.length; i++) {
-			if (ext.equalsIgnoreCase(fgArchiveExtensions[i])) {
+		for (String extension : fgArchiveExtensions) {
+			if (ext.equalsIgnoreCase(extension)) {
 				return true;
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java
index d0000913be..4699d01ab8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java
@@ -160,8 +160,7 @@ public abstract class BuildPathBasePage {
 			if (value instanceof ModuleEncapsulationDetail[]) {
 				ModuleEncapsulationDetail[] existingDetails= (ModuleEncapsulationDetail[]) value;
 				int count= 0;
-				for (int j= 0; j < existingDetails.length; j++) {
-					ModuleEncapsulationDetail aDetail= existingDetails[j];
+				for (ModuleEncapsulationDetail aDetail : existingDetails) {
 					if (aDetail != detail)
 						existingDetails[count++]= aDetail;
 				}
@@ -222,15 +221,14 @@ public abstract class BuildPathBasePage {
 	}
 
 	public static void fixNestingConflicts(CPListElement[] newEntries, CPListElement[] existing, Set<CPListElement> modifiedSourceEntries) {
-		for (int i= 0; i < newEntries.length; i++) {
-			addExclusionPatterns(newEntries[i], existing, modifiedSourceEntries);
+		for (CPListElement newEntry : newEntries) {
+			addExclusionPatterns(newEntry, existing, modifiedSourceEntries);
 		}
 	}
 
 	private static void addExclusionPatterns(CPListElement newEntry, CPListElement[] existing, Set<CPListElement> modifiedEntries) {
 		IPath entryPath= newEntry.getPath();
-		for (int i= 0; i < existing.length; i++) {
-			CPListElement curr= existing[i];
+		for (CPListElement curr : existing) {
 			if (curr.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
 				IPath currPath= curr.getPath();
 				if (!currPath.equals(entryPath)) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java
index 2b2dc33ebf..b40fd03971 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java
@@ -15,7 +15,6 @@ package org.eclipse.jdt.internal.ui.wizards.buildpaths;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -101,13 +100,9 @@ public class BuildPathSupport {
 		IJavaProject currProject= elem.getJavaProject(); // can be null
 		try {
 			IJavaModel jmodel= JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-			IJavaProject[] jprojects= jmodel.getJavaProjects();
-			for (int i= 0; i < jprojects.length; i++) {
-				IJavaProject curr= jprojects[i];
+			for (IJavaProject curr : jmodel.getJavaProjects()) {
 				if (!curr.equals(currProject)) {
-					IClasspathEntry[] entries= curr.getRawClasspath();
-					for (int k= 0; k < entries.length; k++) {
-						IClasspathEntry entry= entries[k];
+					for (IClasspathEntry entry : curr.getRawClasspath()) {
 						if (entry.getEntryKind() == elem.getEntryKind()
 							&& entry.getPath().equals(elem.getPath())) {
 							IPath attachPath= entry.getSourceAttachmentPath();
@@ -137,17 +132,11 @@ public class BuildPathSupport {
 		try {
 			// try if the jar itself contains the source
 			IJavaModel jmodel= JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-			IJavaProject[] jprojects= jmodel.getJavaProjects();
-			for (int i= 0; i < jprojects.length; i++) {
-				IJavaProject curr= jprojects[i];
+			for (IJavaProject curr : jmodel.getJavaProjects()) {
 				if (!curr.equals(currProject)) {
-					IClasspathEntry[] entries= curr.getRawClasspath();
-					for (int k= 0; k < entries.length; k++) {
-						IClasspathEntry entry= entries[k];
+					for (IClasspathEntry entry : curr.getRawClasspath()) {
 						if (entry.getEntryKind() == elem.getEntryKind() && entry.getPath().equals(elem.getPath())) {
-							IClasspathAttribute[] attributes= entry.getExtraAttributes();
-							for (int n= 0; n < attributes.length; n++) {
-								IClasspathAttribute attrib= attributes[n];
+							for (IClasspathAttribute attrib : entry.getExtraAttributes()) {
 								if (IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME.equals(attrib.getName())) {
 									return attrib.getValue();
 								}
@@ -239,8 +228,7 @@ public class BuildPathSupport {
 		}
 		CPListElement currElem= CPListElement.createFromExisting(currEntry, jproject);
 		CPListElement newElem= CPListElement.createFromExisting(updatedEntry, jproject);
-		for (int i= 0; i < updatedAttributes.length; i++) {
-			String attrib= updatedAttributes[i];
+		for (String attrib : updatedAttributes) {
 			currElem.setAttribute(attrib, newElem.getAttribute(attrib));
 		}
 		return currElem.getClasspathEntry();
@@ -353,8 +341,7 @@ public class BuildPathSupport {
 	 * @since 3.5
 	 */
 	public static void setEEComplianceOptions(IJavaProject javaProject, List<CPListElement> modifiedClassPathEntries) {
-		for (Iterator<CPListElement> iter= modifiedClassPathEntries.iterator(); iter.hasNext();) {
-			CPListElement entry= iter.next();
+		for (CPListElement entry : modifiedClassPathEntries) {
 			if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
 				IPath path= entry.getPath();
 				if (! path.equals(entry.getOrginalPath())) {
@@ -386,8 +373,7 @@ public class BuildPathSupport {
 			Map<String, String> options= javaProject.getOptions(false);
 			Map<String, String> eeOptions= getEEOptions(ee);
 			if (eeOptions != null) {
-				for (int i= 0; i < PREFS_COMPLIANCE.length; i++) {
-					String option= PREFS_COMPLIANCE[i];
+				for (String option : PREFS_COMPLIANCE) {
 					String val= eeOptions.get(option);
 					if (val != null) {
 						options.put(option, val);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
index 5969c613ce..1ce8d0b65a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
@@ -17,7 +17,6 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -77,6 +76,7 @@ import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaConventions;
 import org.eclipse.jdt.core.JavaCore;
 
+import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
 import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 import org.eclipse.jdt.internal.corext.util.Messages;
 
@@ -89,7 +89,6 @@ import org.eclipse.jdt.internal.ui.JavaPluginImages;
 import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
 import org.eclipse.jdt.internal.ui.dialogs.StatusUtil;
 import org.eclipse.jdt.internal.ui.util.CoreUtility;
-import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
 import org.eclipse.jdt.internal.ui.viewsupport.ImageDisposer;
 import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
 import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
@@ -446,8 +445,7 @@ public class BuildPathsBlock {
 	private ArrayList<CPListElement> getCPListElements(IClasspathEntry[] classpathEntries, IClasspathEntry[] existingEntries) {
 		List<IClasspathEntry> existing= existingEntries == null ? Collections.<IClasspathEntry>emptyList() : Arrays.asList(existingEntries);
 		ArrayList<CPListElement> newClassPath= new ArrayList<>();
-		for (int i= 0; i < classpathEntries.length; i++) {
-			IClasspathEntry curr= classpathEntries[i];
+		for (IClasspathEntry curr : classpathEntries) {
 			newClassPath.add(CPListElement.create(curr, ! existing.contains(curr), fCurrJProject));
 		}
 		return newClassPath;
@@ -843,8 +841,7 @@ public class BuildPathsBlock {
 			IClasspathEntry[] classpath= new IClasspathEntry[nEntries];
 			int i= 0;
 
-			for (Iterator<CPListElement> iter= classPathEntries.iterator(); iter.hasNext();) {
-				CPListElement entry= iter.next();
+			for (CPListElement entry : classPathEntries) {
 				if(entry.isRootNodeForPath()){
 					continue;
 				}
@@ -955,9 +952,8 @@ public class BuildPathsBlock {
 			return true;
 		}
 		if (resource instanceof IContainer) {
-			IResource[] members= ((IContainer) resource).members();
-			for (int i= 0; i < members.length; i++) {
-				if (hasClassfiles(members[i])) {
+			for (IResource member : ((IContainer) resource).members()) {
+				if (hasClassfiles(member)) {
 					return true;
 				}
 			}
@@ -970,9 +966,8 @@ public class BuildPathsBlock {
 		if (resource.isDerived()) {
 			resource.delete(false, null);
 		} else if (resource instanceof IContainer) {
-			IResource[] members= ((IContainer) resource).members();
-			for (int i= 0; i < members.length; i++) {
-				removeOldClassfiles(members[i]);
+			for (IResource member : ((IContainer) resource).members()) {
+				removeOldClassfiles(member);
 			}
 		}
 	}
@@ -1017,9 +1012,9 @@ public class BuildPathsBlock {
 		IProject[] allProjects= fWorkspaceRoot.getProjects();
 		ArrayList<IProject> rejectedElements= new ArrayList<>(allProjects.length);
 		IProject currProject= fCurrJProject.getProject();
-		for (int i= 0; i < allProjects.length; i++) {
-			if (!allProjects[i].equals(currProject)) {
-				rejectedElements.add(allProjects[i]);
+		for (IProject project : allProjects) {
+			if (!project.equals(currProject)) {
+				rejectedElements.add(project);
 			}
 		}
 		ViewerFilter filter= new TypedViewerFilter(acceptedClasses, rejectedElements.toArray());
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java
index c5143e658d..8d78987929 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java
@@ -18,7 +18,6 @@ package org.eclipse.jdt.internal.ui.wizards.buildpaths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -43,20 +42,19 @@ import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 
-
 import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.LimitModules;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModuleAddExport;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModuleAddExpose;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModuleAddOpens;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModuleAddReads;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModulePatch;
 
 import org.eclipse.jdt.launching.JavaRuntime;
 
 import org.eclipse.jdt.ui.JavaUI;
 
 import org.eclipse.jdt.internal.ui.JavaPlugin;
+import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.LimitModules;
+import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModuleAddExport;
+import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModuleAddExpose;
+import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModuleAddOpens;
+import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModuleAddReads;
+import org.eclipse.jdt.internal.ui.wizards.buildpaths.ModuleEncapsulationDetail.ModulePatch;
 
 public class CPListElement {
 
@@ -182,8 +180,7 @@ public class CPListElement {
 									return;
 								}
 							}
-							for (int i= 0; i < entries.length; i++) {
-								IClasspathEntry currEntry= entries[i];
+							for (IClasspathEntry currEntry : entries) {
 								if (currEntry != null) {
 									CPListElement curr= createFromExisting(this, currEntry, fProject);
 									fChildren.add(curr);
@@ -458,9 +455,10 @@ public class CPListElement {
 		if (moduleDetails instanceof ModuleEncapsulationDetail[]) {
 			ModuleEncapsulationDetail[] details= (ModuleEncapsulationDetail[]) moduleDetails;
 			List<T> elements= new ArrayList<>(details.length);
-			for (int i= 0; i < details.length; i++) {
-				if (clazz.isInstance(details[i]))
-					elements.add(clazz.cast(details[i]));
+			for (ModuleEncapsulationDetail detail : details) {
+				if (clazz.isInstance(detail)) {
+					elements.add(clazz.cast(detail));
+				}
 			}
 			return elements;
 		} else {
@@ -478,8 +476,8 @@ public class CPListElement {
 		if (entry instanceof CPListElementAttribute) {
 			CPListElementAttribute curr= (CPListElementAttribute) entry;
 			String key= curr.getKey();
-			for (int i= 0; i < filteredKeys.length; i++) {
-				if (key.equals(filteredKeys[i])) {
+			for (String filteredKey : filteredKeys) {
+				if (key.equals(filteredKey)) {
 					return true;
 				}
 			}
@@ -781,14 +779,13 @@ public class CPListElement {
 		elem.setAttribute(COMBINE_ACCESSRULES, Boolean.valueOf(curr.combineAccessRules()));
 
 		IClasspathAttribute[] extraAttributes= curr.getExtraAttributes();
-		for (int i= 0; i < extraAttributes.length; i++) {
-			IClasspathAttribute attrib= extraAttributes[i];
+		for (IClasspathAttribute attrib : extraAttributes) {
 			CPListElementAttribute attribElem= elem.findAttributeElement(attrib.getName());
 			if (attribElem == null) {
 				if (!isModuleAttribute(attrib.getName())) {
 					elem.createAttributeElement(attrib.getName(), attrib.getValue(), false);
 				} else if (attrib.getName().equals(MODULE)) {
-					attribElem = new CPListElementAttribute(elem, MODULE, null, true);
+					attribElem= new CPListElementAttribute(elem, MODULE, null, true);
 					attribElem.setValue(getModuleAttributeValue(attribElem, attrib, extraAttributes));
 					elem.fChildren.add(attribElem);
 				}
@@ -808,8 +805,7 @@ public class CPListElement {
 	private static Object getModuleAttributeValue(CPListElementAttribute attribElem, IClasspathAttribute attrib, IClasspathAttribute[] extraAttributes) {
 		if (ModuleAttributeConfiguration.TRUE.equals(attrib.getValue())) {
 			List<ModuleEncapsulationDetail> details= new ArrayList<>();
-			for (int j= 0; j < extraAttributes.length; j++) {
-				IClasspathAttribute otherAttrib= extraAttributes[j];
+			for (IClasspathAttribute otherAttrib : extraAttributes) {
 				if (IClasspathAttribute.PATCH_MODULE.equals(otherAttrib.getName())) {
 					details.addAll(ModulePatch.fromMultiString(attribElem, otherAttrib.getValue()));
 				} else if (IClasspathAttribute.ADD_EXPORTS.equals(otherAttrib.getName())) {
@@ -856,8 +852,8 @@ public class CPListElement {
 	public static StringBuffer appendEncodedFilter(IPath[] filters, StringBuffer buf) {
 		if (filters != null) {
 			buf.append('[').append(filters.length).append(']');
-			for (int i= 0; i < filters.length; i++) {
-				appendEncodePath(filters[i], buf).append(';');
+			for (IPath filter : filters) {
+				appendEncodePath(filter, buf).append(';');
 			}
 		} else {
 			buf.append('[').append(']');
@@ -868,9 +864,9 @@ public class CPListElement {
 	public static StringBuffer appendEncodedAccessRules(IAccessRule[] rules, StringBuffer buf) {
 		if (rules != null) {
 			buf.append('[').append(rules.length).append(']');
-			for (int i= 0; i < rules.length; i++) {
-				appendEncodePath(rules[i].getPattern(), buf).append(';');
-				buf.append(rules[i].getKind()).append(';');
+			for (IAccessRule rule : rules) {
+				appendEncodePath(rule.getPattern(), buf).append(';');
+				buf.append(rule.getKind()).append(';');
 			}
 		} else {
 			buf.append('[').append(']');
@@ -977,8 +973,7 @@ public class CPListElement {
 	public static IClasspathEntry[] convertToClasspathEntries(List<CPListElement> cpList) {
 		IClasspathEntry[] result= new IClasspathEntry[cpList.size()];
 		int i= 0;
-		for (Iterator<CPListElement> iter= cpList.iterator(); iter.hasNext();) {
-			CPListElement cur= iter.next();
+		for (CPListElement cur : cpList) {
 			result[i]= cur.getClasspathEntry();
 			i++;
 		}
@@ -996,8 +991,8 @@ public class CPListElement {
 
 	public static boolean isProjectSourceFolder(CPListElement[] existing, IJavaProject project) {
 		IPath projPath= project.getProject().getFullPath();
-		for (int i= 0; i < existing.length; i++) {
-			IClasspathEntry curr= existing[i].getClasspathEntry();
+		for (CPListElement e : existing) {
+			IClasspathEntry curr= e.getClasspathEntry();
 			if (curr.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
 				if (projPath.equals(curr.getPath())) {
 					return true;
@@ -1028,14 +1023,13 @@ public class CPListElement {
     	result.fParentContainer= fParentContainer;
     	result.fCachedEntry= null;
     	result.fChildren= new ArrayList<>(fChildren.size());
-    	for (Iterator<Object> iterator= fChildren.iterator(); iterator.hasNext();) {
-    		Object child= iterator.next();
-    		if (child instanceof CPListElement) {
-    			result.fChildren.add(((CPListElement)child).copy());
-    		} else {
-	        	result.fChildren.add(((CPListElementAttribute)child).copy());
-    		}
-        }
+		for (Object child : fChildren) {
+			if (child instanceof CPListElement) {
+				result.fChildren.add(((CPListElement)child).copy());
+			} else {
+				result.fChildren.add(((CPListElementAttribute)child).copy());
+			}
+		}
     	result.fLinkTarget= fLinkTarget;
     	result.fOrginalLinkTarget= fOrginalLinkTarget;
 	    return result;
@@ -1043,9 +1037,7 @@ public class CPListElement {
 
     public void setAttributesFromExisting(CPListElement existing) {
     	Assert.isTrue(existing.getEntryKind() == getEntryKind());
-		CPListElementAttribute[] attributes= existing.getAllAttributes();
-		for (int i= 0; i < attributes.length; i++) {
-			CPListElementAttribute curr= attributes[i];
+		for (CPListElementAttribute curr : existing.getAllAttributes()) {
 			CPListElementAttribute elem= findAttributeElement(curr.getKey());
 			if (elem == null) {
 				createAttributeElement(curr.getKey(), curr.getValue(), curr.isBuiltIn());
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListLabelProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListLabelProvider.java
index 462ff8518b..298e0e879d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListLabelProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListLabelProvider.java
@@ -166,9 +166,9 @@ public class CPListLabelProvider extends LabelProvider implements IStyledLabelPr
 			if (patterns != null && patterns.length > 0) {
 				int patternsCount= 0;
 				StringBuilder buf= new StringBuilder();
-				for (int i= 0; i < patterns.length; i++) {
-					if (patterns[i].segmentCount() > 0) {
-						String pattern= BasicElementLabels.getPathLabel(patterns[i], false);
+				for (IPath p : patterns) {
+					if (p.segmentCount() > 0) {
+						String pattern= BasicElementLabels.getPathLabel(p, false);
 						if (patternsCount > 0) {
 							buf.append(NewWizardMessages.CPListLabelProvider_exclusion_filter_separator);
 						}
@@ -191,9 +191,9 @@ public class CPListLabelProvider extends LabelProvider implements IStyledLabelPr
 			if (patterns != null && patterns.length > 0) {
 				int patternsCount= 0;
 				StringBuilder buf= new StringBuilder();
-				for (int i= 0; i < patterns.length; i++) {
-					if (patterns[i].segmentCount() > 0) {
-						String pattern= BasicElementLabels.getPathLabel(patterns[i], false);
+				for (IPath p : patterns) {
+					if (p.segmentCount() > 0) {
+						String pattern= BasicElementLabels.getPathLabel(p, false);
 						if (patternsCount > 0) {
 							buf.append(NewWizardMessages.CPListLabelProvider_inclusion_filter_separator);
 						}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPUserLibraryElement.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPUserLibraryElement.java
index 9549e6881b..fbc1e7c24e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPUserLibraryElement.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPUserLibraryElement.java
@@ -92,9 +92,9 @@ public class CPUserLibraryElement {
 		fName= name;
 		fChildren= new ArrayList<>();
 		if (children != null) {
-			for (int i= 0; i < children.length; i++) {
-				children[i].setParentContainer(this);
-				fChildren.add(children[i]);
+			for (CPListElement child : children) {
+				child.setParentContainer(this);
+				fChildren.add(child);
 			}
 		}
 		fIsSystemLibrary= isSystemLibrary;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathAttributeConfigurationDescriptors.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathAttributeConfigurationDescriptors.java
index 6f688e34c2..8692b66970 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathAttributeConfigurationDescriptors.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathAttributeConfigurationDescriptors.java
@@ -115,9 +115,9 @@ public class ClasspathAttributeConfigurationDescriptors {
 	private static HashMap<String, Descriptor> readExtensions() {
 		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(JavaUI.ID_PLUGIN, ATT_EXTENSION);
 		HashMap<String, Descriptor> descriptors= new HashMap<>(elements.length * 2);
-		for (int i= 0; i < elements.length; i++) {
+		for (IConfigurationElement element : elements) {
 			try {
-				Descriptor curr= new Descriptor(elements[i]);
+				Descriptor curr= new Descriptor(element);
 				descriptors.put(curr.getKey(), curr);
 			} catch (CoreException e) {
 				JavaPlugin.log(e);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java
index a8640977f4..0e3044424e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java
@@ -119,8 +119,7 @@ public class ClasspathContainerDefaultPage extends NewElementWizardPage implemen
 
 	@Override
 	public void initialize(IJavaProject project, IClasspathEntry[] currentEntries) {
-		for (int i= 0; i < currentEntries.length; i++) {
-			IClasspathEntry curr= currentEntries[i];
+		for (IClasspathEntry curr : currentEntries) {
 			if (curr.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
 				fUsedPaths.add(curr.getPath());
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDescriptor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDescriptor.java
index 0a762866f9..2841025abf 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDescriptor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDescriptor.java
@@ -115,10 +115,9 @@ public class ClasspathContainerDescriptor {
 			ClasspathContainerDescriptor defaultPage= null;
 			String defaultPageName= ClasspathContainerDefaultPage.class.getName();
 
-			IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-			for (int i = 0; i < elements.length; i++) {
+			for (IConfigurationElement element : extensionPoint.getConfigurationElements()) {
 				try {
-					ClasspathContainerDescriptor curr= new ClasspathContainerDescriptor(elements[i]);
+					ClasspathContainerDescriptor curr= new ClasspathContainerDescriptor(element);
 					if (!WorkbenchActivityHelper.filterItem(curr)) {
 						if (defaultPageName.equals(curr.getPageClass())) {
 							defaultPage= curr;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerWizard.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerWizard.java
index 275687638d..fcfc8f8dad 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerWizard.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerWizard.java
@@ -178,9 +178,9 @@ public class ClasspathContainerWizard extends Wizard {
 
 
 	private ClasspathContainerDescriptor findDescriptorPage(ClasspathContainerDescriptor[] containers, IClasspathEntry entry) {
-		for (int i = 0; i < containers.length; i++) {
-			if (containers[i].canEdit(entry)) {
-				return containers[i];
+		for (ClasspathContainerDescriptor container : containers) {
+			if (container.canEdit(entry)) {
+				return container;
 			}
 		}
 		return null;
@@ -189,9 +189,8 @@ public class ClasspathContainerWizard extends Wizard {
 	@Override
 	public void dispose() {
 		if (fSelectionWizardPage != null) {
-			ClasspathContainerDescriptor[] descriptors= fSelectionWizardPage.getContainers();
-			for (int i= 0; i < descriptors.length; i++) {
-				descriptors[i].dispose();
+			for (ClasspathContainerDescriptor descriptor : fSelectionWizardPage.getContainers()) {
+				descriptor.dispose();
 			}
 		}
 		super.dispose();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CreateMultipleSourceFoldersDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CreateMultipleSourceFoldersDialog.java
index 81e996f287..6388816d0c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CreateMultipleSourceFoldersDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CreateMultipleSourceFoldersDialog.java
@@ -114,8 +114,7 @@ public class CreateMultipleSourceFoldersDialog extends TrayDialog {
 		fInsertedElements= new HashSet<>();
 		fNonExistingFolders= new Hashtable<>();
 
-		for (int i= 0; i < existingElements.length; i++) {
-			CPListElement cur= existingElements[i];
+		for (CPListElement cur : existingElements) {
 			if (cur.getResource() == null || !cur.getResource().exists()) {
 				addFakeFolder(fJavaProject.getProject(), cur);
 			}
@@ -130,9 +129,9 @@ public class CreateMultipleSourceFoldersDialog extends TrayDialog {
 		IProject[] allProjects= ResourcesPlugin.getWorkspace().getRoot().getProjects();
 		ArrayList<IProject> rejectedElements= new ArrayList<>(allProjects.length);
 		IProject currProject= fJavaProject.getProject();
-		for (int i= 0; i < allProjects.length; i++) {
-			if (!allProjects[i].equals(currProject)) {
-				rejectedElements.add(allProjects[i]);
+		for (IProject project : allProjects) {
+			if (!project.equals(currProject)) {
+				rejectedElements.add(project);
 			}
 		}
 		ViewerFilter filter= new TypedViewerFilter(acceptedClasses, rejectedElements.toArray()){
@@ -196,9 +195,8 @@ public class CreateMultipleSourceFoldersDialog extends TrayDialog {
 		dialog.setInitialFocus(fJavaProject.getProject());
 
 		if (dialog.open() == Window.OK) {
-			Object[] elements= dialog.getResult();
-			for (int i= 0; i < elements.length; i++) {
-				IResource res= (IResource)elements[i];
+			for (Object element : dialog.getResult()) {
+				IResource res= (IResource) element;
 				fInsertedElements.add(new CPListElement(fJavaProject, IClasspathEntry.CPE_SOURCE, res.getFullPath(), res));
 			}
 
@@ -286,8 +284,8 @@ public class CreateMultipleSourceFoldersDialog extends TrayDialog {
 
 	private List<IResource> getExistingContainers(CPListElement[] existingElements) {
 		List<IResource> res= new ArrayList<>();
-		for (int i= 0; i < existingElements.length; i++) {
-			IResource resource= existingElements[i].getResource();
+		for (CPListElement existingElement : existingElements) {
+			IResource resource= existingElement.getResource();
 			if (resource instanceof IContainer) {
 				res.add(resource);
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java
index c755e32fc1..a94a90f533 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java
@@ -70,8 +70,7 @@ public class EditVariableEntryDialog extends StatusDialog {
 
 		fExistingEntries= new HashSet<>();
 		if (existingEntries != null) {
-			for (int i = 0; i < existingEntries.length; i++) {
-				IPath curr= existingEntries[i];
+			for (IPath curr : existingEntries) {
 				if (!curr.equals(initialEntry)) {
 					fExistingEntries.add(curr);
 				}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionInclusionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionInclusionDialog.java
index 9dbb5d1562..9f75e970b8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionInclusionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionInclusionDialog.java
@@ -157,8 +157,8 @@ public class ExclusionInclusionDialog extends StatusDialog {
 		IPath[] pattern= (IPath[]) entryToEdit.getAttribute(key);
 
 		ArrayList<String> elements= new ArrayList<>(pattern.length);
-		for (int i= 0; i < pattern.length; i++) {
-			elements.add(pattern[i].toString());
+		for (IPath p : pattern) {
+			elements.add(p.toString());
 		}
 		patternList.setElements(elements);
 		patternList.selectFirstElement();
@@ -336,8 +336,8 @@ public class ExclusionInclusionDialog extends StatusDialog {
 
 		IPath[] res= ExclusionInclusionEntryDialog.chooseExclusionPattern(getShell(), fCurrSourceFolder, title, message, null, true);
 		if (res != null) {
-			for (int i= 0; i < res.length; i++) {
-				field.addElement(res[i].toString());
+			for (IPath p : res) {
+				field.addElement(p.toString());
 			}
 		}
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/JARFileSelectionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/JARFileSelectionDialog.java
index e21d68171f..7ea599114b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/JARFileSelectionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/JARFileSelectionDialog.java
@@ -160,8 +160,8 @@ public class JARFileSelectionDialog extends FilteredElementTreeSelectionDialog {
 				} else {
 					File[] listFiles= file.listFiles();
 					if (listFiles != null) {
-						for (int i= 0; i < listFiles.length; i++) {
-							if (select(viewer, file, listFiles[i])) {
+						for (File f : listFiles) {
+							if (select(viewer, file, f)) {
 								return true;
 							}
 						}
@@ -205,8 +205,7 @@ public class JARFileSelectionDialog extends FilteredElementTreeSelectionDialog {
 			if (nSelected == 0 || (nSelected > 1 && !fMultiSelect)) {
 				return new StatusInfo(IStatus.ERROR, "");  //$NON-NLS-1$
 			}
-			for (int i= 0; i < selection.length; i++) {
-				Object curr= selection[i];
+			for (Object curr : selection) {
 				if (curr instanceof File) {
 					File file= (File) curr;
 					if (!fAcceptFolders && !file.isFile()) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java
index 7e20739d11..83eef7af19 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java
@@ -19,7 +19,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -641,10 +640,10 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 					final IJavaProject project= element.getJavaProject();
 					if (project != null) {
 						try {
-							final IPackageFragmentRoot[] roots= project.getPackageFragmentRoots();
-							for (int index= 0; index < roots.length; index++) {
-								if (entry.equals(roots[index].getRawClasspathEntry()))
-									return roots[index];
+							for (IPackageFragmentRoot root : project.getPackageFragmentRoots()) {
+								if (entry.equals(root.getRawClasspathEntry())) {
+									return root;
+								}
 							}
 						} catch (JavaModelException exception) {
 							JavaPlugin.log(exception);
@@ -705,8 +704,7 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 			}
 		
 		}
-		for (Iterator<Map.Entry<CPListElement, HashSet<String>>> iter= containerEntriesToUpdate.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry<CPListElement, HashSet<String>> entry= iter.next();
+		for (Map.Entry<CPListElement, HashSet<String>> entry : containerEntriesToUpdate.entrySet()) {
 			CPListElement curr= entry.getKey();
 			HashSet<String> attribs= entry.getValue();
 			String[] changedAttributes= attribs.toArray(new String[attribs.size()]);
@@ -790,11 +788,10 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 		String key= elem.getKey();
 		CPListElement selElement= elem.getParent();
 
-		CPListElementAttribute[] allAttributes= selElement.getAllAttributes();
 		boolean canEditEncoding= false;
-		for (int i= 0; i < allAttributes.length; i++) {
-			if (CPListElement.SOURCE_ATTACHMENT_ENCODING.equals(allAttributes[i].getKey())) {
-				canEditEncoding= !(allAttributes[i].isNonModifiable() || allAttributes[i].isNotSupported());
+		for (CPListElementAttribute attribute : selElement.getAllAttributes()) {
+			if (CPListElement.SOURCE_ATTACHMENT_ENCODING.equals(attribute.getKey())) {
+				canEditEncoding= !(attribute.isNonModifiable() || attribute.isNotSupported());
 			}
 		}
 		if (key.equals(CPListElement.SOURCEATTACHMENT)) {
@@ -1116,9 +1113,7 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 		 	CPListElement ele= projelements.get(i);
 		 	// if root node, collect the CPList elements
 		 	if(ele.isRootNodeForPath()) {
-		 		ArrayList<Object> children= ((RootCPListElement)ele).getChildren();
-		 		for (Iterator<?> iterator= children.iterator(); iterator.hasNext();) {
-		 			Object object=  iterator.next();
+		 		for (Object object : ((RootCPListElement)ele).getChildren()) {
 		 			if(object instanceof CPListElement) {
 		 				flattenedProjElements.add((CPListElement) object);
 		 			}
@@ -1173,8 +1168,7 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 			if (selected != null) {
 				IWorkspaceRoot root= fCurrJProject.getProject().getWorkspace().getRoot();
 				ArrayList<CPListElement> res= new ArrayList<>();
-				for (int i= 0; i < selected.length; i++) {
-					IPath curr= selected[i];
+				for (IPath curr : selected) {
 					IResource resource= root.findMember(curr);
 					if (resource instanceof IContainer) {
 						CPListElement newCPLibraryElement= newCPLibraryElement(resource);
@@ -1198,8 +1192,7 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 			if (selected != null) {
 				ArrayList<CPListElement> res= new ArrayList<>();
 
-				for (int i= 0; i < selected.length; i++) {
-					IPath curr= selected[i];
+				for (IPath curr : selected) {
 					IResource resource= root.findMember(curr);
 					if (resource instanceof IFile) {
 						CPListElement newCPLibraryElement= newCPLibraryElement(resource);
@@ -1272,8 +1265,8 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 			IPath[] selected= BuildPathDialogAccess.chooseExternalJAREntries(getShell());
 			if (selected != null) {
 				ArrayList<CPListElement> res= new ArrayList<>();
-				for (int i= 0; i < selected.length; i++) {
-					CPListElement cpListElement= new CPListElement(fCurrJProject, IClasspathEntry.CPE_LIBRARY, selected[i], null);
+				for (IPath p : selected) {
+					CPListElement cpListElement= new CPListElement(fCurrJProject, IClasspathEntry.CPE_LIBRARY, p, null);
 					cpListElement.setModuleAttributeIf9OrHigher(fCurrJProject);
 					res.add(cpListElement);
 				}
@@ -1299,8 +1292,8 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 			IPath[] selected= BuildPathDialogAccess.chooseExternalClassFolderEntries(getShell());
 			if (selected != null) {
 				ArrayList<CPListElement> res= new ArrayList<>();
-				for (int i= 0; i < selected.length; i++) {
-					CPListElement cpListElement= new CPListElement(fCurrJProject, IClasspathEntry.CPE_LIBRARY, selected[i], null);
+				for (IPath p : selected) {
+					CPListElement cpListElement= new CPListElement(fCurrJProject, IClasspathEntry.CPE_LIBRARY, p, null);
 					cpListElement.setModuleAttributeIf9OrHigher(fCurrJProject);
 					res.add(cpListElement);
 				}
@@ -1330,8 +1323,7 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 			IPath[] paths= BuildPathDialogAccess.chooseVariableEntries(getShell(), existingPathsArray);
 			if (paths != null) {
 				ArrayList<CPListElement> result= new ArrayList<>();
-				for (int i= 0; i < paths.length; i++) {
-					IPath path= paths[i];
+				for (IPath path : paths) {
 					CPListElement elem= createCPVariableElement(path);
 					if (!existingElements.contains(elem)) {
 						elem.setModuleAttributeIf9OrHigher(fCurrJProject);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsBlock.java
index 72e80c25e4..dfeee8b119 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsBlock.java
@@ -145,9 +145,9 @@ public class ModuleAddExportsBlock {
 	private Set<String> moduleNames() {
 		Set<String> moduleNames= new HashSet<>();
 		if (fSourceJavaElements != null) {
-			for (int i= 0; i < fSourceJavaElements.length; i++) {
-				if (fSourceJavaElements[i] instanceof IPackageFragmentRoot) {
-					IModuleDescription module= ((IPackageFragmentRoot) fSourceJavaElements[i]).getModuleDescription();
+			for (IJavaElement element : fSourceJavaElements) {
+				if (element instanceof IPackageFragmentRoot) {
+					IModuleDescription module= ((IPackageFragmentRoot) element).getModuleDescription();
 					if (module != null) {
 						moduleNames.add(module.getElementName());
 					}
@@ -323,9 +323,10 @@ public class ModuleAddExportsBlock {
 					assert fSourceJavaElements.length == 1;
 					IPackageFragmentRoot[] packageFragmentRoots= ((IJavaProject) fSourceJavaElements[0]).getPackageFragmentRoots();
 					int count= 0;
-					for (int i= 0; i < packageFragmentRoots.length; i++) {
-						if (packageFragmentRoots[i].getKind() == IPackageFragmentRoot.K_SOURCE) // only the project's own sources
-							packageFragmentRoots[count++]= packageFragmentRoots[i];
+					for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
+						if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
+							packageFragmentRoots[count++]= packageFragmentRoot;
+						}
 					}
 					if (count < packageFragmentRoots.length)
 						packageFragmentRoots= Arrays.copyOf(packageFragmentRoots, count);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsBlock.java
index 6d60ea1b65..f0f795d6a0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsBlock.java
@@ -114,9 +114,9 @@ public class ModuleAddReadsBlock {
 	private Set<String> moduleNames() {
 		Set<String> moduleNames= new HashSet<>();
 		if (fSourceJavaElements != null) {
-			for (int i= 0; i < fSourceJavaElements.length; i++) {
-				if (fSourceJavaElements[i] instanceof IPackageFragmentRoot) {
-					IModuleDescription module= ((IPackageFragmentRoot) fSourceJavaElements[i]).getModuleDescription();
+			for (IJavaElement element : fSourceJavaElements) {
+				if (element instanceof IPackageFragmentRoot) {
+					IModuleDescription module= ((IPackageFragmentRoot) element).getModuleDescription();
 					if (module != null) {
 						moduleNames.add(module.getElementName());
 					}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
index a914ccee6f..26368fcc24 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
@@ -726,9 +726,9 @@ public class ModuleDependenciesPage extends BuildPathBasePage {
 				// no longer relevant, remove:
 				ModuleEncapsulationDetail[] details= (ModuleEncapsulationDetail[]) value;
 				int retainCount= 0;
-				for (int i= 0; i < details.length; i++) {
-					if (!(details[i] instanceof LimitModules)) {
-						details[retainCount++]= details[i];
+				for (ModuleEncapsulationDetail detail : details) {
+					if (!(detail instanceof LimitModules)) {
+						details[retainCount++]= detail;
 					}
 				}
 				if (retainCount < details.length)
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java
index 052bc8c5b0..be3b8c0ef1 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java
@@ -751,9 +751,10 @@ public class ModuleDialog extends StatusDialog {
 		IClasspathAttribute[] oldAttributes= entry.getExtraAttributes();
 		IClasspathAttribute[] newAttributes= new IClasspathAttribute[oldAttributes.length];
 		int count= 0;
-		for (int i= 0; i < oldAttributes.length; i++) {
-			if (!oldAttributes[i].getName().equals(IClasspathAttribute.MODULE))
-				newAttributes[count++]= oldAttributes[i];
+		for (IClasspathAttribute oldAttribute : oldAttributes) {
+			if (!oldAttribute.getName().equals(IClasspathAttribute.MODULE)) {
+				newAttributes[count++]= oldAttribute;
+			}
 		}
 		if (count == oldAttributes.length)
 			return null;
@@ -766,25 +767,25 @@ public class ModuleDialog extends StatusDialog {
 			return fModuleNames;
 		Set<String> moduleNames= new HashSet<>();
 		if (fJavaElements != null) {
-			for (int i= 0; i < fJavaElements.length; i++) {
-				if (fJavaElements[i] instanceof IPackageFragmentRoot) {
-					IModuleDescription module= ((IPackageFragmentRoot) fJavaElements[i]).getModuleDescription();
+			for (IJavaElement element : fJavaElements) {
+				if (element instanceof IPackageFragmentRoot) {
+					IModuleDescription module= ((IPackageFragmentRoot) element).getModuleDescription();
 					if (module != null) {
 						recordModule(module, moduleNames);
 					} else {
 						try {
-							recordModule(JavaCore.getAutomaticModuleDescription(fJavaElements[i]), moduleNames);
-						} catch (JavaModelException e) {
+							recordModule(JavaCore.getAutomaticModuleDescription(element), moduleNames);
+						}catch (JavaModelException e) {
 							JavaPlugin.log(e);
 						}
 					}
-				} else if (fJavaElements[i] instanceof IJavaProject) {
+				} else if (element instanceof IJavaProject) {
 					try {
-						IModuleDescription module= ((IJavaProject) fJavaElements[i]).getModuleDescription();
+						IModuleDescription module= ((IJavaProject) element).getModuleDescription();
 						if (module != null) {
 							recordModule(module, moduleNames);
 						} else {
-							recordModule(JavaCore.getAutomaticModuleDescription(fJavaElements[i]), moduleNames);
+							recordModule(JavaCore.getAutomaticModuleDescription(element), moduleNames);
 						}
 					} catch (JavaModelException e) {
 						JavaPlugin.log(e);
@@ -798,9 +799,9 @@ public class ModuleDialog extends StatusDialog {
 	private List<String> defaultIncludedModuleNamesForUnnamedModule() {
 		if (fJavaElements != null) {
 			List<IPackageFragmentRoot> roots= new ArrayList<>();
-			for (int i= 0; i < fJavaElements.length; i++) {
-				if (fJavaElements[i] instanceof IPackageFragmentRoot) {
-					roots.add((IPackageFragmentRoot) fJavaElements[i]);
+			for (IJavaElement element : fJavaElements) {
+				if (element instanceof IPackageFragmentRoot) {
+					roots.add((IPackageFragmentRoot) element);
 				}
 			}
 			return JavaCore.defaultRootModules(roots);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewContainerDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewContainerDialog.java
index 422bcef719..36985d7f19 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewContainerDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewContainerDialog.java
@@ -143,8 +143,8 @@ public class NewContainerDialog extends StatusDialog {
 	}
 
 	private boolean isFolderExisting(IFolder folder) {
-		for (int i= 0; i < fExistingFolders.length; i++) {
-			if (folder.getFullPath().equals(fExistingFolders[i])) {
+		for (IPath existingFolder : fExistingFolders) {
+			if (folder.getFullPath().equals(existingFolder)) {
 				return true;
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java
index d6769a1596..16c8b87f45 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.wizards.buildpaths;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -167,8 +166,7 @@ public class NewVariableEntryDialog extends StatusDialog {
 	private void initializeElements() {
 		String[] entries= JavaCore.getClasspathVariableNames();
 		ArrayList<CPVariableElement> elements= new ArrayList<>(entries.length);
-		for (int i= 0; i < entries.length; i++) {
-			String name= entries[i];
+		for (String name : entries) {
 			IPath entryPath= JavaCore.getClasspathVariable(name);
 			if (entryPath != null) {
 				elements.add(new CPVariableElement(name, entryPath));
@@ -286,8 +284,7 @@ public class NewVariableEntryDialog extends StatusDialog {
 		if (fWarning == null || fWarning.isDisposed())
 			return;
 
-		for (Iterator<CPVariableElement> iter= fVariablesList.getSelectedElements().iterator(); iter.hasNext();) {
-			CPVariableElement element= iter.next();
+		for (CPVariableElement element : fVariablesList.getSelectedElements()) {
 			String deprecationMessage= element.getDeprecationMessage();
 			if (deprecationMessage != null) {
 				fWarning.setText(deprecationMessage);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java
index f3751fc762..42c3c7ecc0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java
@@ -231,9 +231,9 @@ public class OutputLocationDialog extends StatusDialog {
 		final Class<?>[] acceptedClasses= new Class[] { IProject.class, IFolder.class };
 		IProject[] allProjects= root.getProjects();
 		ArrayList<IProject> rejectedElements= new ArrayList<>(allProjects.length);
-		for (int i= 0; i < allProjects.length; i++) {
-			if (!allProjects[i].equals(fCurrProject)) {
-				rejectedElements.add(allProjects[i]);
+		for (IProject project : allProjects) {
+			if (!project.equals(fCurrProject)) {
+				rejectedElements.add(project);
 			}
 		}
 		ViewerFilter filter= new TypedViewerFilter(acceptedClasses, rejectedElements.toArray());
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
index eb29807f83..c74ebfab2c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
@@ -15,7 +15,6 @@ package org.eclipse.jdt.internal.ui.wizards.buildpaths;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
@@ -297,9 +296,7 @@ public class ProjectsWorkbookPage extends BuildPathBasePage {
 		 	CPListElement ele = projelements.get(i);
 		 	// if root node, collect the CPList elements
 		 	if(ele.isRootNodeForPath()) {
-		 		ArrayList<Object> children= ((RootCPListElement)ele).getChildren();
-		 		for (Iterator<?> iterator= children.iterator(); iterator.hasNext();) {
-		 			Object object=  iterator.next();
+		 		for (Object object : ((RootCPListElement)ele).getChildren()) {
 		 			if(object instanceof CPListElement) {
 		 				flattenedProjElements.add((CPListElement) object);
 		 			}
@@ -677,19 +674,14 @@ public class ProjectsWorkbookPage extends BuildPathBasePage {
 		selectable.addAll(Arrays.asList(fCurrJProject.getJavaModel().getJavaProjects()));
 		selectable.remove(fCurrJProject);
 
-		List<CPListElement> elements= fProjectsList.getElements();
-		for (int i= 0; i < elements.size(); i++) {
-			CPListElement curr= elements.get(i);
+		for (CPListElement curr : fProjectsList.getElements()) {
 			if (curr.isRootNodeForPath()) {
-				ArrayList<Object> children= ((RootCPListElement)curr).getChildren();
-				for (Iterator<?> iterator= children.iterator(); iterator.hasNext();) {
-					Object object=  iterator.next();
+				for (Object object : ((RootCPListElement)curr).getChildren()) {
 					if(object instanceof CPListElement) {
 						CPListElement cpe = (CPListElement)object;
 						IJavaProject proj= (IJavaProject) JavaCore.create(cpe.getResource());
 						selectable.remove(proj);
 					}
-					
 				}
 			}
 			IJavaProject proj= (IJavaProject) JavaCore.create(curr.getResource());
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SetFilterWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SetFilterWizardPage.java
index 9ee667a737..0812899bd3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SetFilterWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SetFilterWizardPage.java
@@ -188,8 +188,8 @@ public class SetFilterWizardPage extends NewElementWizardPage {
 		IPath[] pattern= (IPath[]) entryToEdit.getAttribute(key);
 
 		ArrayList<String> elements= new ArrayList<>(pattern.length);
-		for (int i= 0; i < pattern.length; i++) {
-			String patternName= pattern[i].toString();
+		for (IPath p : pattern) {
+			String patternName= p.toString();
 			if (patternName.length() > 0)
 				elements.add(patternName);
 		}
@@ -354,8 +354,8 @@ public class SetFilterWizardPage extends NewElementWizardPage {
 
 		IPath[] res= ExclusionInclusionEntryDialog.chooseExclusionPattern(getShell(), fCurrSourceFolder, title, message, null, true);
 		if (res != null) {
-			for (int i= 0; i < res.length; i++) {
-				field.addElement(res[i].toString());
+			for (IPath p : res) {
+				field.addElement(p.toString());
 			}
 		}
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java
index c7499e797b..1834c4d103 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java
@@ -741,9 +741,7 @@ public class SourceAttachmentBlock {
 			throw new IllegalArgumentException("Entry must be of kind CPE_LIBRARY or CPE_VARIABLE"); //$NON-NLS-1$
 		}
 
-		IClasspathAttribute[] extraAttributes= entry.getExtraAttributes();
-		for (int i= 0; i < extraAttributes.length; i++) {
-			IClasspathAttribute attrib= extraAttributes[i];
+		for (IClasspathAttribute attrib : entry.getExtraAttributes()) {
 			if (IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING.equals(attrib.getName())) {
 				return attrib.getValue();
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
index 3f75ff4f92..9e659f0f10 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
@@ -378,9 +378,8 @@ public class SourceContainerWorkbookPage extends BuildPathBasePage {
 	private boolean hasFolders(IContainer container) {
 
 		try {
-			IResource[] members= container.members();
-			for (int i= 0; i < members.length; i++) {
-				if (members[i] instanceof IContainer) {
+			for (IResource member : container.members()) {
+				if (member instanceof IContainer) {
 					return true;
 				}
 			}
@@ -511,9 +510,7 @@ public class SourceContainerWorkbookPage extends BuildPathBasePage {
 			for (Iterator<Object> iter= selElements.iterator(); iter.hasNext();) {
 				CPListElement element= (CPListElement)iter.next();
 				if (element.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-					List<CPListElement> list= ClasspathModifier.removeFilters(element.getPath(), fCurrJProject, fFoldersList.getElements());
-					for (Iterator<CPListElement> iterator= list.iterator(); iterator.hasNext();) {
-						CPListElement modified= iterator.next();
+					for (CPListElement modified : ClasspathModifier.removeFilters(element.getPath(), fCurrJProject, fFoldersList.getElements())) {
 						fFoldersList.refresh(modified);
 						fFoldersList.expandElement(modified, 3);
 					}
@@ -666,15 +663,13 @@ public class SourceContainerWorkbookPage extends BuildPathBasePage {
 
 	private void refresh(List<CPListElement> insertedElements, List<?> removedElements, List<CPListElement> modifiedElements, IPath outputLocation) {
 		fFoldersList.addElements(insertedElements);
-		for (Iterator<CPListElement> iter= insertedElements.iterator(); iter.hasNext();) {
-			CPListElement element= iter.next();
+		for (CPListElement element : insertedElements) {
 			fFoldersList.expandElement(element, 3);
 		}
 
 		fFoldersList.removeElements(removedElements);
 
-		for (Iterator<CPListElement> iter= modifiedElements.iterator(); iter.hasNext();) {
-			CPListElement element= iter.next();
+		for (CPListElement element : modifiedElements) {
 			fFoldersList.refresh(element);
 			fFoldersList.expandElement(element, 3);
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/UserLibraryWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/UserLibraryWizardPage.java
index 10d9904c83..93f4faa1d5 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/UserLibraryWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/UserLibraryWizardPage.java
@@ -131,8 +131,7 @@ public class UserLibraryWizardPage extends NewElementWizardPage implements IClas
 		Arrays.sort(names, Collator.getInstance());
 
 		ArrayList<CPUserLibraryElement> elements= new ArrayList<>(names.length);
-		for (int i= 0; i < names.length; i++) {
-			String curr= names[i];
+		for (String curr : names) {
 			IPath path= new Path(JavaCore.USER_LIBRARY_CONTAINER_ID).append(curr);
 			try {
 				IClasspathContainer container= JavaCore.getClasspathContainer(path, fProject);
@@ -334,8 +333,7 @@ public class UserLibraryWizardPage extends NewElementWizardPage implements IClas
 
 	@Override
 	public void initialize(IJavaProject project, IClasspathEntry[] currentEntries) {
-		for (int i= 0; i < currentEntries.length; i++) {
-			IClasspathEntry curr= currentEntries[i];
+		for (IClasspathEntry curr : currentEntries) {
 			if (curr.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
 				fUsedPaths.add(curr.getPath());
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableBlock.java
index c023acd3b7..14e400d044 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableBlock.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.wizards.buildpaths;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
@@ -227,8 +226,7 @@ public class VariableBlock {
 		if (fWarning == null || fWarning.isDisposed())
 			return;
 
-		for (Iterator<CPVariableElement> iter= fSelectedElements.iterator(); iter.hasNext();) {
-			CPVariableElement element= iter.next();
+		for (CPVariableElement element : fSelectedElements) {
 			String deprecationMessage= element.getDeprecationMessage();
 			if (deprecationMessage != null) {
 				fWarning.setText(deprecationMessage);
@@ -327,11 +325,8 @@ public class VariableBlock {
 	private boolean doesChangeRequireFullBuild(List<String> removed, List<String> changed) {
 		try {
 			IJavaModel model= JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-			IJavaProject[] projects= model.getJavaProjects();
-			for (int i= 0; i < projects.length; i++) {
-				IClasspathEntry[] entries= projects[i].getRawClasspath();
-				for (int k= 0; k < entries.length; k++) {
-					IClasspathEntry curr= entries[k];
+			for (IJavaProject project : model.getJavaProjects()) {
+				for (IClasspathEntry curr : project.getRawClasspath()) {
 					if (curr.getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
 						String var= curr.getPath().segment(0);
 						if (removed.contains(var) || changed.contains(var)) {
@@ -411,8 +406,7 @@ public class VariableBlock {
 
 		String[] entries= JavaCore.getClasspathVariableNames();
 		ArrayList<CPVariableElement> elements= new ArrayList<>(entries.length);
-		for (int i= 0; i < entries.length; i++) {
-			String name= entries[i];
+		for (String name : entries) {
 			CPVariableElement elem;
 			IPath entryPath= JavaCore.getClasspathVariable(name);
 			if (entryPath != null) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddLibraryToBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddLibraryToBuildpathAction.java
index 0e065f3e5c..764082d210 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddLibraryToBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddLibraryToBuildpathAction.java
@@ -129,8 +129,8 @@ public class AddLibraryToBuildpathAction extends BuildpathModifierAction {
 						pm.beginTask(NewWizardMessages.ClasspathModifier_Monitor_AddToBuildpath, 4);
 
 						List<CPListElement> addedEntries= new ArrayList<>();
-						for (int i= 0; i < selected.length; i++) {
-							addedEntries.add(CPListElement.create(selected[i], true, project));
+						for (IClasspathEntry entry : selected) {
+							addedEntries.add(CPListElement.create(entry, true, project));
 						}
 
 						pm.worked(1);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddSelectedLibraryToBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddSelectedLibraryToBuildpathAction.java
index 5579bc26ca..88ed5ed082 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddSelectedLibraryToBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddSelectedLibraryToBuildpathAction.java
@@ -130,8 +130,7 @@ public class AddSelectedLibraryToBuildpathAction extends BuildpathModifierAction
 		List<CPListElement> addedEntries= new ArrayList<>();
 		try {
 			monitor.beginTask(NewWizardMessages.ClasspathModifier_Monitor_AddToBuildpath, 4);
-			for (int i= 0; i < resources.length; i++) {
-				IResource res= resources[i];
+			for (IFile res : resources) {
 				CPListElement cpListElement= new CPListElement(project, IClasspathEntry.CPE_LIBRARY, res.getFullPath(), res);
 				if(fForTestOnly) {
 					cpListElement.setAttribute(IClasspathAttribute.TEST, "true"); //$NON-NLS-1$
@@ -153,8 +152,7 @@ public class AddSelectedLibraryToBuildpathAction extends BuildpathModifierAction
         	informListeners(delta);
 
 			List<IJavaElement> result= new ArrayList<>(addedEntries.size());
-			for (int i= 0; i < resources.length; i++) {
-				IResource res= resources[i];
+			for (IResource res : resources) {
 				IJavaElement elem= project.getPackageFragmentRoot(res);
 				if (elem != null) {
 					result.add(elem);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/BuildpathModifierAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/BuildpathModifierAction.java
index 52643f32a7..d80b646876 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/BuildpathModifierAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/BuildpathModifierAction.java
@@ -163,16 +163,15 @@ public abstract class BuildpathModifierAction extends Action implements ISelecti
 
 		// get all the view and editor parts
 		List<IWorkbenchPart> parts= new ArrayList<>();
-		IWorkbenchPartReference refs[]= page.getViewReferences();
-		for (int i= 0; i < refs.length; i++) {
-			IWorkbenchPart part= refs[i].getPart(false);
+		for (IWorkbenchPartReference ref : page.getViewReferences()) {
+			IWorkbenchPart part= ref.getPart(false);
 			if (part != null)
 				parts.add(part);
 		}
-		refs= page.getEditorReferences();
-		for (int i= 0; i < refs.length; i++) {
-			if (refs[i].getPart(false) != null)
-				parts.add(refs[i].getPart(false));
+		for (IWorkbenchPartReference ref : page.getEditorReferences()) {
+			if (ref.getPart(false) != null) {
+				parts.add(ref.getPart(false));
+			}
 		}
 
 		Iterator<IWorkbenchPart> itr= parts.iterator();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ClasspathModifierDropDownAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ClasspathModifierDropDownAction.java
index b5da4a1f18..c1b4bd2d93 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ClasspathModifierDropDownAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ClasspathModifierDropDownAction.java
@@ -15,7 +15,6 @@
 package org.eclipse.jdt.internal.ui.wizards.buildpaths.newsourcepage;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.widgets.Control;
@@ -154,16 +153,15 @@ public class ClasspathModifierDropDownAction extends BuildpathModifierAction imp
     }
 
 	private void update() {
-		for (Iterator<BuildpathModifierAction> iterator= fActions.iterator(); iterator.hasNext();) {
-	        BuildpathModifierAction action= iterator.next();
-	        if (action.isEnabled()) {
-	        	if (action != fFirstValidAction) {
-	        		updateButton(action);
-	        	}
-	        	fFirstValidAction= action;
-	        	return;
-	        }
-        }
+		for (BuildpathModifierAction action : fActions) {
+			if (action.isEnabled()) {
+				if (action != fFirstValidAction) {
+					updateButton(action);
+				}
+				fFirstValidAction= action;
+				return;
+			}
+		}
 		if (fFirstValidAction != null) {
 			if (fActions.size() > 0) {
 				updateButton(fActions.get(0));
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditFilterAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditFilterAction.java
index 491f015bbb..faf92a2a80 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditFilterAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditFilterAction.java
@@ -145,8 +145,7 @@ public class EditFilterAction extends BuildpathModifierAction {
 
 	private static CPListElement findElement(IJavaElement element, CPListElement[] elements) {
 		IPath path= element.getPath();
-		for (int i= 0; i < elements.length; i++) {
-			CPListElement cur= elements[i];
+		for (CPListElement cur : elements) {
 			if (cur.getEntryKind() == IClasspathEntry.CPE_SOURCE && cur.getPath().equals(path)) {
 				return cur;
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditOutputFolderAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditOutputFolderAction.java
index 75c8f01872..e7c4e88962 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditOutputFolderAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditOutputFolderAction.java
@@ -181,13 +181,12 @@ public class EditOutputFolderAction extends BuildpathModifierAction {
 	}
 
 	private IFolder getOldOutputFolder(final BuildpathDelta delta) {
-	    IResource[] deletedResources= delta.getDeletedResources();
 	    List<IResource> existingFolders= new ArrayList<>();
-	    for (int i= 0; i < deletedResources.length; i++) {
-	        if (deletedResources[i] instanceof IFolder && deletedResources[i].exists()) {
-	        	existingFolders.add(deletedResources[i]);
-	        }
-	    }
+		for (IResource deletedResource : delta.getDeletedResources()) {
+			if (deletedResource instanceof IFolder && deletedResource.exists()) {
+				existingFolders.add(deletedResource);
+			}
+		}
 	    if (existingFolders.size() > 0) {
 	    	if (existingFolders.size() > 1) {
 	    		String message= "Found more then one existing folders:"; //$NON-NLS-1$
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/RemoveFromBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/RemoveFromBuildpathAction.java
index d05d054581..6c8642bc6e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/RemoveFromBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/RemoveFromBuildpathAction.java
@@ -138,8 +138,7 @@ public class RemoveFromBuildpathAction extends BuildpathModifierAction {
 						CPJavaProject cpProject= CPJavaProject.createFromExisting(project);
 						CPListElement[] toRemove= new CPListElement[elementsToRemove.size()];
 						int i= 0;
-						for (Iterator<Object> iterator= elementsToRemove.iterator(); iterator.hasNext();) {
-							Object element= iterator.next();
+						for (Object element : elementsToRemove) {
 							if (element instanceof IJavaProject) {
 								toRemove[i]= ClasspathModifier.getListElement(((IJavaProject)element).getPath(), cpProject.getCPListElements());
 							} else if (element instanceof IPackageFragmentRoot) {
@@ -147,8 +146,8 @@ public class RemoveFromBuildpathAction extends BuildpathModifierAction {
 							} else {
 								toRemove[i]= CPListElement.createFromExisting(((ClassPathContainer)element).getClasspathEntry(), project);
 							}
-	                        i++;
-                        }
+							i++;
+						}
 
 						BuildpathDelta delta= ClasspathModifier.removeFromBuildpath(toRemove, cpProject);
 						ClasspathModifier.commitClassPath(cpProject, new SubProgressMonitor(monitor, 10));
@@ -200,8 +199,7 @@ public class RemoveFromBuildpathAction extends BuildpathModifierAction {
 
 	private void queryToRemoveLinkedFolders(final List<Object> elementsToRemove, final List<IFolder> foldersToDelete) throws JavaModelException {
 		final Shell shell= getShell();
-		for (Iterator<?> iter= getSelectedElements().iterator(); iter.hasNext();) {
-			Object element= iter.next();
+		for (Object element : getSelectedElements()) {
 			if (element instanceof IPackageFragmentRoot) {
 				IFolder folder= getLinkedSourceFolder((IPackageFragmentRoot)element);
 				if (folder != null) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java
index 8a4322b199..c23251edd0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java
@@ -14,7 +14,6 @@
 package org.eclipse.jdt.internal.ui.wizards.buildpaths.newsourcepage;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
@@ -127,11 +126,10 @@ public class ResetAllAction extends BuildpathModifierAction {
 	        			fJavaProject.setOutputLocation(fOutputLocation, monitor);
 	        			delta.setDefaultOutputLocation(fOutputLocation);
 
-	        			for (Iterator<IResource> iterator= fProvider.getCreatedResources().iterator(); iterator.hasNext();) {
-	                        IResource resource= iterator.next();
-	                        resource.delete(false, null);
-	                        delta.addDeletedResource(resource);
-                        }
+						for (IResource resource : fProvider.getCreatedResources()) {
+							resource.delete(false, null);
+							delta.addDeletedResource(resource);
+						}
 
 	        			fProvider.resetCreatedResources();
 
@@ -178,12 +176,11 @@ public class ResetAllAction extends BuildpathModifierAction {
             return true;
 
         int i= 0;
-        for (Iterator<CPListElement> iterator= fEntries.iterator(); iterator.hasNext();) {
-	        CPListElement oldEntrie= iterator.next();
-	        if (!oldEntrie.getClasspathEntry().equals(currentEntries[i]))
-	        	return true;
-	        i++;
-        }
+		for (CPListElement oldEntry : fEntries) {
+			if (!oldEntry.getClasspathEntry().equals(currentEntries[i]))
+				return true;
+			i++;
+		}
         return false;
 	}
 }
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllOutputFoldersAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllOutputFoldersAction.java
index 3337bbf9b0..368efe41b1 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllOutputFoldersAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllOutputFoldersAction.java
@@ -99,9 +99,8 @@ public class ResetAllOutputFoldersAction extends BuildpathModifierAction {
 			IPackageFragmentRoot[] roots= project.getPackageFragmentRoots();
 			monitor.beginTask(NewWizardMessages.ClasspathModifier_Monitor_ResetOutputFolder, roots.length + 10);
 			List<CPListElementAttribute> entries= new ArrayList<>();
-			for (int i= 0; i < roots.length; i++) {
+			for (IPackageFragmentRoot root : roots) {
 				monitor.worked(1);
-				IPackageFragmentRoot root= roots[i];
 				if (root.isArchive() || root.isExternal())
 					continue;
 				IClasspathEntry entry= root.getRawClasspathEntry();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java
index 3504fd44f3..e98f337182 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java
@@ -141,8 +141,8 @@ public class CheckedListDialogField<E> extends ListDialogField<E> {
 			// workaround for bug 53853
 			Object[] checked= ((CheckboxTableViewer) fTable).getCheckedElements();
 			ArrayList<E> res= new ArrayList<>(checked.length);
-			for (int i= 0; i < checked.length; i++) {
-				res.add((E) checked[i]);
+			for (Object c : checked) {
+				res.add((E) c);
 			}
 			return res;
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/LayoutUtil.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/LayoutUtil.java
index 79029a985c..f372e282a6 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/LayoutUtil.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/LayoutUtil.java
@@ -29,8 +29,8 @@ public class LayoutUtil {
 	 */
 	public static int getNumberOfColumns(DialogField[] editors) {
 		int nCulumns= 0;
-		for (int i= 0; i < editors.length; i++) {
-			nCulumns= Math.max(editors[i].getNumberOfControls(), nCulumns);
+		for (DialogField editor : editors) {
+			nCulumns= Math.max(editor.getNumberOfControls(), nCulumns);
 		}
 		return nCulumns;
 	}
@@ -76,8 +76,8 @@ public class LayoutUtil {
 	}
 
 	private static void modifyLabelSpans(Control[][] controls, int nCulumns) {
-		for (int i= 0; i < controls.length; i++) {
-			setHorizontalSpan(controls[i][0], nCulumns);
+		for (Control[] control : controls) {
+			setHorizontalSpan(control[0], nCulumns);
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java
index aba7bae839..e39ff4d2ba 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java
@@ -59,8 +59,8 @@ public class SelectionButtonDialogField extends DialogField {
 	 */
 	public void attachDialogFields(DialogField[] dialogFields) {
 		fAttachedDialogFields= dialogFields;
-		for (int i= 0; i < dialogFields.length; i++) {
-			dialogFields[i].setEnabled(fIsSelected);
+		for (DialogField dialogField : dialogFields) {
+			dialogField.setEnabled(fIsSelected);
 		}
 	}
 
@@ -69,8 +69,8 @@ public class SelectionButtonDialogField extends DialogField {
 	 */
 	public boolean isAttached(DialogField editor) {
 		if (fAttachedDialogFields != null) {
-			for (int i=0; i < fAttachedDialogFields.length; i++) {
-				if (fAttachedDialogFields[i] == editor) {
+			for (DialogField dialogField : fAttachedDialogFields) {
+				if (dialogField == editor) {
 					return true;
 				}
 			}
@@ -171,10 +171,10 @@ public class SelectionButtonDialogField extends DialogField {
 			fIsSelected= newState;
 			if (fAttachedDialogFields != null) {
 				boolean focusSet= false;
-				for (int i= 0; i < fAttachedDialogFields.length; i++) {
-					fAttachedDialogFields[i].setEnabled(fIsSelected);
+				for (DialogField dialogField : fAttachedDialogFields) {
+					dialogField.setEnabled(fIsSelected);
 					if (fIsSelected && !focusSet) {
-						focusSet= fAttachedDialogFields[i].setFocus();
+						focusSet= dialogField.setFocus();
 					}
 				}
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/AbstractWorkingSetWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/AbstractWorkingSetWizardPage.java
index e5d28b101c..8eb573a8a5 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/AbstractWorkingSetWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/AbstractWorkingSetWizardPage.java
@@ -330,9 +330,8 @@ public abstract class AbstractWorkingSetWizardPage extends WizardPage implements
 		addAllButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				TreeItem[] items= fTree.getTree().getItems();
-				for (int i= 0; i < items.length; i++) {
-					fSelectedElements.add(items[i].getData());
+				for (TreeItem item : fTree.getTree().getItems()) {
+					fSelectedElements.add(item.getData());
 				}
 				fTable.refresh();
 				fTree.refresh();
@@ -381,8 +380,8 @@ public abstract class AbstractWorkingSetWizardPage extends WizardPage implements
 		fTable.remove(selectedElements);
 		try {
 			fTree.getTree().setRedraw(false);
-			for (int i= 0; i < selectedElements.length; i++) {
-				fTree.refresh(fTreeContentProvider.getParent(selectedElements[i]), true);
+			for (Object selectedElement : selectedElements) {
+				fTree.refresh(fTreeContentProvider.getParent(selectedElement), true);
 			}
 		} finally {
 			fTree.getTree().setRedraw(true);
@@ -461,22 +460,21 @@ public abstract class AbstractWorkingSetWizardPage extends WizardPage implements
 			fWorkingSet.setId(getPageId());
 		} else {
 			// Add inaccessible resources
-			IAdaptable[] oldItems= fWorkingSet.getElements();
 			HashSet<IProject> closedProjectsToRetain= new HashSet<>(elements.size());
 			HashSet<IProject> closedProjectsToRemove= new HashSet<>(elements.size());
-			for (int i= 0; i < oldItems.length; i++) {
+			for (IAdaptable oldItem : fWorkingSet.getElements()) {
 				IResource oldResource= null;
-				if (oldItems[i] instanceof IResource) {
-					oldResource= (IResource) oldItems[i];
+				if (oldItem instanceof IResource) {
+					oldResource= (IResource) oldItem;
 				} else {
-					oldResource= oldItems[i].getAdapter(IResource.class);
+					oldResource= oldItem.getAdapter(IResource.class);
 				}
 				if (oldResource != null && oldResource.isAccessible() == false) {
 					IProject project= oldResource.getProject();
 					if (oldResource.equals(project)) {
 						closedProjectsToRetain.add(project);
-					} else	if (elements.contains(project)) {
-						elements.add(oldItems[i]);
+					} else if (elements.contains(project)) {
+						elements.add(oldItem);
 						closedProjectsToRemove.add(project);
 					}
 				}
@@ -508,9 +506,8 @@ public abstract class AbstractWorkingSetWizardPage extends WizardPage implements
 		fFirstCheck= false;
 
 		if (errorMessage == null && (fWorkingSet == null || newText.equals(fWorkingSet.getName()) == false)) {
-			IWorkingSet[] workingSets= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets();
-			for (int i= 0; i < workingSets.length; i++) {
-				if (newText.equals(workingSets[i].getName())) {
+			for (IWorkingSet workingSet : PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets()) {
+				if (newText.equals(workingSet.getName())) {
 					errorMessage= WorkingSetMessages.JavaWorkingSetPage_warning_workingSetExists;
 				}
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java
index 080f425811..0a5d36e056 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java
@@ -488,8 +488,8 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 
 		protected void addNewWorkingSet(IWorkingSet workingSet) {
 			int checkCount= 0;
-			for (int i= 0; i < fElements.length; i++) {
-				IAdaptable adapted= adapt(workingSet, fElements[i]);
+			for (IAdaptable element : fElements) {
+				IAdaptable adapted= adapt(workingSet, element);
 				if (adapted != null && contains(workingSet, adapted)) {
 					checkCount++;
 				}
@@ -563,9 +563,9 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 
 		private void recalculateCheckedState(List<IWorkingSet> addedWorkingSets) {
 			Set<IWorkingSet> checkedWorkingSets= new HashSet<>();
-			GrayedCheckedModelElement[] elements= fModel.getChecked();
-			for (int i= 0; i < elements.length; i++)
-				checkedWorkingSets.add(elements[i].getWorkingSet());
+			for (GrayedCheckedModelElement element : fModel.getChecked()) {
+				checkedWorkingSets.add(element.getWorkingSet());
+			}
 
 			if (addedWorkingSets != null)
 				checkedWorkingSets.addAll(addedWorkingSets);
@@ -618,9 +618,7 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 		if (selection.isEmpty())
 			return false;
 
-		List<?> list= selection.toList();
-		for (Iterator<?> iterator= list.iterator(); iterator.hasNext();) {
-			Object object= iterator.next();
+		for (Object object : selection.toList()) {
 			if (!(object instanceof IResource) && !(object instanceof IJavaElement))
 				return false;
 		}
@@ -631,9 +629,7 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 	private IAdaptable[] getSelectedElements(IStructuredSelection selection) {
 		ArrayList<Object> result= new ArrayList<>();
 
-		List<?> list= selection.toList();
-		for (Iterator<?> iterator= list.iterator(); iterator.hasNext();) {
-			Object object= iterator.next();
+		for (Object object : selection.toList()) {
 			if (object instanceof IResource || object instanceof IJavaElement) {
 				result.add(object);
 			}
@@ -673,9 +669,9 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 			IWorkingSet workingSet= workingSets[i];
 			
 			int checkCount= 0;
-			for (int j= 0; j < elements.length; j++) {
+			for (IAdaptable element : elements) {
 				if (checkedWorkingSets == null) {
-					IAdaptable adapted= adapt(workingSet, elements[j]);
+					IAdaptable adapted= adapt(workingSet, element);
 					if (adapted != null && contains(workingSet, adapted))
 						checkCount++;
 				} else {
@@ -693,26 +689,22 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 	private void updateWorkingSets(IWorkingSet[] newWorkingSets, IWorkingSet[] grayedWorkingSets, IAdaptable[] elements) {
 		HashSet<IWorkingSet> selectedSets= new HashSet<>(Arrays.asList(newWorkingSets));
 		HashSet<IWorkingSet> grayedSets= new HashSet<>(Arrays.asList(grayedWorkingSets));
-		IWorkingSet[] workingSets= getAllWorkingSets();
-
-		for (int i= 0; i < workingSets.length; i++) {
-			IWorkingSet workingSet= workingSets[i];
+		
+		for (IWorkingSet workingSet : getAllWorkingSets()) {
 			if (isValidWorkingSet(workingSet) && !selectedSets.contains(workingSet) && !grayedSets.contains(workingSet)) {
-				for (int j= 0; j < elements.length; j++) {
-					IAdaptable adapted= adapt(workingSet, elements[j]);
+				for (IAdaptable element : elements) {
+					IAdaptable adapted= adapt(workingSet, element);
 					if (adapted != null && contains(workingSet, adapted)) {
 						remove(workingSet, adapted);
 					}
 				}
 			}
 		}
-
-		for (int i= 0; i < newWorkingSets.length; i++) {
-			IWorkingSet set= newWorkingSets[i];
+		for (IWorkingSet set : newWorkingSets) {
 			if (isValidWorkingSet(set) && !grayedSets.contains(set)) {
 				boolean checkForYetHiddenWorkingSet= false;
-				for (int j= 0; j < elements.length; j++) {
-					IAdaptable adapted= adapt(set, elements[j]);
+				for (IAdaptable element : elements) {
+					IAdaptable adapted= adapt(set, element);
 					if (adapted != null && !contains(set, adapted)) {
 						add(set, adapted);
 						checkForYetHiddenWorkingSet= true;
@@ -784,9 +776,10 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 		if (!set.isEditable())
 			return false;
 
-		for (int i= 0; i < VALID_WORKING_SET_IDS.length; i++) {
-			if (VALID_WORKING_SET_IDS[i].equals(set.getId()))
+		for (String v : VALID_WORKING_SET_IDS) {
+			if (v.equals(set.getId())) {
 				return true;
+			}
 		}
 
 		return false;
@@ -803,10 +796,10 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 	}
 
 	private static boolean contains(IWorkingSet set, IAdaptable adaptedElement) {
-		IAdaptable[] elements= set.getElements();
-		for (int i= 0; i < elements.length; i++) {
-			if (elements[i].equals(adaptedElement))
+		for (IAdaptable element : set.getElements()) {
+			if (element.equals(adaptedElement)) {
 				return true;
+			}
 		}
 
 		return false;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/DynamicSourcesWorkingSetUpdater.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/DynamicSourcesWorkingSetUpdater.java
index 0b260405af..435587c4f1 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/DynamicSourcesWorkingSetUpdater.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/DynamicSourcesWorkingSetUpdater.java
@@ -201,12 +201,9 @@ public class DynamicSourcesWorkingSetUpdater implements IWorkingSetUpdater {
 			IJavaModel model= JavaCore.create(root);
 			List<IAdaptable> testResult= new ArrayList<>();
 			List<IAdaptable> mainResult= new ArrayList<>();
-			IJavaProject[] jProjects= model.getJavaProjects();
-			for (int i= 0; i < jProjects.length; i++) {
+			for (IJavaProject project : model.getJavaProjects()) {
 				if (monitor.isCanceled() || isDisposed.get())
 					return Status.CANCEL_STATUS;
-
-				final IJavaProject project= jProjects[i];
 				if (project.getProject().isOpen()) {
 					for (IPackageFragmentRoot iPackageFragmentRoot : project.getPackageFragmentRoots()) {
 						IClasspathEntry classpathEntry= iPackageFragmentRoot.getRawClasspathEntry();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetElementAdapter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetElementAdapter.java
index 3b3c9c9a2e..b55f3ef176 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetElementAdapter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetElementAdapter.java
@@ -34,8 +34,7 @@ public class JavaWorkingSetElementAdapter implements IWorkingSetElementAdapter {
 	public IAdaptable[] adaptElements(IWorkingSet ws, IAdaptable[] elements) {
 		ArrayList<Object> result= new ArrayList<>(elements.length);
 
-		for (int i= 0; i < elements.length; i++) {
-			IAdaptable curr= elements[i];
+		for (IAdaptable curr : elements) {
 			if (curr instanceof IJavaElement) {
 				result.add(curr);
 			} else if (curr instanceof IResource) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java
index 9ce329bebc..3560e93ee7 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java
@@ -126,8 +126,8 @@ public class JavaWorkingSetPage extends AbstractWorkingSetWizardPage {
 			try {
 				tree.getTree().setRedraw(false);
 
-				for (int i= 0; i < selection.length; i++) {
-					tree.expandToLevel(selection[i], 0);
+				for (Object s : selection) {
+					tree.expandToLevel(s, 0);
 				}
 				tree.setSelection(new StructuredSelection(selection));
 			} finally {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetUpdater.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetUpdater.java
index 315c1889c8..6904ee16b2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetUpdater.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetUpdater.java
@@ -118,13 +118,13 @@ public class JavaWorkingSetUpdater implements IWorkingSetUpdater, IElementChange
 		synchronized(fWorkingSets) {
 			workingSets= fWorkingSets.toArray(new IWorkingSet[fWorkingSets.size()]);
 		}
-		for (int w= 0; w < workingSets.length; w++) {
-			WorkingSetDelta workingSetDelta= new WorkingSetDelta(workingSets[w]);
+		for (IWorkingSet workingSet : workingSets) {
+			WorkingSetDelta workingSetDelta= new WorkingSetDelta(workingSet);
 			processJavaDelta(workingSetDelta, event.getDelta());
 			IResourceDelta[] resourceDeltas= event.getDelta().getResourceDeltas();
 			if (resourceDeltas != null) {
-				for (int r= 0; r < resourceDeltas.length; r++) {
-					processResourceDelta(workingSetDelta, resourceDeltas[r]);
+				for (IResourceDelta resourceDelta : resourceDeltas) {
+					processResourceDelta(workingSetDelta, resourceDelta);
 				}
 			}
 			workingSetDelta.process();
@@ -157,13 +157,12 @@ public class JavaWorkingSetUpdater implements IWorkingSetUpdater, IElementChange
 		}
 		IResourceDelta[] resourceDeltas= delta.getResourceDeltas();
 		if (resourceDeltas != null) {
-			for (int i= 0; i < resourceDeltas.length; i++) {
-				processResourceDelta(result, resourceDeltas[i]);
+			for (IResourceDelta resourceDelta : resourceDeltas) {
+				processResourceDelta(result, resourceDelta);
 			}
 		}
-		IJavaElementDelta[] children= delta.getAffectedChildren();
-		for (int i= 0; i < children.length; i++) {
-			processJavaDelta(result, children[i]);
+		for (IJavaElementDelta child : delta.getAffectedChildren()) {
+			processJavaDelta(result, child);
 		}
 	}
 
@@ -191,9 +190,8 @@ public class JavaWorkingSetUpdater implements IWorkingSetUpdater, IElementChange
 		if (projectGotClosedOrOpened(resource, kind, flags))
 			return;
 
-		IResourceDelta[] children= delta.getAffectedChildren();
-		for (int i= 0; i < children.length; i++) {
-			processResourceDelta(result, children[i]);
+		for (IResourceDelta child : delta.getAffectedChildren()) {
+			processResourceDelta(result, child);
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/OthersWorkingSetUpdater.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/OthersWorkingSetUpdater.java
index 7503a18196..e66ada3533 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/OthersWorkingSetUpdater.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/OthersWorkingSetUpdater.java
@@ -65,9 +65,7 @@ public class OthersWorkingSetUpdater implements IWorkingSetUpdater {
 			if (affectedChildren.length > 0) {
 				updateElements();
 			} else {
-				affectedChildren= delta.getAffectedChildren(IResourceDelta.CHANGED, IResource.PROJECT);
-				for (int i= 0; i < affectedChildren.length; i++) {
-					IResourceDelta projectDelta= affectedChildren[i];
+				for (IResourceDelta projectDelta : delta.getAffectedChildren(IResourceDelta.CHANGED, IResource.PROJECT)) {
 					if ((projectDelta.getFlags() & IResourceDelta.DESCRIPTION) != 0) {
 						updateElements();
 						// one is enough
@@ -122,9 +120,8 @@ public class OthersWorkingSetUpdater implements IWorkingSetUpdater {
 				// don't visit below projects
 				return;
 			}
-			IJavaElementDelta[] children= delta.getAffectedChildren();
-			for (int i= 0; i < children.length; i++) {
-				processJavaDelta(elements, children[i]);
+			for (IJavaElementDelta child : delta.getAffectedChildren()) {
+				processJavaDelta(elements, child);
 			}
 		}
 	}
@@ -176,15 +173,13 @@ public class OthersWorkingSetUpdater implements IWorkingSetUpdater {
 	public void updateElements() {
 		Assert.isTrue(fWorkingSet != null && fWorkingSetModel != null); // init and addWorkingSet have happend
 
-		IWorkingSet[] activeWorkingSets= fWorkingSetModel.getActiveWorkingSets();
-
 		List<IAdaptable> result= new ArrayList<>();
 		Set<IResource> projects= new HashSet<>();
-		for (int i= 0; i < activeWorkingSets.length; i++) {
-			if (activeWorkingSets[i] == fWorkingSet) continue;
-			IAdaptable[] elements= activeWorkingSets[i].getElements();
-			for (int j= 0; j < elements.length; j++) {
-				IAdaptable element= elements[j];
+		for (IWorkingSet activeWorkingSet : fWorkingSetModel.getActiveWorkingSets()) {
+			if (activeWorkingSet == fWorkingSet) {
+				continue;
+			}
+			for (IAdaptable element : activeWorkingSet.getElements()) {
 				IResource resource= element.getAdapter(IResource.class);
 				if (resource != null && resource.getType() == IResource.PROJECT) {
 					projects.add(resource);
@@ -193,15 +188,15 @@ public class OthersWorkingSetUpdater implements IWorkingSetUpdater {
 		}
 		IJavaModel model= JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
 		try {
-			IJavaProject[] jProjects= model.getJavaProjects();
-			for (int i= 0; i < jProjects.length; i++) {
-				if (!projects.contains(jProjects[i].getProject()))
-					result.add(jProjects[i]);
+			for (IJavaProject jProject : model.getJavaProjects()) {
+				if (!projects.contains(jProject.getProject())) {
+					result.add(jProject);
+				}
 			}
-			Object[] rProjects= model.getNonJavaResources();
-			for (int i= 0; i < rProjects.length; i++) {
-				if (!projects.contains(rProjects[i]))
-					result.add((IProject) rProjects[i]);
+			for (Object rProject : model.getNonJavaResources()) {
+				if (!projects.contains(rProject)) {
+					result.add((IProject) rProject);
+				}
 			}
 		} catch (JavaModelException e) {
 			JavaPlugin.log(e);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/RemoveWorkingSetElementAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/RemoveWorkingSetElementAction.java
index 89a7f54c8b..e98caa8362 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/RemoveWorkingSetElementAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/RemoveWorkingSetElementAction.java
@@ -15,8 +15,6 @@ package org.eclipse.jdt.internal.ui.workingsets;
 
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
 
 import org.eclipse.core.runtime.IAdaptable;
 
@@ -46,10 +44,8 @@ public class RemoveWorkingSetElementAction extends SelectionDispatchAction {
 		if (!(selection instanceof ITreeSelection))
 			return null;
 		ITreeSelection treeSelection= (ITreeSelection)selection;
-		List<?> elements= treeSelection.toList();
 		IWorkingSet result= null;
-		for (Iterator<?> iter= elements.iterator(); iter.hasNext();) {
-			Object element= iter.next();
+		for (Object element : treeSelection.toList()) {
 			TreePath[] paths= treeSelection.getPathsFor(element);
 			if (paths.length != 1)
 				return null;
@@ -75,9 +71,7 @@ public class RemoveWorkingSetElementAction extends SelectionDispatchAction {
 		if (ws == null)
 			return;
 		HashSet<IAdaptable> elements= new HashSet<>(Arrays.asList(ws.getElements()));
-		List<?> selectedElements= selection.toList();
-		for (Iterator<?> iter= selectedElements.iterator(); iter.hasNext();) {
-			Object object= iter.next();
+		for (Object object : selection.toList()) {
 			if (object instanceof IAdaptable) {
 				IAdaptable[] adaptedElements= ws.adaptElements(new IAdaptable[] {(IAdaptable)object});
 				if (adaptedElements.length == 1) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetConfigurationDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetConfigurationDialog.java
index 5ada818403..dd566b4113 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetConfigurationDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetConfigurationDialog.java
@@ -462,9 +462,8 @@ public class WorkingSetConfigurationDialog extends SelectionDialog {
 				if (fAddedWorkingSets.contains(workingSet)) {
 					fAddedWorkingSets.remove(workingSet);
 				} else {
-					IWorkingSet[] recentWorkingSets= manager.getRecentWorkingSets();
-					for (int i= 0; i < recentWorkingSets.length; i++) {
-						if (workingSet.equals(recentWorkingSets[i])) {
+					for (IWorkingSet recentWorkingSet : manager.getRecentWorkingSets()) {
+						if (workingSet.equals(recentWorkingSet)) {
 							fRemovedMRUWorkingSets.add(workingSet);
 							break;
 						}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilter.java
index 9d3d1bbc93..355a54b31e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilter.java
@@ -234,17 +234,16 @@ public class WorkingSetFilter extends JavaViewerFilter {
 	public boolean isEnclosing(IAdaptable a) {
 		WorkingSetCompareEntry curr= new WorkingSetCompareEntry(a);
 		if (fCachedCompareEntries != null) {
-			for (int i= 0; i < fCachedCompareEntries.length; i++) {
-				if (fCachedCompareEntries[i].contains(curr)) {
+			for (WorkingSetCompareEntry entry : fCachedCompareEntries) {
+				if (entry.contains(curr)) {
 					return  true;
 				}
 			}
 			return false;
 		}
 		if (fWorkingSet != null) {
-			IAdaptable[] elements= fWorkingSet.getElements();
-			for (int i= 0; i < elements.length; i++) {
-				if (new WorkingSetCompareEntry(elements[i]).contains(curr)) {
+			for (IAdaptable element : fWorkingSet.getElements()) {
+				if (new WorkingSetCompareEntry(element).contains(curr)) {
 					return true;
 				}
 			}
@@ -254,9 +253,8 @@ public class WorkingSetFilter extends JavaViewerFilter {
 
 	private boolean isEnclosing(PackageFragmentRootContainer container) {
 		// check whether the containing package fragment roots are enclosed
-		IAdaptable[] roots= container.getChildren();
-		for (int i= 0; i < roots.length; i++) {
-			if (isEnclosing(roots[i])) {
+		for (IAdaptable root : container.getChildren()) {
+			if (isEnclosing(root)) {
 				return true;
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilterActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilterActionGroup.java
index 33b2a43902..daa3238a75 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilterActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilterActionGroup.java
@@ -274,9 +274,9 @@ public class WorkingSetFilterActionGroup extends ActionGroup implements IWorking
 			addLRUWorkingSetAction(mm, currId++, fWorkbenchPage.getAggregateWorkingSet());
 		}
 
-		for (int i= 0; i < workingSets.length; i++) {
-			if (!workingSets[i].isAggregateWorkingSet()) {
-				addLRUWorkingSetAction(mm, currId++, workingSets[i]);
+		for (IWorkingSet workingSet : workingSets) {
+			if (!workingSet.isAggregateWorkingSet()) {
+				addLRUWorkingSetAction(mm, currId++, workingSet);
 			}
 		}
 		fLRUMenuCount= currId;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java
index aa219e4a0c..0e991f925a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java
@@ -122,8 +122,8 @@ public class WorkingSetModel {
 		}
 		public void rebuild(IWorkingSet[] workingSets) {
 			clear();
-			for (int i= 0; i < workingSets.length; i++) {
-				put(workingSets[i]);
+			for (IWorkingSet workingSet : workingSets) {
+				put(workingSet);
 			}
 		}
 		public IAdaptable[] refresh(IWorkingSet ws) {
@@ -145,11 +145,11 @@ public class WorkingSetModel {
 			return oldElements;
 		}
 		private void computeDelta(List<IAdaptable> toRemove, List<IAdaptable> toAdd, IAdaptable[] oldElements, IAdaptable[] newElements) {
-			for (int i= 0; i < oldElements.length; i++) {
-				toAdd.remove(oldElements[i]);
+			for (IAdaptable oldElement : oldElements) {
+				toAdd.remove(oldElement);
 			}
-			for (int i= 0; i < newElements.length; i++) {
-				toRemove.remove(newElements[i]);
+			for (IAdaptable newElement : newElements) {
+				toRemove.remove(newElement);
 			}
 
 		}
@@ -175,8 +175,7 @@ public class WorkingSetModel {
 				return;
 			IAdaptable[] elements= ws.getElements();
 			fWorkingSetToElement.put(ws, elements);
-			for (int i= 0; i < elements.length; i++) {
-				IAdaptable element= elements[i];
+			for (IAdaptable element : elements) {
 				addElement(element, ws);
 				if (!(element instanceof IProject) && !(element instanceof IJavaProject)) {
 					fNonProjectTopLevelElements.add(element);
@@ -319,8 +318,7 @@ public class WorkingSetModel {
 
 	public Object[] addWorkingSets(Object[] elements) {
 		List<? super IWorkingSet> result= null;
-		for (int i= 0; i < elements.length; i++) {
-			Object element= elements[i];
+		for (Object element : elements) {
 			List<IWorkingSet> sets= null;
 			if (element instanceof IResource) {
 				sets= fElementMapper.getAllWorkingSetsForResource((IResource)element);
@@ -392,15 +390,15 @@ public class WorkingSetModel {
 	private List<IWorkingSet> getActiveAndAllWorkingSetsFromManagers() {
 		List<IWorkingSet> result= new ArrayList<>();
 		result.addAll(fActiveWorkingSets);
-		IWorkingSet[] locals= fLocalWorkingSetManager.getWorkingSets();
-		for (int i= 0; i < locals.length; i++) {
-			if (!result.contains(locals[i]) && isSupportedAsTopLevelElement(locals[i]))
-				result.add(locals[i]);
+		for (IWorkingSet local : fLocalWorkingSetManager.getWorkingSets()) {
+			if (!result.contains(local) && isSupportedAsTopLevelElement(local)) {
+				result.add(local);
+			}
 		}
-		IWorkingSet[] globals= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets();
-		for (int i= 0; i < globals.length; i++) {
-			if (!result.contains(globals[i]) && isSupportedAsTopLevelElement(globals[i]))
-				result.add(globals[i]);
+		for (IWorkingSet global : PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets()) {
+			if (!result.contains(global) && isSupportedAsTopLevelElement(global)) {
+				result.add(global);
+			}
 		}
 
 		if (fIsSortingEnabled)
@@ -558,9 +556,7 @@ public class WorkingSetModel {
 
 		fConfigured= Boolean.valueOf(configured).booleanValue();
 		fLocalWorkingSetManager.restoreState(memento.getChild(TAG_LOCAL_WORKING_SET_MANAGER));
-		IWorkingSet[] allLocalWorkingSets= fLocalWorkingSetManager.getAllWorkingSets();
-		for (int i= 0; i < allLocalWorkingSets.length; i++) {
-			IWorkingSet ws= allLocalWorkingSets[i];
+		for (IWorkingSet ws : fLocalWorkingSetManager.getAllWorkingSets()) {
 			if (IWorkingSetIDs.OTHERS.equals(ws.getId())) {
 				// have to set the label again, since the locale could have been changed (bug 272737)
 				String otherProjectsLabel= WorkingSetMessages.WorkingSetModel_others_name;
@@ -577,9 +573,8 @@ public class WorkingSetModel {
 			fIsSortingEnabled= Boolean.valueOf(isSortingEnabled).booleanValue();
 		}
 
-		IMemento[] actives= memento.getChildren(TAG_ACTIVE_WORKING_SET);
-		for (int i= 0; i < actives.length; i++) {
-			String name= actives[i].getString(TAG_WORKING_SET_NAME);
+		for (IMemento active : memento.getChildren(TAG_ACTIVE_WORKING_SET)) {
+			String name= active.getString(TAG_WORKING_SET_NAME);
 			if (name != null) {
 				IWorkingSet ws= fLocalWorkingSetManager.getWorkingSet(name);
 				if (ws == null) {
@@ -590,9 +585,8 @@ public class WorkingSetModel {
 				}
 			}
 		}
-		IMemento[] allWorkingSets= memento.getChildren(TAG_ALL_WORKING_SETS);
-		for (int i= 0; i < allWorkingSets.length; i++) {
-			String name= allWorkingSets[i].getString(TAG_WORKING_SET_NAME);
+		for (IMemento allWorkingSet : memento.getChildren(TAG_ALL_WORKING_SETS)) {
+			String name= allWorkingSet.getString(TAG_WORKING_SET_NAME);
 			if (name != null) {
 				IWorkingSet ws= fLocalWorkingSetManager.getWorkingSet(name);
 				if (ws == null) {
@@ -681,9 +675,7 @@ public class WorkingSetModel {
 		if (!workingSet.isSelfUpdating() || workingSet.isAggregateWorkingSet())
 			return false;
 
-		IAdaptable[] elements= workingSet.getElements();
-		for (int i= 0; i < elements.length; i++) {
-			IAdaptable element= elements[i];
+		for (IAdaptable element : workingSet.getElements()) {
 			IProject p= element.getAdapter(IProject.class);
 			if (p != null && p.exists())
 				return true;