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

16 files changed, 35 insertions, 63 deletions

diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java
index 13062823a5..efcebd619b 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.refactoring;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
@@ -699,8 +698,8 @@ public class ChangeParametersControl extends Composite {
 		}
 		res.addAll(deleted);
 		elements.clear();
-		for (Iterator<ParameterInfo> iter= res.iterator(); iter.hasNext();) {
-			elements.add(iter.next());
+		for (ParameterInfo parameterInfo : res) {
+			elements.add(parameterInfo);
 		}
 	}
 
@@ -712,8 +711,8 @@ public class ChangeParametersControl extends Composite {
 		if (indc.length == 0)
 			return false;
 		int invalid= up ? 0 : notDeletedInfosCount - 1;
-		for (int i= 0; i < indc.length; i++) {
-			if (indc[i] == invalid)
+		for (int element : indc) {
+			if (element == invalid)
 				return false;
 		}
 		return true;
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureWizard.java
index efd49a5503..33b45012d8 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureWizard.java
@@ -168,8 +168,8 @@ public class ChangeSignatureWizard extends RefactoringWizard {
 			if (availableVisibilities.length == 0) {
 				combo.setEnabled(false);
 			} else {
-				for (int i= 0; i < availableVisibilities.length; i++) {
-					combo.add(getAccessModifierString(availableVisibilities[i]));
+				for (int availableVisibility : availableVisibilities) {
+					combo.add(getAccessModifierString(availableVisibility));
 				}
 				combo.addSelectionListener(new SelectionAdapter() {
 					@Override
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java
index 37d5bb9d8b..037084b5e5 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java
@@ -167,8 +167,7 @@ public class ChangeTypeWizard extends RefactoringWizard {
 
 		@Override
 		public void dispose() {
-			for (Iterator<Image> iter= fGrayImages.values().iterator(); iter.hasNext();) {
-				Image image= iter.next();
+			for (Image image : fGrayImages.values()) {
 				image.dispose();
 			}
 			fGrayImages.clear();
@@ -239,8 +238,7 @@ public class ChangeTypeWizard extends RefactoringWizard {
 
 			// first, find a most general valid type (there may be more than one)
 			ITypeBinding type= types.iterator().next();
-			for (Iterator<ITypeBinding> it= types.iterator(); it.hasNext(); ){
-				ITypeBinding other= it.next();
+			for (ITypeBinding other : types) {
 				if (getGeneralizeTypeRefactoring().isSubTypeOf(type, other)){
 					type= other;
 				}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java
index 284987d324..c3ef4cbb74 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java
@@ -303,8 +303,7 @@ public final class ExtractSupertypeMemberPage extends PullUpMemberPage {
 				final LinkedList<IType> list= new LinkedList<>(Arrays.asList(fCandidateTypes));
 				for (final Iterator<IType> outer= list.iterator(); outer.hasNext();) {
 					final IType first= outer.next();
-					for (final Iterator<IType> inner= fTypesToExtract.iterator(); inner.hasNext();) {
-						final IType second= inner.next();
+					for (IType second : fTypesToExtract) {
 						if (second.getFullyQualifiedName().equals(first.getFullyQualifiedName()))
 							outer.remove();
 					}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InputPageUtil.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InputPageUtil.java
index 9965f0a719..f8e07d63f1 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InputPageUtil.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InputPageUtil.java
@@ -91,8 +91,8 @@ public final class InputPageUtil {
 
 	private static List<Integer> convertToIntegerList(int[] array) {
 		List<Integer> result= new ArrayList<>(array.length);
-		for (int i= 0; i < array.length; i++) {
-			result.add(Integer.valueOf(array[i]));
+		for (int element : array) {
+			result.add(Integer.valueOf(element));
 		}
 		return result;
 	}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java
index 9a8615aa01..fd005bd218 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java
@@ -523,8 +523,7 @@ public class IntroduceParameterObjectWizard extends RefactoringWizard {
 				public void widgetSelected(SelectionEvent e) {
 					int[] indices= tv.getTable().getSelectionIndices();
 					Arrays.sort(indices);
-					for (int i= 0; i <indices.length; i++) {
-						int idx= indices[i];
+					for (int idx : indices) {
 						ParameterInfo pi= (ParameterInfo) tv.getElementAt(idx);
 						fProcessor.moveFieldUp(pi);
 					}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java
index 46b7548d17..2a8377f194 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java
@@ -17,7 +17,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -794,8 +793,7 @@ public class PullUpMemberPage extends UserInputWizardPage {
 		final int commonActionCode= getCommonActionCodeForSelectedInfos();
 		if (commonActionCode == -1)
 			return 0;
-		for (final Iterator<String> iter= stringMapping.keySet().iterator(); iter.hasNext();) {
-			final String key= iter.next();
+		for (String key : stringMapping.keySet()) {
 			final int action= stringMapping.get(key).intValue();
 			if (commonActionCode == action) {
 				for (int i= 0; i < keys.length; i++) {
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java
index 4dbedac603..b0d1b724c0 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java
@@ -18,7 +18,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;
@@ -232,8 +231,7 @@ public class PullUpMethodPage extends UserInputWizardPage {
 		final Map<IType, HashSet<IMember>> typeToMemberSet= createTypeToMemberSetMapping(members);
 
 		final Map<IType, IMember[]> typeToMemberArray= new HashMap<>();
-		for (final Iterator<IType> iter= typeToMemberSet.keySet().iterator(); iter.hasNext();) {
-			final IType type= iter.next();
+		for (IType type : typeToMemberSet.keySet()) {
 			final Set<IMember> memberSet= typeToMemberSet.get(type);
 			final IMember[] memberArray= memberSet.toArray(new IMember[memberSet.size()]);
 			typeToMemberArray.put(type, memberArray);
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java
index 2d7bce9d08..e7a87cc50d 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java
@@ -17,7 +17,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -495,8 +494,7 @@ public final class PushDownWizard extends RefactoringWizard {
 			final int commonActionCode= getCommonActionCodeForSelectedInfos();
 			if (commonActionCode == -1)
 				return 0;
-			for (final Iterator<String> iterator= mapping.keySet().iterator(); iterator.hasNext();) {
-				final String key= iterator.next();
+			for (String key : mapping.keySet()) {
 				final int action= mapping.get(key).intValue();
 				if (commonActionCode == action) {
 					for (int index= 0; index < keys.length; index++) {
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ReferencesInBinaryStatusContextViewer.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ReferencesInBinaryStatusContextViewer.java
index d74c51bec1..7ecf019035 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ReferencesInBinaryStatusContextViewer.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ReferencesInBinaryStatusContextViewer.java
@@ -15,7 +15,6 @@ package org.eclipse.jdt.internal.ui.refactoring;
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -144,8 +143,7 @@ public class ReferencesInBinaryStatusContextViewer implements IStatusContextView
 
 		ReferencesInBinaryContext binariesContext= (ReferencesInBinaryContext) input;
 		List<SearchMatch> matches= binariesContext.getMatches();
-		for (Iterator<SearchMatch> iter= matches.iterator(); iter.hasNext();) {
-			SearchMatch match= iter.next();
+		for (SearchMatch match : matches) {
 			Object element= match.getElement();
 			if (element != null)
 				contentProvider.add(element);
@@ -259,9 +257,9 @@ public class ReferencesInBinaryStatusContextViewer implements IStatusContextView
 			NewSearchResultCollector collector= new NewSearchResultCollector(fResult, false);
 			collector.beginReporting();
 
-			for (Iterator<SearchMatch> iter= matches.iterator(); iter.hasNext();) {
+			for (SearchMatch searchMatch : matches) {
 				try {
-					collector.acceptSearchMatch(iter.next());
+					collector.acceptSearchMatch(searchMatch);
 				} catch (CoreException e) {
 					// ignore
 				}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeWizard.java
index 36e8c1e891..8db3f2d112 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeWizard.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.refactoring;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -292,8 +291,8 @@ public class UseSupertypeWizard extends RefactoringWizard{
 
 		private int countFilesWithValue(int i) {
 			int count= 0;
-			for (Iterator<IType> iter= fFileCount.keySet().iterator(); iter.hasNext();) {
-				if (fFileCount.get(iter.next()).intValue() == i)
+			for (IType iType : fFileCount.keySet()) {
+				if (fFileCount.get(iType).intValue() == i)
 					count++;
 			}
 			return count;
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java
index b2f3162e68..8aa09882bd 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java
@@ -97,6 +97,7 @@ import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.JavaModelException;
 
+import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
 import org.eclipse.jdt.internal.corext.refactoring.nls.KeyValuePair;
 import org.eclipse.jdt.internal.corext.refactoring.nls.NLSRefactoring;
 import org.eclipse.jdt.internal.corext.refactoring.nls.NLSSubstitution;
@@ -114,7 +115,6 @@ import org.eclipse.jdt.internal.ui.javaeditor.JavaSourceViewer;
 import org.eclipse.jdt.internal.ui.propertiesfileeditor.PropertiesFileEscapes;
 import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
 import org.eclipse.jdt.internal.ui.util.SWTUtil;
-import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
 import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
@@ -1122,9 +1122,8 @@ class ExternalizeWizardPage extends UserInputWizardPage {
 	}
 
 	private void revertStateOfSelection() {
-		List<?> selection= getSelectedTableEntries();
-		for (Iterator<?> iter= selection.iterator(); iter.hasNext();) {
-			NLSSubstitution substitution= (NLSSubstitution) iter.next();
+		for (Object name : getSelectedTableEntries()) {
+			NLSSubstitution substitution= (NLSSubstitution) name;
 			substitution.revert();
 		}
 		fTableViewer.refresh();
@@ -1176,8 +1175,8 @@ class ExternalizeWizardPage extends UserInputWizardPage {
 		Assert.isTrue(state == NLSSubstitution.EXTERNALIZED || state == NLSSubstitution.IGNORED || state == NLSSubstitution.INTERNALIZED);
 		List<?> selected= getSelectedTableEntries();
 		String[] props= new String[]{PROPERTIES[STATE_PROP]};
-		for (Iterator<?> iter= selected.iterator(); iter.hasNext();) {
-			NLSSubstitution substitution= (NLSSubstitution) iter.next();
+		for (Object name : selected) {
+			NLSSubstitution substitution= (NLSSubstitution) name;
 			substitution.setState(state);
 			if ((substitution.getState() == NLSSubstitution.EXTERNALIZED) && substitution.hasStateChanged()) {
 				substitution.generateKey(fSubstitutions, getProperties(fNLSRefactoring.getPropertyFileHandle()));
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/RenameKeysDialog.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/RenameKeysDialog.java
index e93cd569b3..1b7149146c 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/RenameKeysDialog.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/RenameKeysDialog.java
@@ -68,8 +68,7 @@ public class RenameKeysDialog extends StatusDialog {
 	@Override
 	protected void okPressed() {
 		String prefix= fNameField.getText();
-		for (int i= 0; i < fSelectedSubstitutions.size(); i++) {
-			NLSSubstitution sub= fSelectedSubstitutions.get(i);
+		for (NLSSubstitution sub : fSelectedSubstitutions) {
 			String newKey= prefix + sub.getKey().substring(fCommonPrefixLength);
 			sub.setKey(newKey);
 		}
@@ -78,8 +77,7 @@ public class RenameKeysDialog extends StatusDialog {
 
 	private String getInitialPrefix(List<NLSSubstitution> selectedSubstitutions) {
 		String prefix= null;
-		for (int i= 0; i < selectedSubstitutions.size(); i++) {
-			NLSSubstitution sub= selectedSubstitutions.get(i);
+		for (NLSSubstitution sub : selectedSubstitutions) {
 			String curr= sub.getKey();
 			if (prefix == null) {
 				prefix= curr;
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java
index 3763857d82..3a8d76252c 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -440,8 +439,7 @@ public class PasteAction extends SelectionDispatchAction{
 				int maxVisibility= JdtFlags.VISIBILITY_CODE_INVALID;
 
 				// Public types must be in separate CUs:
-				for (Iterator<AbstractTypeDeclaration> iter= types.iterator(); iter.hasNext(); ) {
-					AbstractTypeDeclaration type= iter.next();
+				for (AbstractTypeDeclaration type : types) {
 					if (typeName == null) {
 						// first in group:
 						maxVisibility= JdtFlags.getVisibilityCode(type);
@@ -1177,13 +1175,11 @@ public class PasteAction extends SelectionDispatchAction{
 				List<IJavaElement> realJavaElements= new ArrayList<>();
 				List<IResource> realResource= new ArrayList<>();
 				ReorgUtils.splitIntoJavaElementsAndResources(resources, realJavaElements, realResource);
-				for (Iterator<IJavaElement> iter= realJavaElements.iterator(); iter.hasNext();) {
-					IJavaElement element= iter.next();
+				for (IJavaElement element : realJavaElements) {
 					if (!ReorgUtils.containsElementOrParent(elements, element))
 						elements.add(element);
 				}
-				for (Iterator<IResource> iter= realResource.iterator(); iter.hasNext();) {
-					IResource element= iter.next();
+				for (IResource element : realResource) {
 					if (!ReorgUtils.containsElementOrParent(elements, element))
 						elements.add(element);
 				}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java
index 17c110493b..d90c0033cf 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.refactoring.reorg;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -326,8 +325,7 @@ class RenameTypeWizardSimilarElementsPage extends UserInputWizardPage {
 
 		@Override
 		public void dispose() {
-			for (Iterator<Image> iter= fDescriptorImageMap.values().iterator(); iter.hasNext();) {
-				Image image= iter.next();
+			for (Image image : fDescriptorImageMap.values()) {
 				image.dispose();
 			}
 			super.dispose();
@@ -632,8 +630,7 @@ class RenameTypeWizardSimilarElementsPage extends UserInputWizardPage {
 	private void initializeRefFromUI() {
 		IJavaElement[] selected= getCheckedSimilarElements();
 		Map<IJavaElement, Boolean> selection= getRenameTypeProcessor().getSimilarElementsToSelection();
-		for (Iterator<IJavaElement> iter= selection.keySet().iterator(); iter.hasNext();) {
-			IJavaElement element= iter.next();
+		for (IJavaElement element : selection.keySet()) {
 			selection.put(element, Boolean.FALSE);
 		}
 		for (IJavaElement s : selected) {
@@ -666,10 +663,8 @@ class RenameTypeWizardSimilarElementsPage extends UserInputWizardPage {
 	}
 
 	private void restoreSelectionAndNames(final Map<IJavaElement, Boolean> selection) {
-		final Map<IJavaElement, Boolean> selectedElements= selection;
-		for (Iterator<IJavaElement> iter= selectedElements.keySet().iterator(); iter.hasNext();) {
-			IJavaElement element= iter.next();
-			boolean isSelected= selectedElements.get(element).booleanValue();
+		for (IJavaElement element : selection.keySet()) {
+			boolean isSelected= selection.get(element).booleanValue();
 			fTreeViewer.setChecked(element, isSelected);
 			fTreeViewer.update(element, null);
 		}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java
index 3df278a2aa..b5ea801478 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.refactoring.sef;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
@@ -267,8 +266,7 @@ public class SelfEncapsulateFieldInputPage extends UserInputWizardPage {
 
 	private void updateEnablements() {
 		boolean enable=!(fRefactoring.isUsingLocalSetter()&&fRefactoring.isUsingLocalGetter());
-		for (Iterator<Control> iter= fEnablements.iterator(); iter.hasNext();) {
-			Control control= iter.next();
+		for (Control control : fEnablements) {
 			control.setEnabled(enable);
 		}
 	}