Bug 548309 - Use jdk 5 for-each loopI20200317-1800

org.eclipse.ltk.ui.refactoring
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.

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

10 files changed, 18 insertions, 35 deletions

diff --git a/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF b/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF
index cd36fa81b8..4214bcd8ca 100644
--- a/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF
+++ b/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.ltk.ui.refactoring
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ltk.ui.refactoring; singleton:=true
-Bundle-Version: 3.10.200.qualifier
+Bundle-Version: 3.10.300.qualifier
 Bundle-Activator: org.eclipse.ltk.internal.ui.refactoring.RefactoringUIPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.ltk.ui.refactoring/pom.xml b/org.eclipse.ltk.ui.refactoring/pom.xml
index de0a1fc277..3d26f8c497 100644
--- a/org.eclipse.ltk.ui.refactoring/pom.xml
+++ b/org.eclipse.ltk.ui.refactoring/pom.xml
@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.ltk</groupId>
   <artifactId>org.eclipse.ltk.ui.refactoring</artifactId>
-  <version>3.10.200-SNAPSHOT</version>
+  <version>3.10.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementLabelProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementLabelProvider.java
index fe9e0abd6a..31e823298f 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementLabelProvider.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementLabelProvider.java
@@ -14,7 +14,6 @@
 package org.eclipse.ltk.internal.ui.refactoring;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.swt.graphics.Font;
@@ -63,8 +62,7 @@ class ChangeElementLabelProvider extends LabelProvider implements IFontProvider
 
 	@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();
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java
index 79419b4db8..8143704f94 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java
@@ -14,7 +14,6 @@
 package org.eclipse.ltk.internal.ui.refactoring;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
@@ -143,8 +142,8 @@ class ChangeElementTreeViewer extends CheckboxTreeViewer {
 	}
 
 	private void processDeferredTreeItemUpdates() {
-		for (Iterator<Item> iter= fDeferredTreeItemUpdates.iterator(); iter.hasNext();) {
-			TreeItem item= (TreeItem)iter.next();
+		for (Item item2 : fDeferredTreeItemUpdates) {
+			TreeItem item= (TreeItem)item2;
 			applyCheckedState(item, (PreviewNode)item.getData());
 		}
 	}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java
index 5a1b157d47..475d91d516 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java
@@ -18,7 +18,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -233,8 +232,8 @@ public class PreviewWizardPage extends RefactoringWizardPage implements IPreview
 			fActiveAction= fShowAllAction;
 			fFilterActions= new FilterAction[list.size()];
 			int i= 0;
-			for (Iterator<GroupCategory> iter= list.iterator(); iter.hasNext();) {
-				fFilterActions[i++]= new FilterAction(this, iter.next());
+			for (GroupCategory groupCategory : list) {
+				fFilterActions[i++]= new FilterAction(this, groupCategory);
 			}
 			fHideDerivedAction= new HideDerivedAction();
 		}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/BrowseRefactoringHistoryContentProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/BrowseRefactoringHistoryContentProvider.java
index 828143c1b3..409589602f 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/BrowseRefactoringHistoryContentProvider.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/BrowseRefactoringHistoryContentProvider.java
@@ -18,7 +18,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -127,8 +126,7 @@ public final class BrowseRefactoringHistoryContentProvider extends RefactoringHi
 					}
 					collection.add(proxy);
 				}
