Bug 548309 - Use jdk 5 for-each loop

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

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

18 files changed, 58 insertions, 109 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackageWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackageWizardPage.java
index 90d6c4ad9d..47f04cb3ad 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackageWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackageWizardPage.java
@@ -725,8 +725,7 @@ public class FatJarPackageWizardPage extends AbstractJarDestinationWizardPage {
 		}
 
 		ArrayList<IJavaProject> result= new ArrayList<>();
-		for (int i= 0, size= projectNames.size(); i < size; i++) {
-			String name= projectNames.get(i);
+		for (String name : projectNames) {
 			IJavaProject project= getJavaProject(name);
 			if (project != null)
 				result.add(project);
@@ -871,8 +870,8 @@ public class FatJarPackageWizardPage extends AbstractJarDestinationWizardPage {
 		}
 
 		for (Iterator<IResource> iterator= resources.iterator(); iterator.hasNext();) {
-			IResource element= iterator.next();
-			if (element == null)
+			IResource resource= iterator.next();
+			if (resource == null)
 				iterator.remove();
 		}
 
@@ -897,8 +896,7 @@ public class FatJarPackageWizardPage extends AbstractJarDestinationWizardPage {
 	public void dispose() {
 		super.dispose();
 		if (fLauchConfigurationModel != null) {
-			for (int i= 0, size= fLauchConfigurationModel.size(); i < size; i++) {
-				LaunchConfigurationElement element= fLauchConfigurationModel.get(i);
+			for (LaunchConfigurationElement element : fLauchConfigurationModel) {
 				element.dispose();
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocOptionsManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocOptionsManager.java
index acc706445a..516a69d328 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocOptionsManager.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocOptionsManager.java
@@ -674,14 +674,7 @@ public class JavadocOptionsManager {
 	}
 
 	private String flatStringList(String[] paths) {
-		StringBuilder buf= new StringBuilder();
-		for (int i= 0; i < paths.length; i++) {
-			if (i > 0) {
-				buf.append(File.pathSeparatorChar);
-			}
-			buf.append(paths[i]);
-		}
-		return buf.toString();
+		return String.join(String.valueOf(File.pathSeparatorChar), paths);
 	}
 
 	private String[] arrayFromFlatString(String str) {
@@ -814,8 +807,7 @@ public class JavadocOptionsManager {
 		// bug 74132
 		String hostPrefix= "-J-Dhttp.proxyHost="; //$NON-NLS-1$
 		String portPrefix= "-J-Dhttp.proxyPort="; //$NON-NLS-1$
-		for (int i= 0; i < vmOptions.size(); i++) {
-			String curr= vmOptions.get(i);
+		for (String curr : vmOptions) {
 			if (curr.startsWith(hostPrefix) || curr.startsWith(portPrefix)) {
 				return;
 			}
@@ -1044,9 +1036,9 @@ public class JavadocOptionsManager {
 
 	private IJavaElement[] getInitialElementsFromSelection(List<?> candidates) {
 		ArrayList<IJavaElement> res= new ArrayList<>();
-		for (int i= 0; i < candidates.size(); i++) {
+		for (Object candidate : candidates) {
 			try {
-				IJavaElement elem= getSelectableJavaElement(candidates.get(i));
+				IJavaElement elem= getSelectableJavaElement(candidate);
 				if (elem != null) {
 					res.add(elem);
 				}
@@ -1105,9 +1097,9 @@ public class JavadocOptionsManager {
 			return false;
 		}
 
-		for (IJavaElement element : root.getChildren()) {
-			if (element instanceof IPackageFragment) {
-				IPackageFragment fragment= (IPackageFragment) element;
+		for (IJavaElement child : root.getChildren()) {
+			if (child instanceof IPackageFragment) {
+				IPackageFragment fragment= (IPackageFragment) child;
 				if (containsCompilationUnits(fragment)) {
 					return true;
 				}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java
index bc9e3b4444..4e4840477d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java
@@ -346,8 +346,7 @@ public class JavadocStandardWizardPage extends JavadocWizardPage {
 			case LINK_REFERENCES:
 				fLinkRefStatus= new StatusInfo();
 				List<JavadocLinkRef> list= fListDialogField.getCheckedElements();
-				for (int i= 0; i < list.size(); i++) {
-					JavadocLinkRef curr= list.get(i);
+				for (JavadocLinkRef curr : list) {
 					URL url= curr.getURL();
 					if (url == null) {
 						fLinkRefStatus.setWarning(JavadocExportMessages.JavadocStandardWizardPage_nolinkref_error);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocWizard.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocWizard.java
index ce056486e9..eea3650c82 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocWizard.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocWizard.java
@@ -76,6 +76,7 @@ import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 
+import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
 import org.eclipse.jdt.internal.corext.util.Messages;
 
 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
@@ -89,7 +90,6 @@ import org.eclipse.jdt.internal.ui.actions.OpenBrowserUtil;
 import org.eclipse.jdt.internal.ui.dialogs.OptionalMessageDialog;
 import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
 import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
-import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
 
 
 public class JavadocWizard extends Wizard implements IExportWizard {
@@ -301,8 +301,8 @@ public class JavadocWizard extends Wizard implements IExportWizard {
 			vmArgs.add('@' + file.getAbsolutePath());
 
 			try (BufferedWriter writer= new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), getEncoding(vmArgs)))) {
-				for (int i= 0; i < progArgs.size(); i++) {
-					String curr= progArgs.get(i);
+				for (String progArg : progArgs) {
+					String curr= progArg;
 					curr= checkForSpaces(curr);
 
 					writer.write(curr);
@@ -381,8 +381,7 @@ public class JavadocWizard extends Wizard implements IExportWizard {
 		}
 		StringBuilder buf= new StringBuilder();
 		buf.append('\'');
-		for (int i= 0; i < curr.length(); i++) {
-			char ch= curr.charAt(i);
+		for (char ch : curr.toCharArray()) {
 			if (ch == '\\' || ch == '\'') {
 				buf.append('\\');
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/RecentSettingsStore.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/RecentSettingsStore.java
index 2b3adf1ade..71a81c2197 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/RecentSettingsStore.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/RecentSettingsStore.java
@@ -15,7 +15,6 @@ package org.eclipse.jdt.internal.ui.javadocexport;
 
 import java.net.URL;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
@@ -121,9 +120,7 @@ public class RecentSettingsStore {
 
 		//Write all project information to DialogSettings.
 		Set<IJavaProject> keys= fPerProjectSettings.keySet();
-		for (Iterator<IJavaProject> iter= keys.iterator(); iter.hasNext();) {
-
-			IJavaProject curr= iter.next();
+		for (IJavaProject curr : keys) {
 
 			IDialogSettings proj= projectsSection.addNewSection(curr.getElementName());
 			if (!keys.contains(curr)) {
@@ -147,16 +144,7 @@ public class RecentSettingsStore {
 		}
 		data.setDestination(destination);
 		data.setAntpath(antpath);
-
-		StringBuilder refs= new StringBuilder();
-		for (int i= 0; i < hrefs.length; i++) {
-			if (i > 0) {
-				refs.append(REF_SEPARATOR);
-			}
-			refs.append(hrefs[i]);
-
-		}
-		data.setHRefs(refs.toString());
+		data.setHRefs(String.join(String.valueOf(REF_SEPARATOR), hrefs));
 	}
 
 	public static String[] getRefTokens(String refs) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ASTProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ASTProvider.java
index 2cdb35ba7a..5610c2f781 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ASTProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ASTProvider.java
@@ -210,8 +210,8 @@ public final class ASTProvider implements IASTSharedValues {
 
 		// Ensure existing windows get connected
 		IWorkbenchWindow[] windows= PlatformUI.getWorkbench().getWorkbenchWindows();
-		for (int i= 0, length= windows.length; i < length; i++)
-			windows[i].getPartService().addPartListener(fActivationListener);
+		for (IWorkbenchWindow window : windows)
+			window.getPartService().addPartListener(fActivationListener);
 	}
 
 	void activeJavaEditorChanged(IWorkbenchPart editor) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/BasicCompilationUnitEditorActionContributor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/BasicCompilationUnitEditorActionContributor.java
index 022ebdee26..37ac7036f6 100755
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/BasicCompilationUnitEditorActionContributor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/BasicCompilationUnitEditorActionContributor.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.javaeditor;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.jface.action.IAction;
@@ -122,8 +121,7 @@ public class BasicCompilationUnitEditorActionContributor extends BasicJavaEditor
 			caMenu.add(fRetargetContentAssist);
 			Collection<CompletionProposalCategory> descriptors= CompletionProposalComputerRegistry.getDefault().getProposalCategories();
 			List<IAction> specificAssistActions= new ArrayList<>(descriptors.size());
-			for (Iterator<CompletionProposalCategory> it= descriptors.iterator(); it.hasNext();) {
-				final CompletionProposalCategory cat= it.next();
+			for (CompletionProposalCategory cat : descriptors) {
 				if (cat.hasComputers()) {
 					IAction caAction= new SpecificContentAssistAction(cat);
 					caMenu.add(caAction);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClassFileDocumentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClassFileDocumentProvider.java
index b6f155468c..ce3d56fe16 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClassFileDocumentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClassFileDocumentProvider.java
@@ -14,7 +14,6 @@
 package org.eclipse.jdt.internal.ui.javaeditor;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
@@ -404,8 +403,8 @@ public class ClassFileDocumentProvider extends FileDocumentProvider {
 	 */
 	protected void fireInputChanged(IClassFileEditorInput input) {
 		List<InputChangeListener> list= new ArrayList<>(fInputListeners);
-		for (Iterator<InputChangeListener> i = list.iterator(); i.hasNext();)
-			i.next().inputChanged(input);
+		for (InputChangeListener inputChangeListener : list)
+			inputChangeListener.inputChanged(input);
 	}
 
 	/**
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClassFileEditor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClassFileEditor.java
index ceb0464311..cbe5e91b18 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClassFileEditor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClassFileEditor.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.javaeditor;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
@@ -331,13 +330,11 @@ public class ClassFileEditor extends JavaEditor implements ClassFileDocumentProv
 		@Override
 		public void propertyChange(PropertyChangeEvent event) {
 
-			for (Iterator<Label> iterator = fBannerLabels.iterator(); iterator.hasNext();) {
-				Label label = iterator.next();
+			for (Label label : fBannerLabels) {
 				label.setFont(JFaceResources.getBannerFont());
 			}
 
-			for (Iterator<Label> iterator = fHeaderLabels.iterator(); iterator.hasNext();) {
-				Label label = iterator.next();
+			for (Label label : fHeaderLabels) {
 				label.setFont(JFaceResources.getHeaderFont());
 			}
 
@@ -899,8 +896,7 @@ public class ClassFileEditor extends JavaEditor implements ClassFileDocumentProv
 			if (isUsingSourceCopyAction) {
 				createNavigationActions();
 			} else {
-				for (int i= 0; i < ACTION_MAP.length; i++) {
-					IdMapEntry entry= ACTION_MAP[i];
+				for (IdMapEntry entry : ACTION_MAP) {
 					actionBars.setGlobalActionHandler(entry.getActionId(), null);
 					setAction(entry.getActionId(), null);
 				}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClipboardOperationAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClipboardOperationAction.java
index 584f63780c..234ad4304c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClipboardOperationAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/ClipboardOperationAction.java
@@ -74,7 +74,6 @@ import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.Name;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
 import org.eclipse.jdt.core.manipulation.ImportReferencesCollector;
@@ -426,8 +425,8 @@ public final class ClipboardOperationAction extends TextEditorAction {
 		if (selection.getLength() < 30) {
 			String text= selection.getText();
 			if (text != null) {
-				for (int i= 0; i < text.length(); i++) {
-					if (!Character.isJavaIdentifierPart(text.charAt(i))) {
+				for (char c : text.toCharArray()) {
+					if (!Character.isJavaIdentifierPart(c)) {
 						return true;
 					}
 				}
@@ -466,8 +465,7 @@ public final class ClipboardOperationAction extends TextEditorAction {
 		}
 
 		HashSet<String> namesToImport= new HashSet<>(typeImportsRefs.size());
-		for (int i= 0; i < typeImportsRefs.size(); i++) {
-			Name curr= typeImportsRefs.get(i);
+		for (SimpleName curr : typeImportsRefs) {
 			IBinding binding= curr.resolveBinding();
 			if (binding != null && binding.getKind() == IBinding.TYPE) {
 				ITypeBinding typeBinding= (ITypeBinding) binding;
@@ -488,8 +486,7 @@ public final class ClipboardOperationAction extends TextEditorAction {
 		}
 
 		HashSet<String> staticsToImport= new HashSet<>(staticImportsRefs.size());
-		for (int i= 0; i < staticImportsRefs.size(); i++) {
-			Name curr= staticImportsRefs.get(i);
+		for (SimpleName curr : staticImportsRefs) {
 			IBinding binding= curr.resolveBinding();
 			if (binding != null) {
 				StringBuilder buf= new StringBuilder(Bindings.getImportName(binding));
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/CompilationUnitDocumentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/CompilationUnitDocumentProvider.java
index 755448bae2..291a47ca85 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/CompilationUnitDocumentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/CompilationUnitDocumentProvider.java
@@ -760,8 +760,8 @@ public class CompilationUnitDocumentProvider extends TextFileDocumentProvider im
 			Object value= getAnnotations(position);
 			if (value instanceof List) {
 				List<?> list= (List<?>) value;
-				for (Iterator<?> e = list.iterator(); e.hasNext();)
-					setOverlay(e.next(), problemAnnotation);
+				for (Object name : list)
+					setOverlay(name, problemAnnotation);
 			} else {
 				setOverlay(value, problemAnnotation);
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditor.java
index 59bb9f7bae..de423e8bf8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditor.java
@@ -3066,8 +3066,7 @@ public abstract class JavaEditor extends AbstractDecoratedTextEditor implements
 				int[] stateMasks= configuration.getConfiguredTextHoverStateMasks(getSourceViewer(), t);
 
 				if (stateMasks != null) {
-					for (int j= 0; j < stateMasks.length; j++)	{
-						int stateMask= stateMasks[j];
+					for (int stateMask : stateMasks) {
 						ITextHover textHover= configuration.getTextHover(sourceViewer, t, stateMask);
 						((ITextViewerExtension2)sourceViewer).setTextHover(textHover, t, stateMask);
 					}
@@ -3255,12 +3254,11 @@ public abstract class JavaEditor extends AbstractDecoratedTextEditor implements
 			// Add occurrence annotations
 			int length= fLocations.length;
 			Map<Annotation, Position> annotationMap= new HashMap<>(length);
-			for (int i= 0; i < length; i++) {
+			for (OccurrenceLocation location : fLocations) {
 
 				if (isCanceled(progressMonitor))
 					return Status.CANCEL_STATUS;
 
-				OccurrenceLocation location= fLocations[i];
 				Position position= new Position(location.getOffset(), location.getLength());
 
 				String description= location.getDescription();
@@ -3497,8 +3495,8 @@ public abstract class JavaEditor extends AbstractDecoratedTextEditor implements
 			if (annotationModel instanceof IAnnotationModelExtension) {
 				((IAnnotationModelExtension)annotationModel).replaceAnnotations(fOccurrenceAnnotations, null);
 			} else {
-				for (int i= 0, length= fOccurrenceAnnotations.length; i < length; i++)
-					annotationModel.removeAnnotation(fOccurrenceAnnotations[i]);
+				for (Annotation fOccurrenceAnnotation : fOccurrenceAnnotations)
+					annotationModel.removeAnnotation(fOccurrenceAnnotation);
 			}
 			fOccurrenceAnnotations= null;
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/OverrideIndicatorManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/OverrideIndicatorManager.java
index 4a1cb75af3..d3cbc14903 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/OverrideIndicatorManager.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/OverrideIndicatorManager.java
@@ -239,8 +239,8 @@ class OverrideIndicatorManager implements IJavaReconcilingListener {
 			if (fAnnotationModel instanceof IAnnotationModelExtension) {
 				((IAnnotationModelExtension)fAnnotationModel).replaceAnnotations(fOverrideAnnotations, null);
 			} else {
-				for (int i= 0, length= fOverrideAnnotations.length; i < length; i++)
-					fAnnotationModel.removeAnnotation(fOverrideAnnotations[i]);
+				for (Annotation fOverrideAnnotation : fOverrideAnnotations)
+					fAnnotationModel.removeAnnotation(fOverrideAnnotation);
 			}
 			fOverrideAnnotations= null;
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingManager.java
index b6721c42d9..73dff444d8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingManager.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingManager.java
@@ -445,8 +445,8 @@ public class SemanticHighlightingManager implements IPropertyChangeListener {
 	 * Dispose the semantic highlightings.
 	 */
 	private void disposeHighlightings() {
-		for (int i= 0, n= fSemanticHighlightings.length; i < n; i++)
-			removeColor(SemanticHighlightings.getColorPreferenceKey(fSemanticHighlightings[i]));
+		for (SemanticHighlighting fSemanticHighlighting : fSemanticHighlightings)
+			removeColor(SemanticHighlightings.getColorPreferenceKey(fSemanticHighlighting));
 
 		fSemanticHighlightings= null;
 		fHighlightings= null;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenter.java
index 7102421db8..c6810d8f63 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenter.java
@@ -102,14 +102,12 @@ public class SemanticHighlightingPresenter extends SemanticHighlightingPresenter
 
 		int minStart= Integer.MAX_VALUE;
 		int maxEnd= Integer.MIN_VALUE;
-		for (int i= 0, n= removedPositions.size(); i < n; i++) {
-			Position position= removedPositions.get(i);
+		for (Position position : removedPositions) {
 			int offset= position.getOffset();
 			minStart= Math.min(minStart, offset);
 			maxEnd= Math.max(maxEnd, offset + position.getLength());
 		}
-		for (int i= 0, n= addedPositions.size(); i < n; i++) {
-			Position position= addedPositions.get(i);
+		for (Position position : addedPositions) {
 			int offset= position.getOffset();
 			minStart= Math.min(minStart, offset);
 			maxEnd= Math.max(maxEnd, offset + position.getLength());
@@ -445,8 +443,8 @@ public class SemanticHighlightingPresenter extends SemanticHighlightingPresenter
 	 * @param highlighting The highlighting
 	 */
 	public void highlightingStyleChanged(Highlighting highlighting) {
-		for (int i= 0, n= fPositions.size(); i < n; i++) {
-			HighlightedPosition position= (HighlightedPosition) fPositions.get(i);
+		for (Position fPosition : fPositions) {
+			HighlightedPosition position= (HighlightedPosition) fPosition;
 			if (position.getHighlighting() == highlighting)
 				fSourceViewer.invalidateTextPresentation(position.getOffset(), position.getLength());
 		}
@@ -456,8 +454,7 @@ public class SemanticHighlightingPresenter extends SemanticHighlightingPresenter
 	 * Invalidate text presentation of all positions.
 	 */
 	private void invalidateTextPresentation() {
-		for (int i= 0, n= fPositions.size(); i < n; i++) {
-			Position position= fPositions.get(i);
+		for (Position position : fPositions) {
 			fSourceViewer.invalidateTextPresentation(position.getOffset(), position.getLength());
 		}
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingReconciler.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingReconciler.java
index 7b713d3516..acd7d84bda 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingReconciler.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingReconciler.java
@@ -57,7 +57,6 @@ import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings.YieldKeyword
 import org.eclipse.jdt.internal.ui.text.java.IJavaReconcilingListener;
 import org.eclipse.jdt.internal.ui.util.ASTHelper;
 
-
 /**
  * Semantic highlighting reconciler - Background thread implementation.
  *
@@ -397,12 +396,11 @@ public class SemanticHighlightingReconciler implements IJavaReconcilingListener,
 
 
 
-		for (int i= 0, n= subtrees.length; i < n; i++)
-			subtrees[i].accept(fCollector);
+		for (ASTNode subtree : subtrees)
+			subtree.accept(fCollector);
 		List<Position> oldPositions= fRemovedPositions;
 		List<Position> newPositions= new ArrayList<>(fNOfRemovedPositions);
-		for (int i= 0, n= oldPositions.size(); i < n; i ++) {
-			Position current= oldPositions.get(i);
+		for (Position current : oldPositions) {
 			if (current != null)
 				newPositions.add(current);
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java
index 85b1978c2a..6c96571892 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java
@@ -2163,8 +2163,7 @@ public class SemanticHighlightings {
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		SemanticHighlighting[] semanticHighlightings= getSemanticHighlightings();
-		for (int i= 0, n= semanticHighlightings.length; i < n; i++) {
-			SemanticHighlighting semanticHighlighting= semanticHighlightings[i];
+		for (SemanticHighlighting semanticHighlighting : semanticHighlightings) {
 			setDefaultAndFireEvent(store, SemanticHighlightings.getColorPreferenceKey(semanticHighlighting), semanticHighlighting.getDefaultTextColor());
 			store.setDefault(SemanticHighlightings.getBoldPreferenceKey(semanticHighlighting), semanticHighlighting.isBoldByDefault());
 			store.setDefault(SemanticHighlightings.getItalicPreferenceKey(semanticHighlighting), semanticHighlighting.isItalicByDefault());
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/breadcrumb/BreadcrumbViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/breadcrumb/BreadcrumbViewer.java
index efe2b2797d..4245ffc15e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/breadcrumb/BreadcrumbViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/breadcrumb/BreadcrumbViewer.java
@@ -203,8 +203,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer {
 	 * @return true if any of the items in the viewer is expanded
 	 */
 	public boolean isDropDownOpen() {
-		for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
-			BreadcrumbItem item= fBreadcrumbItems.get(i);
+		for (BreadcrumbItem item : fBreadcrumbItems) {
 			if (item.isMenuShown())
 				return true;
 		}
@@ -219,8 +218,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer {
 	 * @return the drop downs shell or <code>null</code>
 	 */
 	public Shell getDropDownShell() {
-		for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
-			BreadcrumbItem item= fBreadcrumbItems.get(i);
+		for (BreadcrumbItem item : fBreadcrumbItems) {
 			if (item.isMenuShown())
 				return item.getDropDownShell();
 		}
@@ -235,8 +233,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer {
 	 * @return the selection provider of the open drop down or <code>null</code>
 	 */
 	public ISelectionProvider getDropDownSelectionProvider() {
-		for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
-			BreadcrumbItem item= fBreadcrumbItems.get(i);
+		for (BreadcrumbItem item : fBreadcrumbItems) {
 			if (item.isMenuShown()) {
 				return item.getDropDownSelectionProvider();
 			}
@@ -335,8 +332,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer {
 		if (element == null)
 			return null;
 
-		for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
-			BreadcrumbItem item= fBreadcrumbItems.get(i);
+		for (BreadcrumbItem item : fBreadcrumbItems) {
 			if (item.getData() == element || element.equals(item.getData()))
 				return item;
 		}
@@ -405,8 +401,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer {
 		try {
 			BreadcrumbItem item= (BreadcrumbItem) doFindItem(element);
 			if (item == null) {
-				for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
-					BreadcrumbItem item1= fBreadcrumbItems.get(i);
+				for (BreadcrumbItem item1 : fBreadcrumbItems) {
 					item1.refresh();
 				}
 			} else {
@@ -426,8 +421,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer {
 	protected void setSelectionToWidget(List l, boolean reveal) {
 		BreadcrumbItem focusItem= null;
 
-		for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
-			BreadcrumbItem item= fBreadcrumbItems.get(i);
+		for (BreadcrumbItem item : fBreadcrumbItems) {
 			if (item.hasFocus())
 				focusItem= item;
 
@@ -437,8 +431,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer {
 		if (l == null)
 			return;
 
-		for (Iterator<?> iterator= l.iterator(); iterator.hasNext();) {
-			Object element= iterator.next();
+		for (Object element : l) {
 			BreadcrumbItem item= (BreadcrumbItem) doFindItem(element);
 			if (item != null) {
 				item.setSelected(true);
@@ -465,8 +458,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer {
 		if (item != null) {
 			setFocus();
 		} else {
-			for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
-				BreadcrumbItem listItem= fBreadcrumbItems.get(i);
+			for (BreadcrumbItem listItem : fBreadcrumbItems) {
 				listItem.setFocus(false);
 			}
 		}
@@ -695,8 +687,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer {
 	 */
 	private int getCurrentWidth() {
 		int result= 0;
-		for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
-			BreadcrumbItem viewer= fBreadcrumbItems.get(i);
+		for (BreadcrumbItem viewer : fBreadcrumbItems) {
 			result+= viewer.getWidth();
 		}