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: I41d071325af408fde7f123083e1dead6d8b90fd3
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>

26 files changed, 108 insertions, 177 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationContentProvider.java
index 081362143d..799b926dcc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationContentProvider.java
@@ -676,8 +676,7 @@ public final class JavaSynchronizationContentProvider extends AbstractSynchroniz
 		}
 		// Remove any java projects that correspond to deleted or closed projects
 		final Set<IProject> removed= getDeletedProjects(event);
-		for (final Iterator<IJavaProject> iterator= existing.iterator(); iterator.hasNext();) {
-			final IJavaProject element= iterator.next();
+		for (IJavaProject element : existing) {
 			if (removed.contains(element.getResource()))
 				removals.add(element);
 		}
@@ -692,8 +691,8 @@ public final class JavaSynchronizationContentProvider extends AbstractSynchroniz
 				if (!removals.isEmpty())
 					viewer.remove(viewer.getInput(), removals.toArray());
 				if (!refreshes.isEmpty()) {
-					for (final Iterator<IJavaProject> iter= refreshes.iterator(); iter.hasNext();)
-						viewer.refresh(iter.next());
+					for (IJavaProject iJavaProject : refreshes)
+						viewer.refresh(iJavaProject);
 				}
 			} finally {
 				tree.setRedraw(true);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerLabelProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerLabelProvider.java
index d05b62ef33..0d5b4e5d15 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerLabelProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerLabelProvider.java
@@ -14,7 +14,6 @@
 package org.eclipse.jdt.internal.ui.packageview;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.swt.graphics.Image;
@@ -148,8 +147,8 @@ public class PackageExplorerLabelProvider extends AppearanceAwareLabelProvider {
 	@Override
 	public void dispose() {
 		if (fWorkingSetImages != null) {
-			for (Iterator<Image> iter= fWorkingSetImages.values().iterator(); iter.hasNext();) {
-				iter.next().dispose();
+			for (Image image : fWorkingSetImages.values()) {
+				image.dispose();
 			}
 		}
 		super.dispose();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetAwareContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetAwareContentProvider.java
index 25ad4daf13..aa89eca6a0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetAwareContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetAwareContentProvider.java
@@ -18,7 +18,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -88,26 +87,26 @@ public class WorkingSetAwareContentProvider extends PackageExplorerContentProvid
 	}
 
 	private Object[] getWorkingSetChildren(IWorkingSet set) {
-		IAdaptable[] elements= fWorkingSetModel.getChildren(set);
-		Set<IAdaptable> result= new HashSet<>(elements.length);
-		for (IAdaptable element : elements) {
-			if (element instanceof IProject) {
-				processResource((IProject) element, result); // also add closed projects
-			} else if (element instanceof IResource) {
-				IProject project= ((IResource) element).getProject();
+		IAdaptable[] children= fWorkingSetModel.getChildren(set);
+		Set<IAdaptable> result= new HashSet<>(children.length);
+		for (IAdaptable child : children) {
+			if (child instanceof IProject) {
+				processResource((IProject) child, result); // also add closed projects
+			} else if (child instanceof IResource) {
+				IProject project= ((IResource) child).getProject();
 				if (project.isOpen()) {
-					processResource((IResource) element, result);
+					processResource((IResource) child, result);
 				}
-			} else if (element instanceof IJavaProject) {
-				result.add(element); // also add closed projects
-			} else if (element instanceof IJavaElement) {
-				IJavaElement elem= (IJavaElement) element;
+			} else if (child instanceof IJavaProject) {
+				result.add(child); // also add closed projects
+			} else if (child instanceof IJavaElement) {
+				IJavaElement elem= (IJavaElement) child;
 				IProject project= getProject(elem);
 				if (project != null && project.isOpen()) {
 					result.add(elem);
 				}
 			} else {
-				IProject project= element.getAdapter(IProject.class);
+				IProject project= child.getAdapter(IProject.class);
 				if (project != null) {
 					processResource(project, result);
 				}
@@ -202,8 +201,8 @@ public class WorkingSetAwareContentProvider extends PackageExplorerContentProvid
 		if (nonProjetTopLevelElemens.isEmpty())
 			return;
 		List<Object> toAdd= new ArrayList<>();
-		for (Iterator<IAdaptable> iter= nonProjetTopLevelElemens.iterator(); iter.hasNext();) {
-			Object element= iter.next();
+		for (IAdaptable iAdaptable : nonProjetTopLevelElemens) {
+			Object element= iAdaptable;
 			if (isChildOf(element, toRefresh))
 				toAdd.add(element);
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetDropAdapter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetDropAdapter.java
index 8eac73ebbd..b19dd95e2b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetDropAdapter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetDropAdapter.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -143,13 +142,11 @@ public class WorkingSetDropAdapter extends JdtViewerDropAdapter implements Trans
 			ReorgUtils.splitIntoJavaElementsAndResources(fElementsToAdds, realJavaElements, realResource);
 			if (fElementsToAdds.length != realJavaElements.size() + realResource.size())
 				return DND.DROP_NONE;
-			for (Iterator<IJavaElement> iter= realJavaElements.iterator(); iter.hasNext();) {
-				IJavaElement element= iter.next();
+			for (IJavaElement element : realJavaElements) {
 				if (ReorgUtils.containsElementOrParent(fCurrentElements, element))
 					return DND.DROP_NONE;
 			}
-			for (Iterator<IResource> iter= realResource.iterator(); iter.hasNext();) {
-				IResource element= iter.next();
+			for (IResource element : realResource) {
 				if (ReorgUtils.containsElementOrParent(fCurrentElements, element))
 					return DND.DROP_NONE;
 			}
@@ -256,8 +253,7 @@ public class WorkingSetDropAdapter extends JdtViewerDropAdapter implements Trans
 		if (eventDetail == DND.DROP_MOVE) {
 			ITreeSelection treeSelection= (ITreeSelection)fSelection;
 			Map<IWorkingSet, List<Object>> workingSets= groupByWorkingSets(treeSelection.getPaths());
-			for (Iterator<IWorkingSet> iter= workingSets.keySet().iterator(); iter.hasNext();) {
-				IWorkingSet ws= iter.next();
+			for (IWorkingSet ws : workingSets.keySet()) {
 				List<Object> toRemove= workingSets.get(ws);
 				List<IAdaptable> currentElements= new ArrayList<>(Arrays.asList(ws.getElements()));
 				currentElements.removeAll(toRemove);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/AbstractConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/AbstractConfigurationBlock.java
index cbf4d9dcf0..992f565aaf 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/AbstractConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/AbstractConfigurationBlock.java
@@ -92,8 +92,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo
 				if (e.getState()) {
 					try {
 						fIsBeingManaged= true;
-						for (Iterator<ExpandableComposite> iter= fSections.iterator(); iter.hasNext();) {
-							ExpandableComposite composite= iter.next();
+						for (ExpandableComposite composite : fSections) {
 							if (composite != source)
 								composite.setExpanded(false);
 						}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeAssistFavoritesConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeAssistFavoritesConfigurationBlock.java
index bebb6f7095..2a69d8e954 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeAssistFavoritesConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeAssistFavoritesConfigurationBlock.java
@@ -51,6 +51,8 @@ import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.search.IJavaSearchScope;
 import org.eclipse.jdt.core.search.SearchEngine;
 
+import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
+
 import org.eclipse.jdt.ui.IJavaElementSearchConstants;
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jdt.ui.PreferenceConstants;
@@ -61,7 +63,6 @@ import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
 import org.eclipse.jdt.internal.ui.dialogs.TextFieldNavigationHandler;
 import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
 import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
-import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
 import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
 import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
@@ -223,13 +224,7 @@ class CodeAssistFavoritesConfigurationBlock extends OptionsConfigurationBlock {
 		}
 
 		private boolean doesExist(String name) {
-			for (int i= 0; i < fExistingEntries.size(); i++) {
-				String entry= fExistingEntries.get(i);
-				if (name.equals(entry)) {
-					return true;
-				}
-			}
-			return false;
+			return fExistingEntries.contains(name);
 		}
 
 
@@ -476,14 +471,7 @@ class CodeAssistFavoritesConfigurationBlock extends OptionsConfigurationBlock {
 	}
 
 	private static String serializeFavorites(List<String> favorites) {
-		int size= favorites.size();
-		StringBuilder buf= new StringBuilder();
-		for (int i= 0; i < size; i++) {
-			buf.append(favorites.get(i));
-			if (i < size -1)
-				buf.append(';');
-		}
-		return buf.toString();
+		return String.join(";", favorites.toArray(new String[favorites.size()])); //$NON-NLS-1$
 	}
 
 }
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeTemplateBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeTemplateBlock.java
index 098c2d711e..e3fdd5f40b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeTemplateBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeTemplateBlock.java
@@ -526,10 +526,10 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock {
 	}
 
 	private void updateTemplate(TemplatePersistenceData data) {
-		for (TemplatePersistenceData d : fTemplateStore.getTemplateData()) {
-			String id= d.getId();
+		for (TemplatePersistenceData templatePersistenceData : fTemplateStore.getTemplateData()) {
+			String id= templatePersistenceData.getId();
 			if (id != null && id.equals(data.getId())) {
-				d.setTemplate(data.getTemplate());
+				templatePersistenceData.setTemplate(data.getTemplate());
 				break;
 			}
 		}
@@ -541,8 +541,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock {
 
 	private void export(List<Object> selected) {
 		Set<Object> datas= new HashSet<>();
-		for (int i= 0; i < selected.size(); i++) {
-			Object curr= selected.get(i);
+		for (Object curr : selected) {
 			if (curr instanceof TemplatePersistenceData) {
 				datas.add(curr);
 			} else {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/FilteredPreferenceTree.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/FilteredPreferenceTree.java
index 6ef9040f84..dfadc2c54b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/FilteredPreferenceTree.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/FilteredPreferenceTree.java
@@ -439,9 +439,8 @@ public class FilteredPreferenceTree {
 			labelMatcher= createStringMatcher(filterText);
 		} else {
 			if (index == 0 && !fExpectMultiWordValueMatch) {
-				int i= 0;
-				for (; i < filterText.length(); i++) {
-					char ch= filterText.charAt(i);
+				int i= filterText.length();
+				for (char ch : filterText.toCharArray()) {
 					if (ch == ' ' || ch == '\t') {
 						break;
 					}
@@ -488,8 +487,8 @@ public class FilteredPreferenceTree {
 		//update children
 		List<PreferenceTreeNode<?>> children= node.getChildren();
 		if (children != null) {
-			for (int i= 0; i < children.size(); i++) {
-				updateUI(children.get(i));
+			for (PreferenceTreeNode<?> element : children) {
+				updateUI(element);
 			}
 		}
 	}
@@ -530,9 +529,8 @@ public class FilteredPreferenceTree {
 		} else {
 			bfsNodes.addAll(fRoot.getChildren());
 		}
-		for (int i= 0; i < bfsNodes.size(); i++) {
-			PreferenceTreeNode<?> node= bfsNodes.get(i);
-			bfsNodes.addAll(bfsNodes.get(i).getChildren());
+		for (PreferenceTreeNode<?> node : bfsNodes) {
+			bfsNodes.addAll(node.getChildren());
 			if (node.getControl() instanceof ExpandableComposite)
 				((ExpandableComposite) node.getControl()).setExpanded(expanded);
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeConfigurationBlock.java
index 70c7b2821a..3b2f608e7b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeConfigurationBlock.java
@@ -487,8 +487,7 @@ public class ImportOrganizeConfigurationBlock extends OptionsConfigurationBlock
 
 	private static String packOrderList(List<ImportOrderEntry> orderList) {
 		StringBuilder buf= new StringBuilder();
-		for (int i= 0; i < orderList.size(); i++) {
-			ImportOrderEntry entry= orderList.get(i);
+		for (ImportOrderEntry entry : orderList) {
 			buf.append(entry.serialize());
 			buf.append(';');
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java
index b02e9a6bb9..2f98afd251 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java
@@ -238,8 +238,7 @@ public class ImportOrganizeInputDialog extends StatusDialog {
 	}
 
 	private boolean doesExist(String name, boolean isStatic) {
-		for (int i= 0; i < fExistingEntries.size(); i++) {
-			ImportOrderEntry entry= fExistingEntries.get(i);
+		for (ImportOrderEntry entry : fExistingEntries) {
 			if (name.equals(entry.name) && isStatic == entry.isStatic) {
 				return true;
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBasePreferencePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBasePreferencePage.java
index 4709ac9f2b..fdc106f03c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBasePreferencePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBasePreferencePage.java
@@ -242,20 +242,17 @@ public class JavaBasePreferencePage extends PreferencePage implements IWorkbench
 	 */
 	@Override
 	protected void performDefaults() {
-		for (int i= 0; i < fCheckBoxes.size(); i++) {
-			Button button= fCheckBoxes.get(i);
+		for (Button button : fCheckBoxes) {
 			String key= (String) button.getData();
 			IPreferenceStore buttonPreferenceStore = (IPreferenceStore) button.getData(PREFERENCE_STORE_KEY);
 			button.setSelection(buttonPreferenceStore.getDefaultBoolean(key));
 		}
 		IPreferenceStore store= getPreferenceStore();
-		for (int i= 0; i < fRadioButtons.size(); i++) {
-			Button button= fRadioButtons.get(i);
+		for (Button button : fRadioButtons) {
 			String[] info= (String[]) button.getData();
 			button.setSelection(info[1].equals(store.getDefaultString(info[0])));
 		}
-		for (int i= 0; i < fTextControls.size(); i++) {
-			Text text= fTextControls.get(i);
+		for (Text text : fTextControls) {
 			String key= (String) text.getData();
 			text.setText(store.getDefaultString(key));
 		}
@@ -267,22 +264,19 @@ public class JavaBasePreferencePage extends PreferencePage implements IWorkbench
 	 */
 	@Override
 	public boolean performOk() {
-		for (int i= 0; i < fCheckBoxes.size(); i++) {
-			Button button= fCheckBoxes.get(i);
+		for (Button button : fCheckBoxes) {
 			String key= (String) button.getData();
 			IPreferenceStore buttonPreferenceStore = (IPreferenceStore) button.getData(PREFERENCE_STORE_KEY);
 			buttonPreferenceStore.setValue(key, button.getSelection());
 		}
 		IPreferenceStore store= getPreferenceStore();
-		for (int i= 0; i < fRadioButtons.size(); i++) {
-			Button button= fRadioButtons.get(i);
+		for (Button button : fRadioButtons) {
 			if (button.getSelection()) {
 				String[] info= (String[]) button.getData();
 				store.setValue(info[0], info[1]);
 			}
 		}
-		for (int i= 0; i < fTextControls.size(); i++) {
-			Text text= fTextControls.get(i);
+		for (Text text : fTextControls) {
 			String key= (String) text.getData();
 			store.setValue(key, text.getText());
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java
index 19ac544ca4..9656fd383e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java
@@ -398,20 +398,20 @@ class JavaEditorColoringConfigurationBlock extends AbstractConfigurationBlock {
 
 		fColorManager= new JavaColorManager(false);
 
-		for (int i= 0, n= fSyntaxColorListModel.length; i < n; i++)
-			fListModel.add(new HighlightingColorListItem (fSyntaxColorListModel[i][0], fSyntaxColorListModel[i][1], fSyntaxColorListModel[i][1] + BOLD, fSyntaxColorListModel[i][1] + ITALIC, fSyntaxColorListModel[i][1] + STRIKETHROUGH, fSyntaxColorListModel[i][1] + UNDERLINE));
+		for (String[] syntaxColor : fSyntaxColorListModel)
+			fListModel.add(new HighlightingColorListItem (syntaxColor[0], syntaxColor[1], syntaxColor[1] + BOLD, syntaxColor[1] + ITALIC, syntaxColor[1] + STRIKETHROUGH, syntaxColor[1] + UNDERLINE));
 
 		SemanticHighlighting[] semanticHighlightings= SemanticHighlightings.getSemanticHighlightings();
-		for (int i= 0, n= semanticHighlightings.length; i < n; i++)
+		for (SemanticHighlighting semanticHighlighting : semanticHighlightings)
 			fListModel.add(
 					new SemanticHighlightingColorListItem(
-							semanticHighlightings[i].getDisplayName(),
-							SemanticHighlightings.getColorPreferenceKey(semanticHighlightings[i]),
-							SemanticHighlightings.getBoldPreferenceKey(semanticHighlightings[i]),
-							SemanticHighlightings.getItalicPreferenceKey(semanticHighlightings[i]),
-							SemanticHighlightings.getStrikethroughPreferenceKey(semanticHighlightings[i]),
-							SemanticHighlightings.getUnderlinePreferenceKey(semanticHighlightings[i]),
-							SemanticHighlightings.getEnabledPreferenceKey(semanticHighlightings[i])
+							semanticHighlighting.getDisplayName(),
+							SemanticHighlightings.getColorPreferenceKey(semanticHighlighting),
+							SemanticHighlightings.getBoldPreferenceKey(semanticHighlighting),
+							SemanticHighlightings.getItalicPreferenceKey(semanticHighlighting),
+							SemanticHighlightings.getStrikethroughPreferenceKey(semanticHighlighting),
+							SemanticHighlightings.getUnderlinePreferenceKey(semanticHighlighting),
+							SemanticHighlightings.getEnabledPreferenceKey(semanticHighlighting)
 					));
 
 		store.addKeys(createOverlayStoreKeys());
@@ -421,8 +421,7 @@ class JavaEditorColoringConfigurationBlock extends AbstractConfigurationBlock {
 
 		ArrayList<OverlayKey> overlayKeys= new ArrayList<>();
 
-		for (int i= 0, n= fListModel.size(); i < n; i++) {
-			HighlightingColorListItem item= fListModel.get(i);
+		for (HighlightingColorListItem item : fListModel) {
 			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, item.getColorKey()));
 			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, item.getBoldKey()));
 			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, item.getItalicKey()));
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java
index cb4aaa2f79..0fc02032b1 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java
@@ -481,18 +481,15 @@ public class NewJavaProjectPreferencePage extends PreferencePage implements IWor
 	@Override
 	protected void performDefaults() {
 		IPreferenceStore store= getPreferenceStore();
-		for (int i= 0; i < fCheckBoxes.size(); i++) {
-			Button button= fCheckBoxes.get(i);
+		for (Button button : fCheckBoxes) {
 			String key= (String) button.getData();
 			button.setSelection(store.getDefaultBoolean(key));
 		}
-		for (int i= 0; i < fRadioButtons.size(); i++) {
-			Button button= fRadioButtons.get(i);
+		for (Button button : fRadioButtons) {
 			String[] info= (String[]) button.getData();
 			button.setSelection(info[1].equals(store.getDefaultString(info[0])));
 		}
-		for (int i= 0; i < fTextControls.size(); i++) {
-			Text text= fTextControls.get(i);
+		for (Text text : fTextControls) {
 			String key= (String) text.getData();
 			text.setText(store.getDefaultString(key));
 		}
@@ -510,20 +507,17 @@ public class NewJavaProjectPreferencePage extends PreferencePage implements IWor
 	@Override
 	public boolean performOk() {
 		IPreferenceStore store= getPreferenceStore();
-		for (int i= 0; i < fCheckBoxes.size(); i++) {
-			Button button= fCheckBoxes.get(i);
+		for (Button button : fCheckBoxes) {
 			String key= (String) button.getData();
 			store.setValue(key, button.getSelection());
 		}
-		for (int i= 0; i < fRadioButtons.size(); i++) {
-			Button button= fRadioButtons.get(i);
+		for (Button button : fRadioButtons) {
 			if (button.getSelection()) {
 				String[] info= (String[]) button.getData();
 				store.setValue(info[0], info[1]);
 			}
 		}
-		for (int i= 0; i < fTextControls.size(); i++) {
-			Text text= fTextControls.get(i);
+		for (Text text : fTextControls) {
 			String key= (String) text.getData();
 			store.setValue(key, text.getText());
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/OptionsConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/OptionsConfigurationBlock.java
index db80436b05..3e53587c82 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/OptionsConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/OptionsConfigurationBlock.java
@@ -440,8 +440,7 @@ public abstract class OptionsConfigurationBlock {
 			if (!fExpandableComposites.isEmpty()) {
 				ExpandableComposite expandable= getParentExpandableComposite(control);
 				if (expandable != null) {
-					for (int i= 0; i < fExpandableComposites.size(); i++) {
-						ExpandableComposite curr= fExpandableComposites.get(i);
+					for (ExpandableComposite curr : fExpandableComposites) {
 						curr.setExpanded(curr == expandable);
 					}
 					expandedStateChanged(expandable);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PropertiesFileEditorPreferencePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PropertiesFileEditorPreferencePage.java
index 39d3cc6219..334448cb53 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PropertiesFileEditorPreferencePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PropertiesFileEditorPreferencePage.java
@@ -650,8 +650,8 @@ public class PropertiesFileEditorPreferencePage extends PreferencePage implement
 
 		initializeFields();
 
-		for (int i= 0, n= fSyntaxColorListModel.length; i < n; i++)
-			fHighlightingColorList.add(new HighlightingColorListItem (fSyntaxColorListModel[i][0], fSyntaxColorListModel[i][1], fSyntaxColorListModel[i][1] + BOLD, fSyntaxColorListModel[i][1] + ITALIC, fSyntaxColorListModel[i][1] + STRIKETHROUGH, fSyntaxColorListModel[i][1] + UNDERLINE, null));
+		for (String[] syntaxColor : fSyntaxColorListModel)
+			fHighlightingColorList.add(new HighlightingColorListItem (syntaxColor[0], syntaxColor[1], syntaxColor[1] + BOLD, syntaxColor[1] + ITALIC, syntaxColor[1] + STRIKETHROUGH, syntaxColor[1] + UNDERLINE, null));
 
 		fHighlightingColorListViewer.setInput(fHighlightingColorList);
 		fHighlightingColorListViewer.setSelection(new StructuredSelection(fHighlightingColorListViewer.getElementAt(0)));
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/SaveParticipantConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/SaveParticipantConfigurationBlock.java
index 966e9294fa..c05b915ccb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/SaveParticipantConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/SaveParticipantConfigurationBlock.java
@@ -149,8 +149,7 @@ class SaveParticipantConfigurationBlock implements IPreferenceAndPropertyConfigu
 	}
 
 	private void delegateToPreferenceConfiguration(IDelegateOperation op) {
-		for (int i= 0; i < fConfigurations.size(); i++) {
-	        ISaveParticipantPreferenceConfiguration block= fConfigurations.get(i);
+		for (ISaveParticipantPreferenceConfiguration block : fConfigurations) {
 	        op.run(block);
         }
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskInputDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskInputDialog.java
index c6eb7124b1..940fe8dc03 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskInputDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskInputDialog.java
@@ -58,8 +58,7 @@ public class TodoTaskInputDialog extends StatusDialog {
 		super(parent);
 
 		fExistingNames= new ArrayList<>(existingEntries.size());
-		for (int i= 0; i < existingEntries.size(); i++) {
-			TodoTask curr= existingEntries.get(i);
+		for (TodoTask curr : existingEntries) {
 			if (!curr.equals(task)) {
 				fExistingNames.add(curr.name);
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TypeFilterPreferencePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TypeFilterPreferencePage.java
index fd020d2009..982a190510 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TypeFilterPreferencePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TypeFilterPreferencePage.java
@@ -84,8 +84,8 @@ public class TypeFilterPreferencePage extends PreferencePage implements IWorkben
 
 	private static String packOrderList(List<String> orderList) {
 		StringBuilder buf= new StringBuilder();
-		for (int i= 0; i < orderList.size(); i++) {
-			buf.append(orderList.get(i));
+		for (String element : orderList) {
+			buf.append(element);
 			buf.append(';');
 		}
 		return buf.toString();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/UserLibraryPreferencePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/UserLibraryPreferencePage.java
index ec144fbb37..6d7854fae9 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/UserLibraryPreferencePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/UserLibraryPreferencePage.java
@@ -208,8 +208,7 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe
 			if (name.length() == 0) {
 				return new StatusInfo(IStatus.ERROR, PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_name_error_entername);
 			}
-			for (int i= 0; i < fExistingLibraries.size(); i++) {
-				CPUserLibraryElement curr= fExistingLibraries.get(i);
+			for (CPUserLibraryElement curr : fExistingLibraries) {
 				if (curr != fElementToEdit && name.equals(curr.getName())) {
 					return new StatusInfo(IStatus.ERROR, Messages.format(PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_name_error_exists, name));
 				}
@@ -499,14 +498,12 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe
 				}
 			} else {
 				HashSet<String> map= new HashSet<>(fExistingLibraries.size());
-				for (int k= 0; k < fExistingLibraries.size(); k++) {
-					CPUserLibraryElement elem= fExistingLibraries.get(k);
+				for (CPUserLibraryElement elem : fExistingLibraries) {
 					map.add(elem.getName());
 				}
 				int nReplaced= 0;
 				List<CPUserLibraryElement> elements= getLoadedLibraries();
-				for (int i= 0; i < elements.size(); i++) {
-					CPUserLibraryElement curr= elements.get(i);
+				for (CPUserLibraryElement curr : elements) {
 					if (map.contains(curr.getName())) {
 						nReplaced++;
 					}
@@ -578,11 +575,10 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe
 
 				rootElement.setAttribute(TAG_VERSION, CURRENT_VERSION);
 
-				for (int i= 0; i < libraries.size(); i++) {
+				for (CPUserLibraryElement curr : libraries) {
 					Element libraryElement= document.createElement(TAG_LIBRARY);
 					rootElement.appendChild(libraryElement);
 
-					CPUserLibraryElement curr= libraries.get(i);
 					libraryElement.setAttribute(TAG_NAME, curr.getName());
 					libraryElement.setAttribute(TAG_SYSTEMLIBRARY, String.valueOf(curr.isSystemLibrary()));
 
@@ -842,9 +838,7 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe
 			Object selectedLibrary= map.get(DATA_LIBRARY_TO_SELECT);
 			boolean createIfNotExists= Boolean.TRUE.equals(map.get(DATA_DO_CREATE));
 			if (selectedLibrary instanceof String) {
-				int nElements= fLibraryList.getSize();
-				for (int i= 0; i < nElements; i++) {
-					CPUserLibraryElement curr= fLibraryList.getElement(i);
+				for (CPUserLibraryElement curr : fLibraryList.getElements()) {
 					if (curr.getName().equals(selectedLibrary)) {
 						fLibraryList.selectElements(new StructuredSelection(curr));
 						fLibraryList.expandElement(curr, 1);
@@ -935,8 +929,7 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe
 		int nExisting= list.size();
 
 		HashSet<CPUserLibraryElement> newEntries= new HashSet<>(list.size());
-		for (int i= 0; i < nExisting; i++) {
-			CPUserLibraryElement element= list.get(i);
+		for (CPUserLibraryElement element : list) {
 			boolean contained= oldNames.remove(element.getName());
 			if (!contained) {
 				newEntries.add(element);
@@ -1156,8 +1149,7 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe
 
 	private void doRemove(List<Object> selected) {
 		Object selectionAfter= null;
-		for (int i= 0; i < selected.size(); i++) {
-			Object curr= selected.get(i);
+		for (Object curr : selected) {
 			if (curr instanceof CPUserLibraryElement) {
 				fLibraryList.removeElement((CPUserLibraryElement) curr);
 			} else if (curr instanceof CPListElement) {
@@ -1269,8 +1261,7 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe
 		LoadSaveDialog dialog= new LoadSaveDialog(getShell(), false, existing, fDialogSettings);
 		if (dialog.open() == Window.OK) {
 			HashMap<String, CPUserLibraryElement> map= new HashMap<>(existing.size());
-			for (int k= 0; k < existing.size(); k++) {
-				CPUserLibraryElement elem= existing.get(k);
+			for (CPUserLibraryElement elem : existing) {
 				map.put(elem.getName(), elem);
 			}
 
@@ -1320,8 +1311,7 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe
 		if (list.isEmpty()) {
 			return false;
 		}
-		for (int i= 0; i < list.size(); i++) {
-			Object elem= list.get(i);
+		for (Object elem : list) {
 			if (elem instanceof CPListElementAttribute) {
 				CPListElementAttribute attrib= (CPListElementAttribute) elem;
 				if (attrib.isNonModifiable()) {
@@ -1353,8 +1343,7 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe
 
 	private CPUserLibraryElement getCommonParent(List<?> list) {
 		CPUserLibraryElement parent= null;
-		for (int i= 0, len= list.size(); i < len; i++) {
-			Object curr= list.get(i);
+		for (Object curr : list) {
 			if (curr instanceof CPListElement) {
 				Object elemParent= ((CPListElement) curr).getParentContainer();
 				if (parent == null) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java
index 36eb6c3ec3..d3ae59b190 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java
@@ -15,7 +15,6 @@
 package org.eclipse.jdt.internal.ui.preferences.cleanup;
 
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Observable;
@@ -162,10 +161,7 @@ public class CleanUpConfigurationBlock extends ProfileConfigurationBlock {
 
 	private void fill(Map<String, String> settings, Map<String, String> sharedSettings) {
 		sharedSettings.clear();
-		for (Map.Entry<String, String> entry : settings.entrySet()) {
-			String key = entry.getKey();
-			sharedSettings.put(key, entry.getValue());
-		}
+		sharedSettings.putAll(settings);
     }
 
 	@Override
@@ -248,8 +244,8 @@ public class CleanUpConfigurationBlock extends ProfileConfigurationBlock {
 				}
 
 				List<Profile> newProfiles= fProfileStore.readProfilesFromString((String)event.getNewValue());
-				for (Iterator<Profile> iterator= newProfiles.iterator(); iterator.hasNext();) {
-					CustomProfile profile= (CustomProfile)iterator.next();
+				for (Profile profile2 : newProfiles) {
+					CustomProfile profile= (CustomProfile)profile2;
 					fProfileManager.addProfile(profile);
 				}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpProfileVersioner.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpProfileVersioner.java
index 8c3eee22df..f1115307b4 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpProfileVersioner.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpProfileVersioner.java
@@ -13,7 +13,6 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.ui.preferences.cleanup;
 
-import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
@@ -60,8 +59,7 @@ public class CleanUpProfileVersioner implements IProfileVersioner {
 				updateFrom1To2(oldSettings);
 				//$FALL-THROUGH$
 			default:
-				for (final Iterator<String> iter= oldSettings.keySet().iterator(); iter.hasNext();) {
-					final String key= iter.next();
+				for (String key : oldSettings.keySet()) {
 					if (!newSettings.containsKey(key))
 						continue;
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
index 3269adddf5..e6dc7c90d9 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
@@ -189,9 +189,9 @@ public class CustomCodeFormatterBlock extends Observable {
 			IExtension[] exts= point.getExtensions();
 			for (IExtension ext : exts) {
 				IConfigurationElement[] elements= ext.getConfigurationElements();
-				for (int j = 0; j < elements.length; ++j) {
-					String name = elements[j].getAttribute(ATTR_NAME);
-					String id= elements[j].getAttribute(ATTR_ID);
+				for (IConfigurationElement element : elements) {
+					String name = element.getAttribute(ATTR_NAME);
+					String id= element.getAttribute(ATTR_ID);
 					formatters.add(new FormatterContribution(id, name));
 				}
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterProfileStore.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterProfileStore.java
index 68786220bb..9c625a8e5c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterProfileStore.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterProfileStore.java
@@ -80,8 +80,8 @@ public class FormatterProfileStore extends ProfileStore {
 				FileReader reader= new FileReader(file)) {
 				List<Profile> res= readProfilesFromStream(new InputSource(reader));
 				if (res != null) {
-					for (int i= 0; i < res.size(); i++) {
-						fProfileVersioner.update((CustomProfile) res.get(i));
+					for (Profile re : res) {
+						fProfileVersioner.update((CustomProfile) re);
 					}
 					writeProfiles(res, instanceScope);
 				}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileManager.java
index 9a53be49a3..0ce50f36e8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileManager.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileManager.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Observable;
@@ -388,8 +387,7 @@ public abstract class ProfileManager extends Observable {
 		fProfiles= new HashMap<>();
 		fProfilesByName= new ArrayList<>();
 
-		for (final Iterator<Profile> iter = profiles.iterator(); iter.hasNext();) {
-			final Profile profile= iter.next();
+		for (Profile profile : profiles) {
 			if (profile instanceof CustomProfile) {
 				((CustomProfile)profile).setManager(this);
 			}
@@ -427,8 +425,7 @@ public abstract class ProfileManager extends Observable {
 					}
 				} else {
 					// old version: look for similar
-					for (final Iterator<Profile> iter = fProfilesByName.iterator(); iter.hasNext();) {
-						Profile curr= iter.next();
+					for (Profile curr : fProfilesByName) {
 						if (curr.hasEqualSettings(map, allKeys)) {
 							matching= curr;
 							break;
@@ -481,8 +478,7 @@ public abstract class ProfileManager extends Observable {
 	public static boolean hasProjectSpecificSettings(IScopeContext context, KeySet[] keySets) {
 		for (KeySet keySet : keySets) {
 			IEclipsePreferences preferences= context.getNode(keySet.getNodeName());
-			for (final Iterator<String> keyIter= keySet.getKeys().iterator(); keyIter.hasNext();) {
-				final String key= keyIter.next();
+			for (String key : keySet.getKeys()) {
 				Object val= preferences.get(key, null);
 				if (val != null) {
 					return true;
@@ -518,8 +514,7 @@ public abstract class ProfileManager extends Observable {
 		boolean hasValues= false;
 		for (KeySet keySet : fKeySets) {
 			IEclipsePreferences preferences= context.getNode(keySet.getNodeName());
-			for (final Iterator<String> keyIter = keySet.getKeys().iterator(); keyIter.hasNext(); ) {
-				final String key= keyIter.next();
+			for (String key : keySet.getKeys()) {
 				String val= preferences.get(key, null);
 				if (val != null) {
 					hasValues= true;
@@ -559,8 +554,7 @@ public abstract class ProfileManager extends Observable {
 
 	private boolean updatePreferences(IEclipsePreferences prefs, List<String> keys, Map<String, String> profileOptions) {
 		boolean hasChanges= false;
-		for (final Iterator<String> keyIter = keys.iterator(); keyIter.hasNext(); ) {
-			final String key= keyIter.next();
+		for (String key : keys) {
 			final String oldVal= prefs.get(key, null);
 			final String val= profileOptions.get(key);
 			if (val == null) {
@@ -623,8 +617,7 @@ public abstract class ProfileManager extends Observable {
 	public String[] getSortedDisplayNames() {
 		final String[] sortedNames= new String[fProfilesByName.size()];
 		int i= 0;
-		for (final Iterator<Profile> iter = fProfilesByName.iterator(); iter.hasNext();) {
-			Profile curr= iter.next();
+		for (Profile curr : fProfilesByName) {
 			sortedNames[i++]= curr.getName();
 		}
 		return sortedNames;
@@ -685,8 +678,7 @@ public abstract class ProfileManager extends Observable {
 	 * @return Returns <code>true</code> if a profile with the given name exists
 	 */
 	public boolean containsName(String name) {
-		for (final Iterator<Profile> iter = fProfilesByName.iterator(); iter.hasNext();) {
-			Profile curr= iter.next();
+		for (Profile curr : fProfilesByName) {
 			if (name.equals(curr.getName())) {
 				return true;
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileStore.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileStore.java
index d938b4b1f7..1556cab65b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileStore.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileStore.java
@@ -195,8 +195,8 @@ public class ProfileStore {
 			try {
 				List<Profile> res= readProfilesFromStream(new InputSource(is));
 				if (res != null) {
-					for (int i= 0; i < res.size(); i++) {
-						fProfileVersioner.update((CustomProfile) res.get(i));
+					for (Profile re : res) {
+						fProfileVersioner.update((CustomProfile) re);
 					}
 				}
 				return res;
@@ -287,8 +287,7 @@ public class ProfileStore {
 
 			document.appendChild(rootElement);
 
-			for(final Iterator<Profile> iter= profiles.iterator(); iter.hasNext();) {
-				final Profile profile= iter.next();
+			for (Profile profile : profiles) {
 				if (profile.isProfileToSave()) {
 					final Element profileElement= createProfileElement(profile, document, profileVersioner);
 					rootElement.appendChild(profileElement);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersioner.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersioner.java
index 80c031d5e7..f9486f0457 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersioner.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersioner.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.jdt.internal.ui.preferences.formatter;
 
-import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.jdt.core.JavaCore;
@@ -130,16 +129,15 @@ public class ProfileVersioner implements IProfileVersioner {
 			version18to19(oldSettings);
 			//$FALL-THROUGH$
 		default:
-		    for (final Iterator<String> iter= oldSettings.keySet().iterator(); iter.hasNext(); ) {
-		        final String key= iter.next();
-		        if (!newSettings.containsKey(key))
-		            continue;
-
-		        final String value= oldSettings.get(key);
-		        if (value != null) {
-		            newSettings.put(key, value);
-		        }
-		    }
+				for (String key : oldSettings.keySet()) {
+				    if (!newSettings.containsKey(key))
+				        continue;
+
+				    final String value= oldSettings.get(key);
+				    if (value != null) {
+				        newSettings.put(key, value);
+				    }
+				}
 		    // copy over profile options (not formatter settings)
 		    if (oldSettings.containsKey(JavaCore.JAVA_FORMATTER)) {
 		        newSettings.put(JavaCore.JAVA_FORMATTER, oldSettings.get(JavaCore.JAVA_FORMATTER));