-				for (final Iterator<String> iterator= new ArrayList<>(projectRefactoringHistories.keySet()).iterator(); iterator.hasNext();) {
-					final String current= iterator.next();
+				for (String current : new ArrayList<>(projectRefactoringHistories.keySet())) {
 					final Collection<RefactoringDescriptorProxy> collection= projectRefactoringHistories.get(current);
 					if (collection != null)
 						fProjectRefactoringHistories.put(current, new RefactoringHistoryImplementation(collection.toArray(new RefactoringDescriptorProxy[collection.size()])));
@@ -241,8 +239,7 @@ public final class BrowseRefactoringHistoryContentProvider extends RefactoringHi
 	public Object[] getRootElements() {
 		if (fSortProjects) {
 			final List<Object> list= new ArrayList<>(32);
-			for (final Iterator<String> iterator= getRefactoringHistories().keySet().iterator(); iterator.hasNext();) {
-				final String project= iterator.next();
+			for (String project : getRefactoringHistories().keySet()) {
 				if (project.equals(WORKSPACE_PROJECT)) {
 					final RefactoringHistory history= getRefactoringHistory(project);
 					if (history != null) {
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryControl.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryControl.java
index e8770f405c..be310f9387 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryControl.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryControl.java
@@ -151,8 +151,7 @@ public class RefactoringHistoryControl extends Composite implements IRefactoring
 			}
 			int checkCount= 0;
 			final Collection<RefactoringDescriptorProxy> collection= getCoveredDescriptors(element);
-			for (final Iterator<RefactoringDescriptorProxy> iterator= collection.iterator(); iterator.hasNext();) {
-				final RefactoringDescriptorProxy proxy= iterator.next();
+			for (RefactoringDescriptorProxy proxy : collection) {
 				if (fCheckedDescriptors.contains(proxy))
 					checkCount++;
 			}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/model/RefactoringHistoryMergeWizard.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/model/RefactoringHistoryMergeWizard.java
index 2b7f91dc7b..2ca88d891c 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/model/RefactoringHistoryMergeWizard.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/model/RefactoringHistoryMergeWizard.java
@@ -14,7 +14,6 @@
 package org.eclipse.ltk.internal.ui.refactoring.model;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.eclipse.team.core.diff.IDiff;
@@ -187,8 +186,7 @@ public abstract class RefactoringHistoryMergeWizard extends RefactoringHistoryWi
 	 */
 	public void resolveConflicts(final IMergeContext context) {
 		Assert.isNotNull(context);
-		for (final Iterator<IResource> iterator= fChangedFiles.iterator(); iterator.hasNext();) {
-			final IResource resource= iterator.next();
+		for (IResource resource : fChangedFiles) {
 			final IDiff diff= context.getDiffTree().getDiff(resource);
 			if (diff != null) {
 				try {
@@ -198,8 +196,7 @@ public abstract class RefactoringHistoryMergeWizard extends RefactoringHistoryWi
 				}
 			}
 		}
-		for (final Iterator<IResource> iterator= fAddedFiles.iterator(); iterator.hasNext();) {
-			final IResource resource= iterator.next();
+		for (IResource resource : fAddedFiles) {
 			final IDiff diff= context.getDiffTree().getDiff(resource);
 			if (diff != null) {
 				try {
@@ -209,8 +206,7 @@ public abstract class RefactoringHistoryMergeWizard extends RefactoringHistoryWi
 				}
 			}
 		}
-		for (final Iterator<IResource> iterator= fRemovedFiles.iterator(); iterator.hasNext();) {
-			final IResource resource= iterator.next();
+		for (IResource resource : fRemovedFiles) {
 			final IDiff diff= context.getDiffTree().getDiff(resource);
 			if (diff != null) {
 				try {
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractResourceMappingMerger.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractResourceMappingMerger.java
index 7eadaad46d..94aa5f2032 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractResourceMappingMerger.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractResourceMappingMerger.java
@@ -292,10 +292,9 @@ public abstract class AbstractResourceMappingMerger extends ResourceMappingMerge
 	 * @return the diffs, or an empty array
 	 */
 	private IDiff[] getDiffs(final IMergeContext context) {
-		final ResourceMapping[] mappings= context.getScope().getMappings(fModelProvider.getDescriptor().getId());
 		final Set<IDiff> set= new HashSet<>();
-		for (int index= 0; index < mappings.length; index++) {
-			final IDiff[] diffs= context.getDiffTree().getDiffs(context.getScope().getTraversals(mappings[index]));
+		for (ResourceMapping mapping : context.getScope().getMappings(fModelProvider.getDescriptor().getId())) {
+			final IDiff[] diffs= context.getDiffTree().getDiffs(context.getScope().getTraversals(mapping));
 			set.addAll(Arrays.asList(diffs));
 		}
 		return set.toArray(new IDiff[set.size()]);
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractSynchronizationContentProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractSynchronizationContentProvider.java
index d3d0b03be1..a0a58f52a3 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractSynchronizationContentProvider.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractSynchronizationContentProvider.java
@@ -14,7 +14,6 @@
 package org.eclipse.ltk.ui.refactoring.model;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.eclipse.team.core.diff.IDiff;
@@ -124,14 +123,12 @@ public abstract class AbstractSynchronizationContentProvider extends Synchroniza
 						}
 						final Set<RefactoringDescriptor> local= new HashSet<>(localDescriptors);
 						local.removeAll(remoteDescriptors);
-						for (final Iterator<RefactoringDescriptor> iterator= local.iterator(); iterator.hasNext();) {
-							final RefactoringDescriptor descriptor= iterator.next();
+						for (RefactoringDescriptor descriptor : local) {
 							result.add(new RefactoringDescriptorSynchronizationProxy(new RefactoringDescriptorProxyAdapter(descriptor), project.getName(), IThreeWayDiff.OUTGOING));
 						}
 						final Set<RefactoringDescriptor> remote= new HashSet<>(remoteDescriptors);
 						remote.removeAll(localDescriptors);
-						for (final Iterator<RefactoringDescriptor> iterator= remote.iterator(); iterator.hasNext();) {
-							final RefactoringDescriptor descriptor= iterator.next();
+						for (RefactoringDescriptor descriptor : remote) {
 							result.add(new RefactoringDescriptorSynchronizationProxy(new RefactoringDescriptorProxyAdapter(descriptor), project.getName(), IThreeWayDiff.INCOMING));
 						}
 					}
@@ -139,8 +136,7 @@ public abstract class AbstractSynchronizationContentProvider extends Synchroniza
 				}
 			}, IResource.DEPTH_INFINITE);
 
-			for (final Iterator<RefactoringDescriptorSynchronizationProxy> iterator= result.iterator(); iterator.hasNext();) {
-				final RefactoringDescriptorSynchronizationProxy proxy= iterator.next();
+			for (RefactoringDescriptorSynchronizationProxy proxy : result) {
 				if (!includeDirection(proxy.getDirection()))
 					result.remove(proxy);
 			}