Use jdk 5 for-each loopI20190614-0330I20190613-1800

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

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

34 files changed, 190 insertions, 199 deletions

diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java
index 965acf01643..79ff070644f 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java
@@ -411,11 +411,11 @@ public class EncodingActionGroup extends ActionGroup {
 			editor.setAction(IEncodingActionsConstants.SYSTEM, a);
 		}
 
-		for (int i= 0; i < ENCODINGS.length; i++) {
-			a= new PredefinedEncodingAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ConvertEncoding." + ENCODINGS[i][0] + ".", ENCODINGS[i][0], editor); //$NON-NLS-1$ //$NON-NLS-2$
-			a.setHelpContextId( ENCODINGS[i][1]);
-			a.setActionDefinitionId( ENCODINGS[i][2]);
-			editor.setAction(ENCODINGS[i][0], a);
+		for (String[] e : ENCODINGS) {
+			a = new PredefinedEncodingAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ConvertEncoding." + e[0] + ".", e[0], editor); //$NON-NLS-1$ //$NON-NLS-2$
+			a.setHelpContextId(e[1]);
+			a.setActionDefinitionId(e[2]);
+			editor.setAction(e[0], a);
 		}
 
 		a= new CustomEncodingAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ConvertEncoding." + IEncodingActionsConstants.CUSTOM + ".", editor); //$NON-NLS-1$ //$NON-NLS-2$
@@ -435,8 +435,8 @@ public class EncodingActionGroup extends ActionGroup {
 		if (a instanceof IUpdate)
 			((IUpdate) a).update();
 
-		for (int i= 0; i < ENCODINGS.length; i++) {
-			a= fTextEditor.getAction(ENCODINGS[i][0]);
+		for (String[] e : ENCODINGS) {
+			a = fTextEditor.getAction(e[0]);
 			if (a instanceof IUpdate)
 				((IUpdate) a).update();
 		}
@@ -450,8 +450,9 @@ public class EncodingActionGroup extends ActionGroup {
 	public void dispose() {
 		if (fTextEditor != null) {
 			fTextEditor.setAction(IEncodingActionsConstants.SYSTEM, null);
-			for (int i= 0; i < ENCODINGS.length; i++)
-				fTextEditor.setAction(ENCODINGS[i][0], null);
+			for (String[] e : ENCODINGS) {
+				fTextEditor.setAction(e[0], null);
+			}
 			fTextEditor.setAction(IEncodingActionsConstants.CUSTOM, null);
 
 			fTextEditor= null;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java
index 8789be2cb63..c2798ab3430 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java
@@ -158,8 +158,7 @@ public class FileBufferOperationAction extends Action implements IWorkbenchWindo
 	 */
 	protected IFile[] collectFiles(IResource[] resources) {
 		Set<IResource> files= new HashSet<>();
-		for (int i= 0; i < resources.length; i++) {
-			IResource resource= resources[i];
+		for (IResource resource : resources) {
 			if ((IResource.FILE & resource.getType()) > 0)
 				files.add(resource);
 		}
@@ -206,8 +205,8 @@ public class FileBufferOperationAction extends Action implements IWorkbenchWindo
 		progressMonitor.beginTask(TextEditorMessages.FileBufferOperationAction_collectionFiles_label, files.length);
 		try {
 			Set<IPath> locations= new HashSet<>();
-			for (int i= 0; i < files.length; i++) {
-				IPath fullPath= files[i].getFullPath();
+			for (IFile file : files) {
+				IPath fullPath = file.getFullPath();
 				if (isAcceptableLocation(fullPath))
 					locations.add(fullPath);
 				progressMonitor.worked(1);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java
index d05ae47bdb9..b092b806f3c 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java
@@ -174,8 +174,7 @@ public class FileBufferOperationHandler extends AbstractHandler {
 	 */
 	protected IFile[] collectFiles(IResource[] resources) {
 		Set<IResource> files= new HashSet<>();
-		for (int i= 0; i < resources.length; i++) {
-			IResource resource= resources[i];
+		for (IResource resource : resources) {
 			if ((IResource.FILE & resource.getType()) > 0)
 				files.add(resource);
 		}
@@ -246,8 +245,8 @@ public class FileBufferOperationHandler extends AbstractHandler {
 		progressMonitor.beginTask(TextEditorMessages.FileBufferOperationHandler_collectionFiles_label, files.length);
 		try {
 			Set<IPath> locations= new HashSet<>();
-			for (int i= 0; i < files.length; i++) {
-				IPath fullPath= files[i].getFullPath();
+			for (IFile file : files) {
+				IPath fullPath = file.getFullPath();
 				if (isAcceptableLocation(fullPath))
 					locations.add(fullPath);
 				progressMonitor.worked(1);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.java
index ac9309a950f..4c2ac4fe7f4 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.java
@@ -90,14 +90,15 @@ public class ContributionContextTypeRegistry extends ContextTypeRegistry {
 
 		IConfigurationElement[] extensions= getTemplateExtensions();
 
-		for (int i= 0; i < extensions.length; i++) {
-			if (extensions[i].getName().equals(REGISTRY)) {
-				String id= extensions[i].getAttribute(ID);
+		for (IConfigurationElement extension : extensions) {
+			if (extension.getName().equals(REGISTRY)) {
+				String id = extension.getAttribute(ID);
 				if (registryId.equals(id)) {
-					for (int j= 0; j < extensions.length; j++) {
-						if (extensions[j].getName().equals(CONTEXT_TYPE)) {
-							if (registryId.equals(extensions[j].getAttribute(REGISTRY_ID)))
-								addContextType(extensions[j].getAttribute(ID));
+					for (IConfigurationElement extension2 : extensions) {
+						if (extension2.getName().equals(CONTEXT_TYPE)) {
+							if (registryId.equals(extension2.getAttribute(REGISTRY_ID))) {
+								addContextType(extension2.getAttribute(ID));
+							}
 						}
 					}
 					return;
@@ -150,8 +151,9 @@ public class ContributionContextTypeRegistry extends ContextTypeRegistry {
 			type= createContextType(extensions, id);
 			if (type != null) {
 				TemplateVariableResolver[] resolvers= createResolvers(extensions, id);
-				for (int i= 0; i < resolvers.length; i++)
-					type.addResolver(resolvers[i]);
+				for (TemplateVariableResolver resolver : resolvers) {
+					type.addResolver(resolver);
+				}
 			}
 		} catch (CoreException e) {
 			EditorsPlugin.log(e);
@@ -162,12 +164,13 @@ public class ContributionContextTypeRegistry extends ContextTypeRegistry {
 	}
 
 	private static TemplateContextType createContextType(IConfigurationElement[] extensions, String contextTypeId) throws CoreException {
-		for (int i= 0; i < extensions.length; i++) {
+		for (IConfigurationElement extension : extensions) {
 			// TODO create half-order over contributions
-			if (extensions[i].getName().equals(CONTEXT_TYPE)) {
-				String id= extensions[i].getAttribute(ID);
-				if (contextTypeId.equals(id))
-					return createContextType(extensions[i]);
+			if (extension.getName().equals(CONTEXT_TYPE)) {
+				String id = extension.getAttribute(ID);
+				if (contextTypeId.equals(id)) {
+					return createContextType(extension);
+				}
 			}
 		}
 
@@ -186,12 +189,12 @@ public class ContributionContextTypeRegistry extends ContextTypeRegistry {
 	 */
 	private static TemplateVariableResolver[] createResolvers(IConfigurationElement[] extensions, String contextTypeId) {
 		List<TemplateVariableResolver> resolvers= new ArrayList<>();
-		for (int i= 0; i < extensions.length; i++) {
-			if (extensions[i].getName().equals(RESOLVER)) {
-				String declaredId= extensions[i].getAttribute(CONTEXT_TYPE_ID);
+		for (IConfigurationElement extension : extensions) {
+			if (extension.getName().equals(RESOLVER)) {
+				String declaredId = extension.getAttribute(CONTEXT_TYPE_ID);
 				if (contextTypeId.equals(declaredId)) {
 					try {
-						TemplateVariableResolver resolver= createResolver(extensions[i]);
+						TemplateVariableResolver resolver = createResolver(extension);
 						if (resolver != null)
 							resolvers.add(resolver);
 					} catch (CoreException e) {
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java
index ba64a531f65..5b81e1d3147 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java
@@ -118,11 +118,11 @@ public class ContributionTemplateStore extends TemplateStore {
 
 	private Collection<TemplatePersistenceData> readContributedTemplates(IConfigurationElement[] extensions) throws IOException {
 		Collection<TemplatePersistenceData> templates= new ArrayList<>();
-		for (int i= 0; i < extensions.length; i++) {
-			if (extensions[i].getName().equals(TEMPLATE))
-				createTemplate(templates, extensions[i]);
-			else if (extensions[i].getName().equals(INCLUDE)) {
-				readIncludedTemplates(templates, extensions[i]);
+		for (IConfigurationElement extension : extensions) {
+			if (extension.getName().equals(TEMPLATE)) {
+				createTemplate(templates, extension);
+			} else if (extension.getName().equals(INCLUDE)) {
+				readIncludedTemplates(templates, extension);
 			}
 		}
 
@@ -149,8 +149,7 @@ public class ContributionTemplateStore extends TemplateStore {
 				try (InputStream stream= new BufferedInputStream(url.openStream())) {
 					TemplateReaderWriter reader= new TemplateReaderWriter();
 					TemplatePersistenceData[] datas= reader.read(stream, bundle);
-					for (int i= 0; i < datas.length; i++) {
-						TemplatePersistenceData data= datas[i];
+					for (TemplatePersistenceData data : datas) {
 						if (data.isCustom()) {
 							if (data.getId() == null)
 								EditorsPlugin.logErrorMessage(NLSUtility.format(ContributionTemplateMessages.ContributionTemplateStore_ignore_no_id, data.getTemplate().getName()));
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/CompositeRevertAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/CompositeRevertAction.java
index 2c62bc841d4..3362d46a237 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/CompositeRevertAction.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/CompositeRevertAction.java
@@ -47,8 +47,9 @@ public final class CompositeRevertAction extends Action implements IUpdate, ISel
 	 */
 	public CompositeRevertAction(ITextEditor editor, IAction[] actions) {
 		fActions= new IAction[actions.length];
-		for (int i= 0; i < actions.length; i++)
-			Assert.isNotNull(actions[i]);
+		for (IAction action : actions) {
+			Assert.isNotNull(action);
+		}
 
 		System.arraycopy(actions, 0, fActions, 0, actions.length);
 
@@ -61,9 +62,10 @@ public final class CompositeRevertAction extends Action implements IUpdate, ISel
 
 	@Override
 	public void update() {
-		for (int i= 0; i < fActions.length; i++) {
-			if (fActions[i] instanceof IUpdate)
-				((IUpdate) fActions[i]).update();
+		for (IAction fAction : fActions) {
+			if (fAction instanceof IUpdate) {
+				((IUpdate) fAction).update();
+			}
 		}
 		IAction action= getEnabledAction();
 		setEnabled(getEnabledAction() != null);
@@ -93,9 +95,10 @@ public final class CompositeRevertAction extends Action implements IUpdate, ISel
 	 *         enabled
 	 */
 	private IAction getEnabledAction() {
-		for (int i= 0; i < fActions.length; i++) {
-			if (fActions[i].isEnabled())
-				return fActions[i];
+		for (IAction fAction : fActions) {
+			if (fAction.isEnabled()) {
+				return fAction;
+			}
 		}
 		return null;
 	}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java
index c107070083b..e3667a55c19 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java
@@ -224,8 +224,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork
 
 		public int getIndex(EnumValue enumValue) {
 			int i= 0;
-			for (Iterator<EnumValue> it= fItems.iterator(); it.hasNext();) {
-				EnumValue ev= it.next();
+			for (EnumValue ev : fItems) {
 				if (ev.equals(enumValue))
 					return i;
 				i++;
@@ -240,8 +239,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork
 		}
 
 		public EnumValue getValueByInteger(int intValue) {
-			for (Iterator<EnumValue> it= fItems.iterator(); it.hasNext();) {
-				EnumValue e= it.next();
+			for (EnumValue e : fItems) {
 				if (e.getIntValue() == intValue)
 					return e;
 			}
@@ -443,8 +441,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork
 
 	private void initializeFields() {
 
-		for (Iterator<Initializer> it= fInitializers.iterator(); it.hasNext();) {
-			Initializer initializer= it.next();
+		for (Initializer initializer : fInitializers) {
 			initializer.initialize();
 		}
 
@@ -517,16 +514,16 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork
 		indent(slaves[0]);
 
 		boolean masterState= fOverlayStore.getBoolean(preference.getKey());
-		for (int i= 0; i < slaves.length; i++) {
-			slaves[i].setEnabled(masterState);
+		for (Control slave : slaves) {
+			slave.setEnabled(masterState);
 		}
 
 		SelectionListener listener= new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				boolean state= master.getSelection();
-				for (int i= 0; i < slaves.length; i++) {
-					slaves[i].setEnabled(state);
+				for (Control slave : slaves) {
+					slave.setEnabled(state);
 				}
 			}
 
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
index 6c6a82665b9..a07d3991eb1 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
@@ -438,8 +438,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock {
 		if (!(data instanceof String))
 			return;
 
-		for (int i= 0; i < fListModel.length; i++) {
-			final ListItem element= fListModel[i];
+		for (ListItem element : fListModel) {
 			if (data.equals(element.label)) {
 				final Control control= fAnnotationTypeViewer.getControl();
 				control.getDisplay().asyncExec(() -> {
@@ -646,8 +645,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock {
 	public void dispose() {
 		ImageRegistry registry= EditorsPlugin.getDefault().getImageRegistry();
 
-		for (Iterator<String> it= fImageKeys.iterator(); it.hasNext();) {
-			String string= it.next();
+		for (String string : fImageKeys) {
 			registry.remove(string);
 		}
 
@@ -690,8 +688,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock {
 			// set selection
 			if (selection == null) {
 				String val= item.textStyleKey == null ? SQUIGGLES[1] : fStore.getString(item.textStyleKey);
-				for (Iterator<String[]> iter= list.iterator(); iter.hasNext();) {
-					String[] elem= iter.next();
+				for (String[] elem : list) {
 					if (elem[1].equals(val)) {
 						selection= elem;
 						break;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java
index 47d92444ce8..a0b6eea45d4 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java
@@ -140,8 +140,7 @@ public class ConvertLineDelimitersAction extends FileBufferOperationAction {
 	 * @since 3.2
 	 */
 	private boolean containsOnlyFiles(IResource[] resources) {
-		for (int i= 0; i < resources.length; i++) {
-			IResource resource= resources[i];
+		for (IResource resource : resources) {
 			if ((IResource.FILE & resource.getType()) == 0)
 				return false;
 		}
@@ -158,8 +157,7 @@ public class ConvertLineDelimitersAction extends FileBufferOperationAction {
 	private IFile[] filterUnacceptableFiles(IFile[] files) {
 		boolean askForBinary= true;
 		Set<IFile> filtered= new HashSet<>();
-		for (int i= 0; i < files.length; i++) {
-			IFile file= files[i];
+		for (IFile file : files) {
 			if (isAcceptableLocation(file.getFullPath())) {
 				filtered.add(file);
 			} else if (askForBinary) {
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java
index af3c1c9446b..770021d8ab5 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java
@@ -178,9 +178,9 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl
 	private OverlayPreferenceStore.OverlayKey[] createOverlayStoreKeys() {
 		ArrayList<OverlayKey> overlayKeys= new ArrayList<>();
 
-		for (int i= 0; i < fHyperlinkDetectorDescriptors.length; i++) {
-			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, fHyperlinkDetectorDescriptors[i].getId()));
-			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, fHyperlinkDetectorDescriptors[i].getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX));
+		for (HyperlinkDetectorDescriptor fHyperlinkDetectorDescriptor : fHyperlinkDetectorDescriptors) {
+			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, fHyperlinkDetectorDescriptor.getId()));
+			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, fHyperlinkDetectorDescriptor.getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX));
 		}
 
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER));
@@ -432,9 +432,11 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl
 
 	private Object[] getCheckedItems() {
 		List<ListItem> result= new ArrayList<>();
-		for (int i= 0; i < fListModel.length; i++)
-			if (!fStore.getBoolean(fListModel[i].id))
-				result.add(fListModel[i]);
+		for (ListItem i : fListModel) {
+			if (!fStore.getBoolean(i.id)) {
+				result.add(i);
+			}
+		}
 		return result.toArray();
 	}
 
@@ -498,8 +500,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl
 
 	private ListItem[] createListModel() {
 		ArrayList<ListItem> listModelItems= new ArrayList<>();
-		for (int i= 0; i < fHyperlinkDetectorDescriptors.length; i++) {
-			HyperlinkDetectorDescriptor desc= fHyperlinkDetectorDescriptors[i];
+		for (HyperlinkDetectorDescriptor desc : fHyperlinkDetectorDescriptors) {
 			HyperlinkDetectorTargetDescriptor target= desc.getTarget();
 
 			int stateMask= fStore.getInt(desc.getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
index 05604cf898b..4b85bb89426 100755
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
@@ -466,8 +466,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock {
 			// set selection
 			if (selection == null) {
 				String val= getPreferenceStore().getString(item.textStyleKey);
-				for (Iterator<String[]> iter= list.iterator(); iter.hasNext();) {
-					String[] elem= iter.next();
+				for (String[] elem : list) {
 					if (elem[1].equals(val)) {
 						selection= elem;
 						break;
@@ -527,8 +526,8 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				boolean state= master.getSelection();
-				for (int i= 0; i < slaves.length; i++) {
-					slaves[i].setEnabled(state);
+				for (Control slave : slaves) {
+					slave.setEnabled(state);
 				}
 			}
 
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java
index c28ed597431..18814d16806 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java
@@ -144,8 +144,8 @@ public abstract class NextPreviousPulldownActionDelegate extends Action implemen
 	private void fillMenu(Menu menu) {
 		IAction[] actions= getActionsFromDescriptors();
 
-		for (int i= 0; i < actions.length; i++) {
-			ActionContributionItem item= new ActionContributionItem(actions[i]);
+		for (IAction action : actions) {
+			ActionContributionItem item = new ActionContributionItem(action);
 			item.fill(menu, -1);
 		}
 	}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java
index 360927d4f4f..1c18a282318 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java
@@ -102,9 +102,10 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	 * @return the overlay key or <code>null</code> if none can be found
 	 */
 	private OverlayKey findOverlayKey(String key) {
-		for (int i= 0; i < fOverlayKeys.length; i++) {
-			if (fOverlayKeys[i].fKey.equals(key))
-				return fOverlayKeys[i];
+		for (OverlayKey fOverlayKey : fOverlayKeys) {
+			if (fOverlayKey.fKey.equals(key)) {
+				return fOverlayKey;
+			}
 		}
 		return null;
 	}
@@ -185,8 +186,9 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	 * Propagates all overlay keys from this store to the parent store.
 	 */
 	public void propagate() {
-		for (int i= 0; i < fOverlayKeys.length; i++)
-			propagateProperty(fStore, fOverlayKeys[i], fParent);
+		for (OverlayKey fOverlayKey : fOverlayKeys) {
+			propagateProperty(fStore, fOverlayKey, fParent);
+		}
 	}
 
 	/**
@@ -248,8 +250,9 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	 * Loads the values from the parent into this store.
 	 */
 	public void load() {
-		for (int i= 0; i < fOverlayKeys.length; i++)
-			loadProperty(fParent, fOverlayKeys[i], fStore, true);
+		for (OverlayKey fOverlayKey : fOverlayKeys) {
+			loadProperty(fParent, fOverlayKey, fStore, true);
+		}
 
 		fLoaded= true;
 	}
@@ -258,8 +261,9 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	 * Loads the default values.
 	 */
 	public void loadDefaults() {
-		for (int i= 0; i < fOverlayKeys.length; i++)
-			setToDefault(fOverlayKeys[i].fKey);
+		for (OverlayKey fOverlayKey : fOverlayKeys) {
+			setToDefault(fOverlayKey.fKey);
+		}
 	}
 
 	/**
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java
index 0970136b8a3..c3f5fec0a20 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java
@@ -259,8 +259,8 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock {
 		fQuickDiffOverviewRulerCheckBox.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				for (int i= 0; i < fQuickDiffModel.length; i++) {
-					fStore.setValue(fQuickDiffModel[i][1], fQuickDiffOverviewRulerCheckBox.getSelection());
+				for (String[] fQuickDiff : fQuickDiffModel) {
+					fStore.setValue(fQuickDiff[1], fQuickDiffOverviewRulerCheckBox.getSelection());
 				}
 			}
 
@@ -378,12 +378,13 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock {
 		final boolean enabled= fEnablementCheckbox.getSelection();
 		fQuickDiffOverviewRulerCheckBox.setEnabled(enabled);
 		fQuickDiffProviderCombo.setEnabled(enabled);
-		for (int i= 0; i < fQuickDiffColorEditors.length; i++)
-			fQuickDiffColorEditors[i].setEnabled(enabled);
+		for (ColorSelector fQuickDiffColorEditor : fQuickDiffColorEditors) {
+			fQuickDiffColorEditor.setEnabled(enabled);
+		}
 		fQuickDiffProviderNote.setEnabled(enabled);
 		Control[] quickDiffProviderNoteChildren= fQuickDiffProviderNote.getChildren();
-		for (int i= 0; i < quickDiffProviderNoteChildren.length; i++) {
-			quickDiffProviderNoteChildren[i].setEnabled(enabled);
+		for (Control child : quickDiffProviderNoteChildren) {
+			child.setEnabled(enabled);
 		}
 	}
 
@@ -400,8 +401,8 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock {
 	@Override
 	public void initialize() {
 
-		for (int i= 0; i < fQuickDiffProviderListModel.length; i++) {
-			String label= fQuickDiffProviderListModel[i][1];
+		for (String[] fQuickDiffProvider : fQuickDiffProviderListModel) {
+			String label = fQuickDiffProvider[1];
 			fQuickDiffProviderCombo.add(label);
 		}
 		fQuickDiffProviderCombo.getDisplay().asyncExec(() -> updateProviderList());
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java
index c25a0aa873b..1962c0cbd14 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java
@@ -91,8 +91,7 @@ public class RemoveTrailingWhitespaceHandler extends FileBufferOperationHandler
 	 * @since 3.2
 	 */
 	private boolean containsOnlyFiles(IResource[] resources) {
-		for (int i= 0; i < resources.length; i++) {
-			IResource resource= resources[i];
+		for (IResource resource : resources) {
 			if ((IResource.FILE & resource.getType()) == 0)
 				return false;
 		}
@@ -108,8 +107,7 @@ public class RemoveTrailingWhitespaceHandler extends FileBufferOperationHandler
 	 */
 	private IFile[] filterUnacceptableFiles(IFile[] files) {
 		Set<IFile> filtered= new HashSet<>();
-		for (int i= 0; i < files.length; i++) {
-			IFile file= files[i];
+		for (IFile file : files) {
 			if (isAcceptableLocation(file.getFullPath()))
 				filtered.add(file);
 		}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java
index 9ff215c94f0..dc429846b1d 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java
@@ -345,8 +345,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList
 		}
 
 		Object[] treeChildren= treeContentProvider.getChildren(treeElement);
-		for (int i= 0; i < treeChildren.length; i++) {
-			Object child= treeChildren[i];
+		for (Object child : treeChildren) {
 			if (addAll)
 				findAllSelectedListElements(child, fullLabel, true, filter);
 			else { //Only continue for those with checked state
@@ -417,8 +416,8 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList
 
 			@Override
 			public void filterElements(Object[] elements) throws InterruptedException {
-				for (int i= 0; i < elements.length; i++) {
-					returnValue.add(elements[i]);
+				for (Object element : elements) {
+					returnValue.add(element);
 				}
 			}
 		};
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java
index 75ec3955a69..eece2dcc2ac 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java
@@ -136,8 +136,8 @@ class SelectResourcesDialog extends Dialog {
 			public Object[] getChildren(Object o) {
 				if (o instanceof IWorkspaceRoot) {
 					HashSet<IResource> projects= new HashSet<>();
-					for (int i= 0; i < fInput.length; i++) {
-						IResource project= fInput[i].getProject();
+					for (IResource f : fInput) {
+						IResource project = f.getProject();
 						if ((project.getType() & resourceType) > 0)
 							projects.add(project);
 					}
@@ -155,10 +155,10 @@ class SelectResourcesDialog extends Dialog {
 
 					//filter out the desired resource types
 					ArrayList<IResource> results = new ArrayList<>();
-					for (int i = 0; i < members.length; i++) {
+					for (IResource member : members) {
 						//And the test bits with the resource types to see if they are what we want
-						if ((members[i].getType() & resourceType) > 0 && (resourceType != IResource.FILE || fAcceptableLocationsFilter == null || fAcceptableLocationsFilter.accept(members[i]))) {
-							results.add(members[i]);
+						if ((member.getType() & resourceType) > 0 && (resourceType != IResource.FILE || fAcceptableLocationsFilter == null || fAcceptableLocationsFilter.accept(member))) {
+							results.add(member);
 						}
 					}
 					return results.toArray();
@@ -278,8 +278,7 @@ class SelectResourcesDialog extends Dialog {
 
 	protected void setSelection(IResource[] input, IFilter filter) {
 		Map<IContainer, List<Object>> selectionMap= new Hashtable<>();
-		for (int i= 0; i < input.length; i++) {
-			IResource resource= input[i];
+		for (IResource resource : input) {
 			if ((resource.getType() & IResource.FILE) > 0) {
 				if (filter.accept(resource)) {
 					List<Object> files= null;
@@ -305,8 +304,7 @@ class SelectResourcesDialog extends Dialog {
 			IResource[] resources= parent.members();
 			List<Object> selections= new ArrayList<>();
 
-			for (int i= 0; i < resources.length; i++) {
-				IResource resource= resources[i];
+			for (IResource resource : resources) {
 				if ((resource.getType() & IResource.FILE) > 0) {
 					if (filter.accept(resource))
 						selections.add(resource);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java
index 5788f49712e..7f886cc4742 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java
@@ -202,8 +202,8 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock {
 	private Map<String, SpellingEngineDescriptor> createListModel() {
 		SpellingEngineDescriptor[] descs= EditorsUI.getSpellingService().getSpellingEngineDescriptors();
 		Map<String, SpellingEngineDescriptor> map= new HashMap<>();
-		for (int i= 0; i < descs.length; i++) {
-			map.put(descs[i].getId(), descs[i]);
+		for (SpellingEngineDescriptor desc : descs) {
+			map.put(desc.getId(), desc);
 		}
 		return map;
 	}
@@ -421,8 +421,9 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock {
 	private void setEnabled(Control control, boolean enabled) {
 		if (control instanceof Composite) {
 			Control[] children= ((Composite) control).getChildren();
-			for (int i= 0; i < children.length; i++)
-				setEnabled(children[i], enabled);
+			for (Control c : children) {
+				setEnabled(c, enabled);
+			}
 		}
 		control.setEnabled(enabled);
 	}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusUtil.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusUtil.java
index d52fcfd9931..c9cd6b850f7 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusUtil.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusUtil.java
@@ -51,8 +51,7 @@ public class StatusUtil {
 	 */
 	public static IStatus getMostSevere(IStatus[] status) {
 		IStatus max= null;
-		for (int i= 0; i < status.length; i++) {
-			IStatus curr= status[i];
+		for (IStatus curr : status) {
 			if (curr.matches(IStatus.ERROR)) {
 				return curr;
 			}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java
index 5f95b5c26b7..ba477d723a1 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java
@@ -64,8 +64,8 @@ class TabFolderLayout extends Layout {
 		Rectangle rect= composite.getClientArea();
 
 		Control[] children = composite.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].setBounds(rect);
+		for (Control c : children) {
+			c.setBounds(rect);
 		}
 	}
 }
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java
index 23e1615359b..43a5380a7bf 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java
@@ -270,8 +270,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements
 
 		public int getIndex(EnumValue enumValue) {
 			int i= 0;
-			for (Iterator<EnumValue> it= fItems.iterator(); it.hasNext();) {
-				EnumValue ev= it.next();
+			for (EnumValue ev : fItems) {
 				if (ev.equals(enumValue))
 					return i;
 				i++;
@@ -286,8 +285,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements
 		}
 
 		public EnumValue getValueByInteger(int intValue) {
-			for (Iterator<EnumValue> it= fItems.iterator(); it.hasNext();) {
-				EnumValue e= it.next();
+			for (EnumValue e : fItems) {
 				if (e.getIntValue() == intValue)
 					return e;
 			}
@@ -449,8 +447,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements
 		}
 
 		private void initializeShowWhitespaceCharactersPreferences() {
-			for (Iterator<Initializer> it= fDialogInitializers.iterator(); it.hasNext();) {
-				Initializer initializer= it.next();
+			for (Initializer initializer : fDialogInitializers) {
 				initializer.initialize();
 			}
 		}
@@ -1039,8 +1036,9 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements
 
 		initializeFields();
 
-		for (int i= 0; i < fAppearanceColorListModel.length; i++)
-			fAppearanceColorList.add(fAppearanceColorListModel[i][0]);
+		for (String[] fAppearanceColor : fAppearanceColorListModel) {
+			fAppearanceColorList.add(fAppearanceColor[0]);
+		}
 		fAppearanceColorList.getDisplay().asyncExec(() -> {
 			if (fAppearanceColorList != null && !fAppearanceColorList.isDisposed()) {
 				fAppearanceColorList.select(0);
@@ -1050,8 +1048,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements
 	}
 
 	private void initializeFields() {
-		for (Iterator<Initializer> it= fInitializers.iterator(); it.hasNext();) {
-			Initializer initializer= it.next();
+		for (Initializer initializer : fInitializers) {
 			initializer.initialize();
 		}
 
@@ -1212,8 +1209,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
 		combo.setLayoutData(gd);
 		combo.setToolTipText(preference.getDescription());
-		for (Iterator<EnumValue> it= domain.fItems.iterator(); it.hasNext();) {
-			EnumValue value= it.next();
+		for (EnumValue value : domain.fItems) {
 			combo.add(value.getLabel());
 		}
 
@@ -1315,16 +1311,16 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements
 		indent(slaves[0]);
 
 		boolean masterState= fOverlayStore.getBoolean(preference.getKey());
-		for (int i= 0; i < slaves.length; i++) {
-			slaves[i].setEnabled(masterState);
+		for (Control slave : slaves) {
+			slave.setEnabled(masterState);
 		}
 
 		SelectionListener listener= new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				boolean state= master.getSelection();
-				for (int i= 0; i < slaves.length; i++) {
-					slaves[i].setEnabled(state);
+				for (Control slave : slaves) {
+					slave.setEnabled(state);
 				}
 			}
 
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationTypeHierarchy.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationTypeHierarchy.java
index 0131f8790c5..b45d305610a 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationTypeHierarchy.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationTypeHierarchy.java
@@ -92,9 +92,7 @@ public final class AnnotationTypeHierarchy {
 		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(EditorsUI.PLUGIN_ID, "annotationTypes"); //$NON-NLS-1$
 		if (extensionPoint != null) {
 			IConfigurationElement[] elements= extensionPoint.getConfigurationElements();
-			for (int i= 0; i < elements.length; i++) {
-				IConfigurationElement element= elements[i];
-
+			for (IConfigurationElement element : elements) {
 				String name= element.getAttribute("name");  //$NON-NLS-1$
 				if (name == null || name.trim().length() == 0)
 					continue;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/DelegatingAnnotationPreference.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/DelegatingAnnotationPreference.java
index 93ad4c6cfbc..10006a96201 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/DelegatingAnnotationPreference.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/DelegatingAnnotationPreference.java
@@ -53,8 +53,8 @@ public class DelegatingAnnotationPreference extends AnnotationPreference {
 			return p;
 
 		String[] superTypes= fType.getSuperTypes();
-		for (int i= 0; i < superTypes.length; i++) {
-			p= fLookup.getAnnotationPreferenceFragment(superTypes[i]);
+		for (String superType : superTypes) {
+			p = fLookup.getAnnotationPreferenceFragment(superType);
 			if (p != null && p.hasValue(attribute))
 				return p;
 		}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java
index c91c7f421b6..0f2b24c8e54 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java
@@ -399,9 +399,9 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements
 		if (column instanceof IRevisionRulerColumnExtension) {
 			String option= store.getString(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_RENDERING_MODE);
 			RenderingMode[] modes= { IRevisionRulerColumnExtension.AUTHOR, IRevisionRulerColumnExtension.AGE, IRevisionRulerColumnExtension.AUTHOR_SHADED_BY_AGE };
-			for (int i= 0; i < modes.length; i++) {
-				if (modes[i].name().equals(option)) {
-					((IRevisionRulerColumnExtension) column).setRevisionRenderingMode(modes[i]);
+			for (RenderingMode mode : modes) {
+				if (mode.name().equals(option)) {
+					((IRevisionRulerColumnExtension) column).setRevisionRenderingMode(mode);
 					return;
 				}
 			}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
index 3177c647890..604865342e1 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
@@ -174,8 +174,9 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 			fStatusField.setText(statusFieldText);
 			Font font= fStatusField.getFont();
 			FontData[] fontDatas= font.getFontData();
-			for (int i= 0; i < fontDatas.length; i++)
-				fontDatas[i].setHeight(fontDatas[i].getHeight() * 9 / 10);
+			for (FontData fontData : fontDatas) {
+				fontData.setHeight(fontData.getHeight() * 9 / 10);
+			}
 			fStatusTextFont= new Font(fStatusField.getDisplay(), fontDatas);
 			fStatusField.setFont(fStatusTextFont);
 			GridData gd2= new GridData(GridData.FILL_VERTICAL | GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
index 6c0f9af9060..76e411f0c7a 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
@@ -880,8 +880,8 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor {
 
 			if (sourceViewer instanceof ITextViewerExtension6) {
 				HyperlinkDetectorDescriptor[] descriptor= EditorsUI.getHyperlinkDetectorRegistry().getHyperlinkDetectorDescriptors();
-				for (int i= 0; i < descriptor.length; i++) {
-					if (descriptor[i].getId().equals(property) || (descriptor[i].getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX).equals(property)) {
+				for (HyperlinkDetectorDescriptor d : descriptor) {
+					if (d.getId().equals(property) || (d.getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX).equals(property)) {
 						IHyperlinkDetector[] detectors= getSourceViewerConfiguration().getHyperlinkDetectors(sourceViewer);
 						int stateMask= getSourceViewerConfiguration().getHyperlinkStateMask(sourceViewer);
 						ITextViewerExtension6 textViewer6= (ITextViewerExtension6)sourceViewer;
@@ -1113,9 +1113,10 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor {
 			return !isReadOnlyLocalStatus(status);
 
 		IStatus[] childrenStatus= status.getChildren();
-		for (int i= 0; i < childrenStatus.length; i++) {
-			if (childrenStatus[i].getSeverity() == IStatus.ERROR && !isReadOnlyLocalStatus(childrenStatus[i]))
+		for (IStatus childrenStatu : childrenStatus) {
+			if (childrenStatu.getSeverity() == IStatus.ERROR && !isReadOnlyLocalStatus(childrenStatu)) {
 				return true;
+			}
 		}
 
 		return false;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java
index 79f55b89dba..96f2f1c404f 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java
@@ -723,13 +723,13 @@ public class AbstractDecoratedTextEditorPreferenceConstants {
 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER_MASK, SWT.MOD1);
 
 		HyperlinkDetectorDescriptor[] descriptors= EditorsUI.getHyperlinkDetectorRegistry().getHyperlinkDetectorDescriptors();
-		for (int i= 0; i < descriptors.length; i++) {
-			int stateMask= computeStateMask(descriptors[i].getModifierKeys());
+		for (HyperlinkDetectorDescriptor descriptor : descriptors) {
+			int stateMask = computeStateMask(descriptor.getModifierKeys());
 			if (stateMask == SWT.SHIFT) {
-				EditorsPlugin.logErrorMessage("The '" + descriptors[i].getId() + "' hyperlink detector specifies 'Shift' as modifier. This is not allowed and hence replaced with the default modifier."); //$NON-NLS-1$ //$NON-NLS-2$
+				EditorsPlugin.logErrorMessage("The '" + descriptor.getId() + "' hyperlink detector specifies 'Shift' as modifier. This is not allowed and hence replaced with the default modifier."); //$NON-NLS-1$ //$NON-NLS-2$
 				stateMask= -1;
 			}
-			store.setDefault(descriptors[i].getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX, stateMask);
+			store.setDefault(descriptor.getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX, stateMask);
 		}
 
 		boolean isInstalled= EditorsUI.getSpellingService().getSpellingEngineDescriptors().length > 0;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java
index 2afcf8f0319..4cecc2c9f8c 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractMarkerAnnotationModel.java
@@ -280,16 +280,18 @@ public abstract class AbstractMarkerAnnotationModel extends AnnotationModel impl
 			}
 			//start sorting based on required-updater definition
 			HashMap<String, ArrayList<String>> markerUpdaterRequiredByOrderMap= new HashMap<>(2);
-			for (int i= 0; i < elements.length; i++) {
+			for (IConfigurationElement element : elements) {
 				// Required marker should execute before other updater markers
-				IConfigurationElement[] requiredUpdaters= elements[i].getChildren("required-updater"); //$NON-NLS-1$
+				IConfigurationElement[] requiredUpdaters = element.getChildren("required-updater"); //$NON-NLS-1$
 				if (requiredUpdaters.length > 0) {
 					//ArrayList requiredUpdaters= new ArrayList(2);
-					for (int j= 0; j < requiredUpdaters.length; j++) { // If required updaters have been defined
-						String requiredID= requiredUpdaters[j].getAttribute(ID);
+					for (IConfigurationElement requiredUpdater : requiredUpdaters) {
+						// If required updaters have been defined
+						String requiredID = requiredUpdater.getAttribute(ID);
 						// If required ID is not a valid id
-						if (requiredID == null || (markerUpdaterOrderMap.get(requiredID) == null)) { // ID missing or invalid - log the message and move to next contribution
-							String msg= NLSUtility.format(TextEditorMessages.AbstractMarkerAnnotationModel_updaterInvalidDefinition, new Object[] { elements[i].getAttribute(ID), requiredID });
+						if (requiredID == null || (markerUpdaterOrderMap.get(requiredID) == null)) {
+							// ID missing or invalid - log the message and move to next contribution
+							String msg = NLSUtility.format(TextEditorMessages.AbstractMarkerAnnotationModel_updaterInvalidDefinition, new Object[]{element.getAttribute(ID), requiredID});
 							EditorsPlugin.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, msg));
 							continue;
 						}
@@ -304,26 +306,27 @@ public abstract class AbstractMarkerAnnotationModel extends AnnotationModel impl
 							requiredByUpdaters= markerUpdaterRequiredByOrderMap.get(requiredID);
 						}
 						// Build up extended required id list to identify Case 2
-						if (markerUpdaterRequiredByOrderMap.get(elements[i].getAttribute(ID)) != null) {
-							ArrayList<String> requiredByList= markerUpdaterRequiredByOrderMap.get(elements[i].getAttribute(ID));
+						if (markerUpdaterRequiredByOrderMap.get(element.getAttribute(ID)) != null) {
+							ArrayList<String> requiredByList = markerUpdaterRequiredByOrderMap.get(element.getAttribute(ID));
 							requiredByUpdaters.addAll(requiredByList);
 						}
-						if (requiredByUpdaters.contains(requiredID)) { //log error if marker ID is in the required list of required ID
-							String msg= NLSUtility.format(TextEditorMessages.AbstractMarkerAnnotationModel_markerUpdaterCyclicDefinition, new Object[] { elements[i].getAttribute(ID), requiredID });
+						if (requiredByUpdaters.contains(requiredID)) {
+							//log error if marker ID is in the required list of required ID
+							String msg = NLSUtility.format(TextEditorMessages.AbstractMarkerAnnotationModel_markerUpdaterCyclicDefinition, new Object[]{element.getAttribute(ID), requiredID});
 							EditorsPlugin.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, msg));
 							continue;
 						}
-						requiredByUpdaters.add(elements[i].getAttribute(ID));
+						requiredByUpdaters.add(element.getAttribute(ID));
 						markerUpdaterRequiredByOrderMap.put(requiredID, requiredByUpdaters);
 
 						Integer requiredLocation= markerUpdaterOrderMap.get(requiredID);
-						if (requiredLocation.intValue() > markerUpdaterOrderMap.get(elements[i].getAttribute(ID)).intValue()) { // If required marker is not ordered before
-							int newLocation= (markerUpdaterOrderMap.get(elements[i].getAttribute(ID)).intValue() == 0) ? 0 : (markerUpdaterOrderMap.get(elements[i]
-									.getAttribute(ID)).intValue() - 1);
+						if (requiredLocation.intValue() > markerUpdaterOrderMap.get(element.getAttribute(ID)).intValue()) {
+							// If required marker is not ordered before
+							int newLocation = (markerUpdaterOrderMap.get(element.getAttribute(ID)).intValue() == 0) ? 0 : (markerUpdaterOrderMap.get(element.getAttribute(ID)).intValue() - 1);
 							IConfigurationElement requiredMarker= markerUpdaterSpecificationsLinkedList.remove(requiredLocation.intValue());
 							markerUpdaterSpecificationsLinkedList.add(newLocation, requiredMarker); // Put the required location before the marker
 							markerUpdaterOrderMap.put(requiredID, Integer.valueOf(newLocation));
-							markerUpdaterOrderMap.put(elements[i].getAttribute(ID), Integer.valueOf(newLocation + 1));
+							markerUpdaterOrderMap.put(element.getAttribute(ID), Integer.valueOf(newLocation + 1));
 						}
 					}
 				}
@@ -398,8 +401,7 @@ public abstract class AbstractMarkerAnnotationModel extends AnnotationModel impl
 		if (annotations != null && annotations.size() > 0) {
 
 			List<Annotation> markerAnnotations= new ArrayList<>();
-			for (Iterator<? extends Annotation> e= annotations.iterator(); e.hasNext();) {
-				Annotation a= e.next();
+			for (Annotation a : annotations) {
 				if (a instanceof MarkerAnnotation)
 					markerAnnotations.add(a);
 
@@ -467,8 +469,9 @@ public abstract class AbstractMarkerAnnotationModel extends AnnotationModel impl
 
 		IMarker[] markers= retrieveMarkers();
 		if (markers != null) {
-			for (int i= 0; i < markers.length; i++)
-				addMarkerAnnotation(markers[i]);
+			for (IMarker marker : markers) {
+				addMarkerAnnotation(marker);
+			}
 		}
 	}
 
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AnnotationTypeLookup.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AnnotationTypeLookup.java
index 151eaf187ab..996737dc17f 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AnnotationTypeLookup.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AnnotationTypeLookup.java
@@ -93,8 +93,8 @@ public final class AnnotationTypeLookup {
 		if (annotationType != null)
 			return annotationType;
 		String[] superTypes= MarkerUtilities.getSuperTypes(markerType);
-		for (int i= 0; i < superTypes.length; i++) {
-			annotationType= lookupAnnotationType(superTypes[i], markerSeverity);
+		for (String superType : superTypes) {
+			annotationType = lookupAnnotationType(superType, markerSeverity);
 			if (annotationType != null)
 				return annotationType;
 		}
@@ -180,8 +180,8 @@ public final class AnnotationTypeLookup {
 		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(EditorsUI.PLUGIN_ID, extensionPointName);
 		if (extensionPoint != null) {
 			IConfigurationElement[] elements= extensionPoint.getConfigurationElements();
-			for (int i= 0; i < elements.length; i++) {
-				AnnotationTypeMapping mapping= createMapping(elements[i], typeAttributeName);
+			for (IConfigurationElement element : elements) {
+				AnnotationTypeMapping mapping = createMapping(element, typeAttributeName);
 				if (mapping != null)
 					annotationTypeMappings.add(mapping);
 			}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java
index c08410cc061..8954d3f75db 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java
@@ -135,9 +135,9 @@ public class DocumentProviderRegistry {
 		}
 
 		IConfigurationElement[] elements= extensionPoint.getConfigurationElements();
-		for (int i= 0; i < elements.length; i++) {
-			read(fExtensionMapping, elements[i], "extensions"); //$NON-NLS-1$
-			read(fInputTypeMapping, elements[i], "inputTypes"); //$NON-NLS-1$
+		for (IConfigurationElement element : elements) {
+			read(fExtensionMapping, element, "extensions"); //$NON-NLS-1$
+			read(fInputTypeMapping, element, "inputTypes"); //$NON-NLS-1$
 		}
 	}
 
@@ -245,8 +245,7 @@ public class DocumentProviderRegistry {
 
 		List<Class<?>> toBeVisited= new ArrayList<>(interfaces.length);
 
-		for (int i= 0; i < interfaces.length; i++) {
-			Class<?> iface= interfaces[i];
+		for (Class<?> iface : interfaces) {
 			if (visited.get(iface) == null) {
 				visited.put(iface, iface);
 				result.add(iface);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java
index 9de18d0a4c6..d2c66462ff8 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java
@@ -290,8 +290,8 @@ public class MarkerAnnotationPreferences {
 		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(EditorsUI.PLUGIN_ID, "markerAnnotationSpecification"); //$NON-NLS-1$
 		if (extensionPoint != null) {
 			IConfigurationElement[] elements= extensionPoint.getConfigurationElements();
-			for (int i= 0; i < elements.length; i++) {
-				AnnotationPreference spec= createSpec(elements[i]);
+			for (IConfigurationElement element : elements) {
+				AnnotationPreference spec = createSpec(element);
 				if (spec != null)
 					fFragments.add(spec);
 				if (isComplete(spec))
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java
index 3039f5246a0..41aaed68b22 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java
@@ -350,9 +350,9 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate {
 			try {
 				IMarker[] allMarkers= resource.findMarkers(fMarkerType, true, IResource.DEPTH_ZERO);
 				if (allMarkers != null) {
-					for (int i= 0; i < allMarkers.length; i++) {
-						if (includesRulerLine(model.getMarkerPosition(allMarkers[i]), document)) {
-							markers.add(allMarkers[i]);
+					for (IMarker allMarker : allMarkers) {
+						if (includesRulerLine(model.getMarkerPosition(allMarker), document)) {
+							markers.add(allMarker);
 						}
 					}
 				}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java
index fd228130bd5..23b6fa8e54b 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java
@@ -89,8 +89,7 @@ public final class MarkerUtilities {
 		private <T> void appendAll(List<T> list, T[] objects) {
 			if (objects == null)
 				return;
-			for (int i= 0; i < objects.length; i++) {
-				T o= objects[i];
+			for (T o : objects) {
 				if (!list.contains(o))
 					list.add(o);
 			}
@@ -107,8 +106,7 @@ public final class MarkerUtilities {
 			IExtensionPoint point= Platform.getExtensionRegistry().getExtensionPoint(ResourcesPlugin.PI_RESOURCES, ResourcesPlugin.PT_MARKERS);
 			if (point != null) {
 				IExtension[] extensions = point.getExtensions();
-				for (int i= 0; i < extensions.length; i++) {
-					IExtension extension= extensions[i];
+				for (IExtension extension : extensions) {
 					ArrayList<String> types= new ArrayList<>();
 					IConfigurationElement[] configElements= extension.getConfigurationElements();
 					for (int j= 0; j < configElements.length; ++j) {
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java
index 9e2df92165e..236cc50e3a5 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java
@@ -123,8 +123,7 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel
 		HashSet<IMarker> removedMarkers= new HashSet<>(markerDeltas.length);
 		HashSet<IMarker> modifiedMarkers= new HashSet<>(markerDeltas.length);
 
-		for (int i= 0; i < markerDeltas.length; i++) {
-			IMarkerDelta delta= markerDeltas[i];
+		for (IMarkerDelta delta : markerDeltas) {
 			switch (delta.getKind()) {
 				case IResourceDelta.ADDED:
 					addMarkerAnnotation(delta.getMarker());