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>

15 files changed, 65 insertions, 83 deletions

diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/CompoundEditExitStrategy.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/CompoundEditExitStrategy.java
index deda8adbe61..1b5f8dc3567 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/CompoundEditExitStrategy.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/CompoundEditExitStrategy.java
@@ -97,9 +97,10 @@ public final class CompoundEditExitStrategy {
 		@Override
 		public void preExecute(String commandId, ExecutionEvent event) {
 			// any command other than the known ones end the compound change
-			for (int i= 0; i < fCommandIds.length; i++) {
-				if (commandId.equals(fCommandIds[i]))
+			for (String fCommandId : fCommandIds) {
+				if (commandId.equals(fCommandId)) {
 					return;
+				}
 			}
 			fireEndCompoundEdit();
 		}
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HippieCompletionEngine.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HippieCompletionEngine.java
index 8c24259fadf..8e37487539b 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HippieCompletionEngine.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HippieCompletionEngine.java
@@ -217,8 +217,7 @@ public final class HippieCompletionEngine {
 		HashSet<String> seenAlready= new HashSet<>();
 		ArrayList<String> uniqueSuggestions= new ArrayList<>();
 
-		for (Iterator<String> i= suggestions.iterator(); i.hasNext();) {
-			String suggestion= i.next();
+		for (String suggestion : suggestions) {
 			if (!seenAlready.contains(suggestion)) {
 				seenAlready.add(suggestion);
 				uniqueSuggestions.add(suggestion);
@@ -259,8 +258,8 @@ public final class HippieCompletionEngine {
 		IWorkbenchWindow window= currentTextEditor.getSite().getWorkbenchWindow();
 		IEditorReference editorsArray[]= window.getActivePage().getEditorReferences();
 
-		for (int i= 0; i < editorsArray.length; i++) {
-			IEditorPart realEditor= editorsArray[i].getEditor(false);
+		for (IEditorReference editor : editorsArray) {
+			IEditorPart realEditor = editor.getEditor(false);
 			if (realEditor instanceof ITextEditor && !realEditor.equals(currentTextEditor)) {
 				ITextEditor textEditor= (ITextEditor)realEditor;
 				provider= textEditor.getDocumentProvider();
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/CodeMiningProviderRegistry.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/CodeMiningProviderRegistry.java
index bd1cd04c85a..2c192d9ce0b 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/CodeMiningProviderRegistry.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/CodeMiningProviderRegistry.java
@@ -72,8 +72,7 @@ public class CodeMiningProviderRegistry {
 		List<CodeMiningProviderDescriptor> descriptors = new ArrayList<>();
 		IConfigurationElement[] elements = Platform.getExtensionRegistry()
 				.getConfigurationElementsFor(TextEditorPlugin.PLUGIN_ID, CODEMINING_PROVIDERS_EXTENSION_POINT);
-		for (int i = 0; i < elements.length; i++) {
-			IConfigurationElement element = elements[i];
+		for (IConfigurationElement element : elements) {
 			try {
 				CodeMiningProviderDescriptor descriptor = new CodeMiningProviderDescriptor(element);
 				descriptors.add(descriptor);
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java
index 454e663eb60..594ca647183 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java
@@ -880,16 +880,13 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno
 		// inform listeners about change
 		if (fUpdateNeeded) {
 			AnnotationModelEvent ame= new AnnotationModelEvent(this, false);
-			for (Iterator<QuickDiffRangeDifference> it= fAdded.iterator(); it.hasNext(); ) {
-				QuickDiffRangeDifference rd= it.next();
+			for (QuickDiffRangeDifference rd : fAdded) {
 				ame.annotationAdded(rd.getDiffRegion(fDifferences, fLeftDocument));
 			}
-			for (Iterator<QuickDiffRangeDifference> it= fRemoved.iterator(); it.hasNext(); ) {
-				QuickDiffRangeDifference rd= it.next();
+			for (QuickDiffRangeDifference rd : fRemoved) {
 				ame.annotationRemoved(rd.getDiffRegion(fDifferences, fLeftDocument));
 			}
-			for (Iterator<QuickDiffRangeDifference> it= fChanged.iterator(); it.hasNext(); ) {
-				QuickDiffRangeDifference rd= it.next();
+			for (QuickDiffRangeDifference rd : fChanged) {
 				ame.annotationChanged(rd.getDiffRegion(fDifferences, fLeftDocument));
 			}
 			fireModelChanged(ame);
@@ -1032,8 +1029,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno
 
 
 		// shift the partial diffs to the absolute document positions
-		for (Iterator<QuickDiffRangeDifference> it= diffs.iterator(); it.hasNext();) {
-			QuickDiffRangeDifference d= it.next();
+		for (QuickDiffRangeDifference d : diffs) {
 			d.shiftLeft(leftStartLine);
 			d.shiftRight(rightStartLine);
 		}
@@ -1369,8 +1365,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno
 	 * @return the corresponding RangeDifference, or <code>null</code>
 	 */
 	private QuickDiffRangeDifference getRangeDifferenceForLeftLine(int leftLine) {
-		for (Iterator<QuickDiffRangeDifference> it= fDifferences.iterator(); it.hasNext();) {
-			QuickDiffRangeDifference d= it.next();
+		for (QuickDiffRangeDifference d : fDifferences) {
 			if (leftLine >= d.leftStart() && leftLine < d.leftEnd()) {
 				return d;
 			}
@@ -1387,8 +1382,7 @@ public class DocumentLineDiffer implements ILineDiffer, IDocumentListener, IAnno
 	private QuickDiffRangeDifference getRangeDifferenceForRightLine(int rightLine) {
 		final List<QuickDiffRangeDifference> differences= fDifferences;
 		synchronized (differences) {
-			for (Iterator<QuickDiffRangeDifference> it= differences.iterator(); it.hasNext();) {
-				QuickDiffRangeDifference d= it.next();
+			for (QuickDiffRangeDifference d : differences) {
 				if (rightLine >= d.rightStart() && rightLine < d.rightEnd()) {
 					return d;
 				}
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/QuickDiffExtensionsRegistry.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/QuickDiffExtensionsRegistry.java
index 3707acf01d8..327b92f197a 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/QuickDiffExtensionsRegistry.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/QuickDiffExtensionsRegistry.java
@@ -85,8 +85,8 @@ public class QuickDiffExtensionsRegistry {
 		List<ReferenceProviderDescriptor> list= new ArrayList<>();
 
 		IConfigurationElement[] elements= registry.getConfigurationElementsFor(TextEditorPlugin.PLUGIN_ID, TextEditorPlugin.REFERENCE_PROVIDER_EXTENSION_POINT);
-		for (int i= 0; i < elements.length; i++) {
-			ReferenceProviderDescriptor desc= new ReferenceProviderDescriptor(elements[i]);
+		for (IConfigurationElement element : elements) {
+			ReferenceProviderDescriptor desc = new ReferenceProviderDescriptor(element);
 			if (desc.getId().equals("org.eclipse.ui.internal.editors.quickdiff.LastSaveReferenceProvider")) //$NON-NLS-1$
 				fDefaultDescriptor= desc;
 			list.add(desc);
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/DAG.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/DAG.java
index 70a79f12f8c..91a158f7294 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/DAG.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/DAG.java
@@ -178,8 +178,7 @@ public final class DAG<E> {
 	private static <T> Set<T> computeZeroEdgeVertices(MultiMap<T, T> map) {
 		Set<T> candidates= map.keySet();
 		Set<T> roots= new LinkedHashSet<>(candidates.size());
-		for (Iterator<T> it= candidates.iterator(); it.hasNext();) {
-			T candidate= it.next();
+		for (T candidate : candidates) {
 			if (map.get(candidate).isEmpty())
 				roots.add(candidate);
 		}
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/RulerColumnPlacement.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/RulerColumnPlacement.java
index aa75d0009c7..29628e9f35d 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/RulerColumnPlacement.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/RulerColumnPlacement.java
@@ -60,8 +60,7 @@ public final class RulerColumnPlacement {
 
 	private Set<RulerColumnPlacementConstraint> readIds(IConfigurationElement[] children) throws CoreException {
 		Set<RulerColumnPlacementConstraint> constraints= new LinkedHashSet<>((int) (children.length / 0.75) + 1, 0.75f);
-		for (int i= 0; i < children.length; i++) {
-			IConfigurationElement child= children[i];
+		for (IConfigurationElement child : children) {
 			String name= child.getName();
 			ExtensionPointHelper childHelper= new ExtensionPointHelper(child);
 			boolean before;
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/SpellingEngineRegistry.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/SpellingEngineRegistry.java
index 7b46fa0f8ef..2a9accfd480 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/SpellingEngineRegistry.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/spelling/SpellingEngineRegistry.java
@@ -98,8 +98,8 @@ public class SpellingEngineRegistry {
 		fDescriptorsMap= new HashMap<>();
 		fDefaultDescriptor= null;
 		IConfigurationElement[] elements= Platform.getExtensionRegistry().getConfigurationElementsFor(TextEditorPlugin.PLUGIN_ID, SPELLING_ENGINE_EXTENSION_POINT);
-		for (int i= 0; i < elements.length; i++) {
-			SpellingEngineDescriptor descriptor= new SpellingEngineDescriptor(elements[i]);
+		for (IConfigurationElement element : elements) {
+			SpellingEngineDescriptor descriptor = new SpellingEngineDescriptor(element);
 			descriptors.add(descriptor);
 			fDescriptorsMap.put(descriptor.getId(), descriptor);
 			if (fDefaultDescriptor == null && descriptor.isDefault())
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiff.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiff.java
index 66cd56ceb7b..36cbd278ed3 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiff.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiff.java
@@ -14,7 +14,6 @@
 package org.eclipse.ui.texteditor.quickdiff;
 
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 
@@ -96,8 +95,7 @@ public class QuickDiff {
 
 		List<ReferenceProviderDescriptor> descs= getReferenceProviderDescriptors();
 		// try to fetch preferred provider; load if needed
-		for (Iterator<ReferenceProviderDescriptor> iter= descs.iterator(); iter.hasNext();) {
-			ReferenceProviderDescriptor desc= iter.next();
+		for (ReferenceProviderDescriptor desc : descs) {
 			if (desc.getId().equals(id)) {
 				IQuickDiffReferenceProvider provider= desc.createProvider();
 				if (provider != null) {
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiffToggleAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiffToggleAction.java
index 91af3e8aefe..33c5f690c0d 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiffToggleAction.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/quickdiff/QuickDiffToggleAction.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.ui.texteditor.quickdiff;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.jface.action.IAction;
@@ -100,8 +99,7 @@ public class QuickDiffToggleAction implements IEditorActionDelegate, IUpdate {
 				// create quickdiff menu
 				menu= new MenuManager(QuickDiffMessages.quickdiff_menu_label, MENU_ID);
 				List<ReferenceProviderDescriptor> descriptors= new QuickDiff().getReferenceProviderDescriptors();
-				for (Iterator<ReferenceProviderDescriptor> it= descriptors.iterator(); it.hasNext();) {
-					ReferenceProviderDescriptor desc= it.next();
+				for (ReferenceProviderDescriptor desc : descriptors) {
 					ReferenceSelectionAction action= new ReferenceSelectionAction(desc, fEditor);
 					if (action.isEnabled())
 						menu.add(action);
@@ -110,8 +108,8 @@ public class QuickDiffToggleAction implements IEditorActionDelegate, IUpdate {
 
 				// create restore menu if this action is enabled
 				if (isConnected()) {
-					for (int i= 0; i < fRestoreActions.length; i++) {
-						fRestoreActions[i].update();
+					for (QuickDiffRestoreAction fRestoreAction : fRestoreActions) {
+						fRestoreAction.update();
 					}
 					// only add block action if selection action is not enabled
 					if (fRestoreActions[0].isEnabled())
@@ -135,8 +133,8 @@ public class QuickDiffToggleAction implements IEditorActionDelegate, IUpdate {
 			fEditor= (ITextEditor)targetEditor;
 		} else
 			fEditor= null;
-		for (int i= 0; i < fRestoreActions.length; i++) {
-			fRestoreActions[i].setEditor(fEditor);
+		for (QuickDiffRestoreAction fRestoreAction : fRestoreActions) {
+			fRestoreAction.setEditor(fEditor);
 		}
 		setPopupMenu();
 	}
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java
index 5af451aadbf..7a6c6f9e1b3 100755
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java
@@ -119,18 +119,15 @@ public final class RulerColumnDescriptor {
 			fTarget= null; // dummy
 		} else {
 			RulerColumnTarget combined= null;
-			for (int i= 0; i < targetEditors.length; i++) {
-				IConfigurationElement targetEditor= targetEditors[i];
+			for (IConfigurationElement targetEditor : targetEditors) {
 				RulerColumnTarget target= RulerColumnTarget.createEditorIdTarget(new ExtensionPointHelper(targetEditor).getNonNullAttribute(ID));
 				combined= RulerColumnTarget.createOrTarget(combined, target);
 			}
-			for (int i= 0; i < targetContentTypes.length; i++) {
-				IConfigurationElement targetContentType= targetContentTypes[i];
+			for (IConfigurationElement targetContentType : targetContentTypes) {
 				RulerColumnTarget target= RulerColumnTarget.createContentTypeTarget(new ExtensionPointHelper(targetContentType).getNonNullAttribute(ID));
 				combined= RulerColumnTarget.createOrTarget(combined, target);
 			}
-			for (int i= 0; i < targetClasses.length; i++) {
-				IConfigurationElement targetClass= targetClasses[i];
+			for (IConfigurationElement targetClass : targetClasses) {
 				RulerColumnTarget target= RulerColumnTarget.createClassTarget(new ExtensionPointHelper(targetClass).getNonNullAttribute(CLASS));
 				combined= RulerColumnTarget.createOrTarget(combined, target);
 			}
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
index 09175c09010..18f2e441104 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
@@ -207,19 +207,15 @@ public final class RulerColumnRegistry {
 		sorter.sort(array);
 
 		Map<String, RulerColumnDescriptor> descriptorsById= new HashMap<>();
-		for (int i= 0; i < array.length; i++) {
-			RulerColumnDescriptor desc= array[i];
+		for (RulerColumnDescriptor desc : array) {
 			descriptorsById.put(desc.getId(), desc);
 		}
 
 		DAG<RulerColumnDescriptor> dag= new DAG<>();
-		for (int i= 0; i < array.length; i++) {
-			RulerColumnDescriptor desc= array[i];
+		for (RulerColumnDescriptor desc : array) {
 			dag.addVertex(desc);
-
 			Set<RulerColumnPlacementConstraint> before= desc.getPlacement().getConstraints();
-			for (Iterator<RulerColumnPlacementConstraint> it= before.iterator(); it.hasNext();) {
-				RulerColumnPlacementConstraint constraint= it.next();
+			for (RulerColumnPlacementConstraint constraint : before) {
 				String id= constraint.getId();
 				RulerColumnDescriptor target= descriptorsById.get(id);
 				if (target == null) {
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.java
index 12533f7b4d1..21145ec4cf5 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/spelling/SpellingCorrectionProcessor.java
@@ -93,8 +93,9 @@ public final class SpellingCorrectionProcessor implements IQuickAssistProcessor
 
 	private List<ICompletionProposal> computeProposals(IQuickAssistInvocationContext context, SpellingProblem[] spellingProblems) {
 		List<ICompletionProposal> proposals= new ArrayList<>();
-		for (int i= 0; i < spellingProblems.length; i++)
-			proposals.addAll(Arrays.asList(spellingProblems[i].getProposals(context)));
+		for (SpellingProblem spellingProblem : spellingProblems) {
+			proposals.addAll(Arrays.asList(spellingProblem.getProposals(context)));
+		}
 
 		return proposals;
 	}
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
index 12bdb29f556..9e0deea451c 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
@@ -347,9 +347,10 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa
 		private TemplatePersistenceData[] getTemplates(String contextId) {
 			List<TemplatePersistenceData> templateList= new ArrayList<>();
 			TemplatePersistenceData[] datas= getTemplateStore().getTemplateData(false);
-			for (int i= 0; i < datas.length; i++) {
-				if (datas[i].isEnabled() && datas[i].getTemplate().getContextTypeId().equals(contextId))
-					templateList.add(datas[i]);
+			for (TemplatePersistenceData data : datas) {
+				if (data.isEnabled() && data.getTemplate().getContextTypeId().equals(contextId)) {
+					templateList.add(data);
+				}
 			}
 			return templateList
 					.toArray(new TemplatePersistenceData[templateList.size()]);
@@ -376,9 +377,10 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa
 				if (datas.length <= 0)
 					return false;
 
-				for (int i= 0; i < datas.length; i++) {
-					if (datas[i].isEnabled() && datas[i].getTemplate().getContextTypeId().equals(contextId))
+				for (TemplatePersistenceData data : datas) {
+					if (data.isEnabled() && data.getTemplate().getContextTypeId().equals(contextId)) {
 						return true;
+					}
 				}
 				return false;
 			}
@@ -1327,9 +1329,9 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa
 	 *
 	 */
 	private void moveTemplates(TemplatePersistenceData[] templates, String contextId) {
-		for (int i= 0; i < templates.length; i++) {
-			Template t= templates[i].getTemplate();
-			templates[i].setTemplate(new Template(t.getName(), t.getDescription(), contextId, t
+		for (TemplatePersistenceData template : templates) {
+			Template t = template.getTemplate();
+			template.setTemplate(new Template(t.getName(), t.getDescription(), contextId, t
 					.getPattern(), t.isAutoInsertable()));
 		}
 		saveTemplateStore();
@@ -1374,8 +1376,8 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa
 					new Object[] { Integer.valueOf(selectedTemplates.length) });
 		if (!MessageDialog.openQuestion(getShell(), title, message))
 			return;
-		for (int i= 0; i < selectedTemplates.length; i++) {
-			getTemplateStore().delete(selectedTemplates[i]);
+		for (TemplatePersistenceData selectedTemplate : selectedTemplates) {
+			getTemplateStore().delete(selectedTemplate);
 		}
 		saveTemplateStore();
 		fTreeViewer.setSelection(new StructuredSelection(new Object[] {}), true);
@@ -1499,9 +1501,8 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa
 	 */
 	private void storeCollapseState() {
 		TreeItem[] items= fTreeViewer.getTree().getItems();
-		for (int i= 0; i < items.length; i++) {
-			fPreferenceStore.setValue(CONTEXT_COLLAPSE_PREF_ID
-					+ ((TemplateContextType) items[i].getData()).getId(), !items[i].getExpanded());
+		for (TreeItem item : items) {
+			fPreferenceStore.setValue(CONTEXT_COLLAPSE_PREF_ID + ((TemplateContextType) item.getData()).getId(), !item.getExpanded());
 		}
 	}
 
@@ -1514,13 +1515,13 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa
 		try {
 			fTreeViewer.refresh();
 			TreeItem[] items= fTreeViewer.getTree().getItems();
-			for (int i= 0; i < items.length; i++) {
-				boolean isExpanded= !fPreferenceStore.getBoolean(CONTEXT_COLLAPSE_PREF_ID
-						+ ((TemplateContextType) items[i].getData()).getId());
-				if (isExpanded)
-					fTreeViewer.expandToLevel(items[i].getData(), AbstractTreeViewer.ALL_LEVELS);
-				else
-					fTreeViewer.collapseToLevel(items[i].getData(), AbstractTreeViewer.ALL_LEVELS);
+			for (TreeItem item : items) {
+				boolean isExpanded = !fPreferenceStore.getBoolean(CONTEXT_COLLAPSE_PREF_ID + ((TemplateContextType) item.getData()).getId());
+				if (isExpanded) {
+					fTreeViewer.expandToLevel(item.getData(), AbstractTreeViewer.ALL_LEVELS);
+				} else {
+					fTreeViewer.collapseToLevel(item.getData(), AbstractTreeViewer.ALL_LEVELS);
+				}
 			}
 		} finally {
 			fTreeViewer.getTree().setRedraw(true);
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
index 1583a795f63..095b8607694 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
@@ -329,8 +329,8 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I
 				createLabel(composite, TemplatesMessages.EditTemplateDialog_context);
 				fContextCombo= new Combo(composite, SWT.READ_ONLY);
 
-				for (int i= 0; i < fContextTypes.length; i++) {
-					fContextCombo.add(fContextTypes[i][1]);
+				for (String[] fContextType : fContextTypes) {
+					fContextCombo.add(fContextType[1]);
 				}
 
 				fContextCombo.addModifyListener(listener);
@@ -406,9 +406,9 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I
 		private String getContextId() {
 			if (fContextCombo != null && !fContextCombo.isDisposed()) {
 				String name= fContextCombo.getText();
-				for (int i= 0; i < fContextTypes.length; i++) {
-					if (name.equals(fContextTypes[i][1])) {
-						return fContextTypes[i][0];
+				for (String[] fContextType : fContextTypes) {
+					if (name.equals(fContextType[1])) {
+						return fContextType[0];
 					}
 				}
 			}
@@ -1027,9 +1027,10 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I
 	private TemplatePersistenceData[] getEnabledTemplates() {
 		List<TemplatePersistenceData> enabled= new ArrayList<>();
 		TemplatePersistenceData[] datas= fTemplateStore.getTemplateData(false);
-		for (int i= 0; i < datas.length; i++) {
-			if (datas[i].isEnabled())
-				enabled.add(datas[i]);
+		for (TemplatePersistenceData data : datas) {
+			if (data.isEnabled()) {
+				enabled.add(data);
+			}
 		}
 		return enabled.toArray(new TemplatePersistenceData[enabled.size()]);
 	}
@@ -1235,8 +1236,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I
 			if (file.exists()) {
 				try (InputStream input = new BufferedInputStream(new FileInputStream(file))) {
 					TemplatePersistenceData[] datas= reader.read(input, null);
-					for (int i= 0; i < datas.length; i++) {
-						TemplatePersistenceData data= datas[i];
+					for (TemplatePersistenceData data : datas) {
 						fTemplateStore.add(data);
 						String id= data.getId();
 						if (id == null) {