Bug 548309 - Use jdk 5 for-each loop and optimize for loop usageI20200324-1800

Replace simple uses of Iterator or index with a corresponding for-loop.
Use Arrays.fill(), String.join(), Collections.addAll(),
Collection.contains() and Collection.containsAll() instead of for loops.
Add useful breaks.
Remove useless continues.

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

17 files changed, 54 insertions, 89 deletions

diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/flow/FlowContext.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/flow/FlowContext.java
index 4018ebee72..9a7859da31 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/flow/FlowContext.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/flow/FlowContext.java
@@ -15,7 +15,6 @@
 package org.eclipse.jdt.internal.corext.refactoring.code.flow;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.runtime.Assert;
@@ -133,9 +132,9 @@ public class FlowContext {
 	}
 
 	boolean isExceptionCaught(ITypeBinding excpetionType) {
-		for (Iterator<List<CatchClause>> exceptions= fExceptionStack.iterator(); exceptions.hasNext(); ) {
-			for (Iterator<CatchClause> catchClauses= exceptions.next().iterator(); catchClauses.hasNext(); ) {
-				SingleVariableDeclaration caughtException= catchClauses.next().getException();
+		for (List<CatchClause> exceptions : fExceptionStack) {
+			for (CatchClause catchClause : exceptions) {
+				SingleVariableDeclaration caughtException= catchClause.getException();
 				IVariableBinding binding= caughtException.resolveBinding();
 				if (binding == null)
 					continue;
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/JUnit4TestFinder.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/JUnit4TestFinder.java
index cd86a32b30..2bda3436ea 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/JUnit4TestFinder.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/JUnit4TestFinder.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.junit.launcher;
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.eclipse.core.runtime.CoreException;
@@ -145,8 +144,7 @@ public class JUnit4TestFinder implements ITestFinder {
 			new SearchEngine().search(annotationsPattern, searchParticipants, scope, requestor, new SubProgressMonitor(pm, 2));
 
 			// find all classes in the region
-			for (Iterator<IType> iterator= candidates.iterator(); iterator.hasNext();) {
-				IType curr= iterator.next();
+			for (IType curr : candidates) {
 				if (CoreTestSearchEngine.isAccessibleClass(curr) && !Flags.isAbstract(curr.getFlags()) && region.contains(curr)) {
 					result.add(curr);
 				}
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/TestKindRegistry.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/TestKindRegistry.java
index 8c863f7f19..29c3ea725b 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/TestKindRegistry.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/TestKindRegistry.java
@@ -18,7 +18,6 @@ package org.eclipse.jdt.internal.junit.launcher;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
@@ -70,9 +69,8 @@ public class TestKindRegistry {
 			return;
 
 		ArrayList<TestKind> items= new ArrayList<>();
-		for (Iterator<IConfigurationElement> iter= getConfigurationElements().iterator(); iter.hasNext();) {
-			IConfigurationElement element= iter.next();
-			items.add(new TestKind(element));
+		for (IConfigurationElement configurationElement : getConfigurationElements()) {
+			items.add(new TestKind(configurationElement));
 		}
 
 		Collections.sort(items, new Comparator<TestKind>() {
@@ -168,12 +166,8 @@ public class TestKindRegistry {
 
 	private ArrayList<IConfigurationElement> getConfigurationElements() {
 		ArrayList<IConfigurationElement> items= new ArrayList<>();
-		IExtension[] extensions= fPoint.getExtensions();
-		for (IExtension extension : extensions) {
-			IConfigurationElement[] elements= extension.getConfigurationElements();
-			for (IConfigurationElement element : elements) {
-				items.add(element);
-			}
+		for (IExtension extension : fPoint.getExtensions()) {
+			Collections.addAll(items, extension.getConfigurationElements());
 		}
 		return items;
 	}
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/JUnitModel.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/JUnitModel.java
index 0d080c230f..43be09a3d3 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/JUnitModel.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/JUnitModel.java
@@ -370,8 +370,7 @@ public final class JUnitModel {
 			}
 		}
 
-		for (int i= 0; i < toRemove.size(); i++) {
-			TestRunSession oldSession= toRemove.get(i);
+		for (TestRunSession oldSession : toRemove) {
 			notifyTestRunSessionRemoved(oldSession);
 		}
 		notifyTestRunSessionAdded(testRunSession);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
index d94a4aebbe..82e4e1a54f 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
@@ -422,8 +422,7 @@ public class TestRunnerViewPart extends ViewPart {
 			for (TestRunSession testRunSession : testRunSessions) {
 				JUnitCorePlugin.getModel().removeTestRunSession(testRunSession);
 			}
-			for (Iterator<TestRunSession> iter= remainingEntries.iterator(); iter.hasNext();) {
-				TestRunSession remaining= iter.next();
+			for (TestRunSession remaining : remainingEntries) {
 				remaining.swapOut();
 			}
 		}
@@ -1666,8 +1665,8 @@ action enablement
 	}
 
 	private void disposeImages() {
-		for (int i= 0; i < fImagesToDispose.size(); i++) {
-			fImagesToDispose.get(i).dispose();
+		for (Image imageToDispose : fImagesToDispose) {
+			imageToDispose.dispose();
 		}
 	}
 
@@ -2035,8 +2034,8 @@ action enablement
 		viewMenu.add(new Separator());
 
 		MenuManager layoutSubMenu= new MenuManager(JUnitMessages.TestRunnerViewPart_layout_menu);
-		for (int i = 0; i < fToggleOrientationActions.length; ++i) {
-			layoutSubMenu.add(fToggleOrientationActions[i]);
+		for (ToggleOrientationAction toggleOrientationAction : fToggleOrientationActions) {
+			layoutSubMenu.add(toggleOrientationAction);
 		}
 		viewMenu.add(layoutSubMenu);
 		viewMenu.add(new Separator());
@@ -2231,8 +2230,8 @@ action enablement
 			return;
 		boolean horizontal = orientation == VIEW_ORIENTATION_HORIZONTAL;
 		fSashForm.setOrientation(horizontal ? SWT.HORIZONTAL : SWT.VERTICAL);
-		for (int i = 0; i < fToggleOrientationActions.length; ++i)
-			fToggleOrientationActions[i].setChecked(fOrientation == fToggleOrientationActions[i].getOrientation());
+		for (ToggleOrientationAction toggleOrientationAction : fToggleOrientationActions)
+			toggleOrientationAction.setChecked(fOrientation == toggleOrientationAction.getOrientation());
 		fCurrentOrientation = orientation;
 		GridLayout layout= (GridLayout) fCounterComposite.getLayout();
 		setCounterColumns(layout);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
index aba2a3e11e..673e9752ce 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
@@ -799,8 +799,8 @@ public class TestViewer {
 		List<ITestElement> children= Arrays.asList(root.getChildren());
 		if (! showNext)
 			children= new ReverseList<>(children);
-		for (int i= 0; i < children.size(); i++) {
-			TestElement child= (TestElement) children.get(i);
+		for (ITestElement element : children) {
+			TestElement child= (TestElement) element;
 			if (child.getStatus().isErrorOrFailure()) {
 				if (child instanceof TestCaseElement) {
 					return child;
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
index a549b1b473..eb7f89a5d1 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
@@ -242,8 +242,8 @@ public class CheckedTableSelectionDialog extends SelectionStatusDialog {
 		});
 
 		if (fFilters != null) {
-			for (int i= 0; i != fFilters.size(); i++)
-				fViewer.addFilter(fFilters.get(i));
+			for (ViewerFilter filter : fFilters)
+				fViewer.addFilter(filter);
 		}
 
 		fViewer.setInput(fInput);
@@ -292,8 +292,7 @@ public class CheckedTableSelectionDialog extends SelectionStatusDialog {
 		Object[] elements= fContentProvider.getElements(input);
 		if (elements.length > 0) {
 			if (fFilters != null) {
-				for (int i= 0; i < fFilters.size(); i++) {
-					ViewerFilter curr= fFilters.get(i);
+				for (ViewerFilter curr : fFilters) {
 					elements= curr.filter(fViewer, input, elements);
 				}
 			}
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/TemplateSet.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/TemplateSet.java
index ab784418ed..72e3d772d4 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/TemplateSet.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/TemplateSet.java
@@ -305,12 +305,7 @@ public class TemplateSet {
 	}
 
 	private boolean exists(Template template) {
-		for (Template anotherTemplate : fTemplates) {
-			if (template.equals(anotherTemplate))
-				return true;
-		}
-
-		return false;
+		return fTemplates.contains(template);
 	}
 
 	/**
diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/generics/InferTypeArgumentsConstraintCreator.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/generics/InferTypeArgumentsConstraintCreator.java
index 62f32bed3c..a0bf196d4e 100644
--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/generics/InferTypeArgumentsConstraintCreator.java
+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/generics/InferTypeArgumentsConstraintCreator.java
@@ -428,6 +428,7 @@ public class InferTypeArgumentsConstraintCreator extends HierarchicalASTVisitor
 		for (ConstraintVariable2 parameterTypeCv : parameterTypeCvs) {
 			if (parameterTypeCv != null) {
 				hasParameterElementCvs= true;
+				break;
 			}
 		}
 
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 efcebd619b..a63a97dc46 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
@@ -698,9 +698,7 @@ public class ChangeParametersControl extends Composite {
 		}
 		res.addAll(deleted);
 		elements.clear();
-		for (ParameterInfo parameterInfo : res) {
-			elements.add(parameterInfo);
-		}
+		elements.addAll(res);
 	}
 
 	private boolean canMove(boolean up) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPluginImages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPluginImages.java
index 8f05595290..622b77f081 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPluginImages.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPluginImages.java
@@ -21,7 +21,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.Map.Entry;
 import java.util.function.IntFunction;
 
 import org.osgi.framework.Bundle;
@@ -686,9 +686,8 @@ public class JavaPluginImages {
 				display = Display.getDefault();
 			}
 			fgImageRegistry= new ImageRegistry(display);
-			for (Iterator<String> iter= fgAvoidSWTErrorMap.keySet().iterator(); iter.hasNext();) {
-				String key= iter.next();
-				fgImageRegistry.put(key, fgAvoidSWTErrorMap.get(key));
+			for (Entry<String, ImageDescriptor> entry : fgAvoidSWTErrorMap.entrySet()) {
+				fgImageRegistry.put(entry.getKey(), entry.getValue());
 			}
 			fgAvoidSWTErrorMap= null;
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/GenerateConstructorUsingFieldsSelectionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/GenerateConstructorUsingFieldsSelectionDialog.java
index 52bd773613..8a106cbd58 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/GenerateConstructorUsingFieldsSelectionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/GenerateConstructorUsingFieldsSelectionDialog.java
@@ -367,12 +367,9 @@ public class GenerateConstructorUsingFieldsSelectionDialog extends SourceActionD
 
 	List<?> getElementList() {
 		IStructuredSelection selection= (IStructuredSelection) getTreeViewer().getSelection();
-		List<?> elements= selection.toList();
-		ArrayList<Object> elementList= new ArrayList<>();
+		@SuppressWarnings("unchecked")
+		ArrayList<?> elementList= new ArrayList<>(selection.toList());
 
-		for (int i= 0; i < elements.size(); i++) {
-			elementList.add(elements.get(i));
-		}
 		return elementList;
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java
index 22fc1aac3f..abcd97f1ff 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java
@@ -369,17 +369,15 @@ public class JavaMergeViewer extends TextMergeViewer {
 				case JavaNode.CLASS:
 					// append after last class
 					children= javaContainer.getChildren();
-					if (children.length > 0) {
-						for (int i= children.length-1; i >= 0; i--) {
-							JavaNode child= (JavaNode) children[i];
-							switch (child.getTypeCode()) {
-							case JavaNode.CLASS:
-							case JavaNode.IMPORT_CONTAINER:
-							case JavaNode.PACKAGE:
-							case JavaNode.FIELD:
-								p= child.getRange();
-								return p.getOffset() + p.getLength();
-							}
+					for (int i= children.length-1; i >= 0; i--) {
+						JavaNode child= (JavaNode) children[i];
+						switch (child.getTypeCode()) {
+						case JavaNode.CLASS:
+						case JavaNode.IMPORT_CONTAINER:
+						case JavaNode.PACKAGE:
+						case JavaNode.FIELD:
+							p= child.getRange();
+							return p.getOffset() + p.getLength();
 						}
 					}
 					return javaContainer.getAppendPosition().getOffset();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaStructureDiffViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaStructureDiffViewer.java
index 3545c6b105..a7112dd756 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaStructureDiffViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaStructureDiffViewer.java
@@ -119,11 +119,11 @@ class JavaStructureDiffViewer extends StructureDiffViewer implements IElementCha
 		Object o= getRoot();
 		if (o != null) {
 			Object[] children= getSortedChildren(o);
-			if (children != null && children.length > 0) {
+			if (children != null) {
 				for (Object child : children) {
 					o= child;
 					Object[] sortedChildren= getSortedChildren(o);
-					if (sortedChildren != null && sortedChildren.length > 0) {
+					if (sortedChildren != null) {
 						for (Object sortedChild : sortedChildren) {
 							o= sortedChild;
 							if (o instanceof DiffNode) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWriter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWriter.java
index d93ad15c0f..1666d2845e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWriter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWriter.java
@@ -159,7 +159,7 @@ public class JarPackageWriter extends Object implements IJarDescriptionWriter {
 		refactoring.setAttribute("structuralOnly", "" + jarPackage.isExportStructuralOnly()); //$NON-NLS-1$ //$NON-NLS-2$
 		refactoring.setAttribute("deprecationInfo", "" + jarPackage.isDeprecationAware()); //$NON-NLS-1$ //$NON-NLS-2$
 		final IProject[] projects= jarPackage.getRefactoringProjects();
-		if (projects != null && projects.length > 0) {
+		if (projects != null) {
 			for (int index= 0; index < projects.length; index++)
 				refactoring.setAttribute("project" + (index + 1), projects[index].getName()); //$NON-NLS-1$
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionProcessor.java
index 9c37dc4a95..545f490a55 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionProcessor.java
@@ -315,11 +315,8 @@ public class JavaCorrectionProcessor implements org.eclipse.jface.text.quickassi
 
 	private static void collectMarkerProposals(SimpleMarkerAnnotation annotation, Collection<IJavaCompletionProposal> proposals) {
 		IMarker marker= annotation.getMarker();
-		IMarkerResolution[] res= IDE.getMarkerHelpRegistry().getResolutions(marker);
-		if (res.length > 0) {
-			for (IMarkerResolution re : res) {
-				proposals.add(new MarkerResolutionProposal(re, marker));
-			}
+		for (IMarkerResolution resolution : IDE.getMarkerHelpRegistry().getResolutions(marker)) {
+			proposals.add(new MarkerResolutionProposal(resolution, marker));
 		}
 	}
 
diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.java
index 51ffe0a3fb..185730b3a2 100644
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.java
+++ b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.java
@@ -325,10 +325,10 @@ public class MultiStateTextFileChange extends TextEditBasedChange {
 	// Copied from TextChange
 	private TextEditProcessor createTextEditProcessor(ComposableBufferChange change, IDocument document, int flags, boolean preview) {
 		List<TextEdit> excludes= new ArrayList<>(0);
-		for (final Iterator<TextEditBasedChangeGroup> iterator= change.getGroups().iterator(); iterator.hasNext();) {
-			TextEditBasedChangeGroup group= iterator.next();
-			if (!group.isEnabled())
+		for (TextEditBasedChangeGroup group : change.getGroups()) {
+			if (!group.isEnabled()) {
 				excludes.addAll(Arrays.asList(group.getTextEdits()));
+			}
 		}
 
 		if (preview) {
@@ -459,28 +459,23 @@ public class MultiStateTextFileChange extends TextEditBasedChange {
 		final Position range= new Position(region.getOffset(), region.getLength());
 		try {
 
-			ComposableBufferChange change= null;
-
 			final TextEditBasedChangeGroup[] changedGroups= getChangeGroups();
 
 			LinkedList<LinkedList<ComposableUndoEdit>> compositeUndo= new LinkedList<>();
-			for (int index= 0; index < fChanges.size(); index++) {
-				change= fChanges.get(index);
+			for (ComposableBufferChange change : fChanges) {
 
-				TextEdit copy= null;
 				try {
 					// Have to use a copy
 					fCopier= new TextEditCopier(change.getEdit());
-					copy= fCopier.perform();
+					TextEdit copy= fCopier.perform();
 
 					// Create a mapping from the copied edits to its originals
 					final Map<TextEdit, TextEdit> originalMap= new HashMap<>();
-					for (final Iterator<TextEditBasedChangeGroup> outer= change.getGroups().iterator(); outer.hasNext();) {
+					for (TextEditBasedChangeGroup textEditBasedChangeGroup : change.getGroups()) {
 
-						final ComposableBufferChangeGroup group= (ComposableBufferChangeGroup) outer.next();
-						for (final Iterator<TextEdit> inner= group.getCachedEdits().iterator(); inner.hasNext();) {
+						final ComposableBufferChangeGroup group= (ComposableBufferChangeGroup) textEditBasedChangeGroup;
+						for (TextEdit originalEdit : group.getCachedEdits()) {
 
-							final TextEdit originalEdit= inner.next();
 							final TextEdit copiedEdit= fCopier.getCopy(originalEdit);
 
 							if (copiedEdit != null)
@@ -638,10 +633,9 @@ public class MultiStateTextFileChange extends TextEditBasedChange {
 				// Undo edits for them (corresponding to the linearized net
 				// effect on the original document)
 				final LinkedList<ComposableEditPosition> undoQueue= new LinkedList<>();
-				for (final Iterator<LinkedList<ComposableUndoEdit>> outer= compositeUndo.iterator(); outer.hasNext();) {
-					for (final Iterator<ComposableUndoEdit> inner= outer.next().iterator(); inner.hasNext();) {
+				for (LinkedList<ComposableUndoEdit> outer : compositeUndo) {
+					for (ComposableUndoEdit edit : outer) {
 
-						final ComposableUndoEdit edit= inner.next();
 						final ReplaceEdit undo= edit.getUndo();
 
 						final int offset= undo.getOffset();
@@ -937,9 +931,7 @@ public class MultiStateTextFileChange extends TextEditBasedChange {
 			if (document instanceof IDocumentExtension4)
 				session= ((IDocumentExtension4) document).startRewriteSession(DocumentRewriteSessionType.UNRESTRICTED);
 
-			for (final Iterator<ComposableBufferChange> iterator= fChanges.iterator(); iterator.hasNext();) {
-				final ComposableBufferChange change= iterator.next();
-
+			for (ComposableBufferChange change : fChanges) {
 				final UndoEdit edit= createTextEditProcessor(change, document, undoList != null ? TextEdit.CREATE_UNDO : TextEdit.NONE, preview).performEdits();
 				if (undoList != null)
 					undoList.addFirst(edit);