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

org.eclipse.jdt.core.manipulation
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.

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

10 files changed, 42 insertions, 59 deletions

diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/AbstractJavaContextTypeCore.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/AbstractJavaContextTypeCore.java
index 2d15925d2d..44da1b9295 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/AbstractJavaContextTypeCore.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/AbstractJavaContextTypeCore.java
@@ -140,8 +140,8 @@ public abstract class AbstractJavaContextTypeCore extends CompilationUnitContext
 				Variable[] iterables= getVariablesInContextScope(jc);
 				if (iterables.length > 0) {
 
-					for (int i= 0; i < iterables.length; i++)
-						mv.setChoices(iterables[i], iterables[i].getMemberTypeNames());
+					for (Variable iterable : iterables)
+						mv.setChoices(iterable, iterable.getMemberTypeNames());
 
 					TemplateVariable master= jc.getTemplateVariable(fMasterName);
 					if (master instanceof MultiVariable) {
@@ -219,9 +219,9 @@ public abstract class AbstractJavaContextTypeCore extends CompilationUnitContext
 
 		        Variable[] iterables= getLocalVariables(jc);
 				if (iterables.length > 0) {
-					for (int i= 0; i < iterables.length; i++) {
-						String[] elements= jc.suggestVariableNames(iterables[i].getMemberTypeNames()[0]);
-						mv.setChoices(iterables[i], elements);
+					for (Variable iterable : iterables) {
+						String[] elements= jc.suggestVariableNames(iterable.getMemberTypeNames()[0]);
+						mv.setChoices(iterable, elements);
 					}
 
 
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/AbstractVariableResolver.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/AbstractVariableResolver.java
index 4b750d6c05..d45d058f73 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/AbstractVariableResolver.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/AbstractVariableResolver.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.corext.template.java;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.jface.text.templates.TemplateContext;
@@ -74,8 +73,8 @@ public abstract class AbstractVariableResolver extends TemplateVariableResolver
 				jv.setParamType(type);
 			} else {
 				ArrayList<Variable> variables= new ArrayList<>();
-				for (Iterator<String> iterator= params.iterator(); iterator.hasNext();) {
-					variables.addAll(Arrays.asList(getVisibleVariables(iterator.next(), jc)));
+				for (String string : params) {
+					variables.addAll(Arrays.asList(getVisibleVariables(string, jc)));
 				}
 				fVariables= variables.toArray(new Variable[variables.size()]);
 
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/CompilationUnitCompletion.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/CompilationUnitCompletion.java
index 1024de324a..d4cb9d5aa0 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/CompilationUnitCompletion.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/CompilationUnitCompletion.java
@@ -184,8 +184,7 @@ final class CompilationUnitCompletion extends CompletionRequestor {
 				} else {
 					ITypeHierarchy hierarchy= sub.newSupertypeHierarchy(null);
 					IType[] allTypes= hierarchy.getAllTypes();
-					for (int i= 0; i < allTypes.length; i++) {
-						IType type= allTypes[i];
+					for (IType type : allTypes) {
 						if (type.getElementName().equals(supertype))
 							return true;
 					}
@@ -225,8 +224,7 @@ final class CompilationUnitCompletion extends CompletionRequestor {
 					ITypeHierarchy hierarchy= sub.newSupertypeHierarchy(null);
 					IType[] allTypes= hierarchy.getAllTypes();
 					List<IType> matches= new ArrayList<>();
-					for (int i= 0; i < allTypes.length; i++) {
-						IType type= allTypes[i];
+					for (IType type : allTypes) {
 						if (type.getElementName().equals(supertype))
 							matches.add(type);
 					}
@@ -322,10 +320,10 @@ final class CompilationUnitCompletion extends CompletionRequestor {
 			List<String> all= new ArrayList<>();
 			IType[] supertypes= getSupertypes(type);
 			if (fUnit != null) {
-				for (int i= 0; i < supertypes.length; i++) {
+				for (IType supertype : supertypes) {
 					try {
 						TypeParameterResolver util= new TypeParameterResolver(this);
-						String[] result= util.computeBinding(supertypes[i].getFullyQualifiedName(), index);
+						String[] result= util.computeBinding(supertype.getFullyQualifiedName(), index);
 						all.addAll(Arrays.asList(result));
 					} catch (JavaModelException e) {
 					} catch (IndexOutOfBoundsException e) {
@@ -501,8 +499,8 @@ final class CompilationUnitCompletion extends CompletionRequestor {
 				ITypeParameter formalParameter= typeParameters[k];
 				if (formalParameter.getElementName().equals(SignatureUtil.stripSignatureToFQN(match))) {
 					String[] bounds= formalParameter.getBounds();
-					for (int i= 0; i < bounds.length; i++) {
-						String boundSignature= Signature.createTypeSignature(bounds[i], true);
+					for (String bound : bounds) {
+						String boundSignature= Signature.createTypeSignature(bound, true);
 						addBound(SignatureUtil.qualifySignature(boundSignature, subType));
 					}
 					computeTypeParameterBinding(subType, k);
@@ -569,8 +567,7 @@ final class CompilationUnitCompletion extends CompletionRequestor {
 		 */
 		private String findMatchingSuperTypeSignature(IType subType, IType superType) throws JavaModelException {
 			String[] signatures= getSuperTypeSignatures(subType, superType);
-			for (int i= 0; i < signatures.length; i++) {
-				String signature= signatures[i];
+			for (String signature : signatures) {
 				String qualified= SignatureUtil.qualifySignature(signature, subType);
 				String subFQN= SignatureUtil.stripSignatureToFQN(qualified);
 
@@ -680,8 +677,8 @@ final class CompilationUnitCompletion extends CompletionRequestor {
 				ITypeHierarchy hierarchy= subType.newSupertypeHierarchy(null);
 				IType[] types= hierarchy.getAllSupertypes(subType);
 
-				for (int i= 0; i < types.length; i++)
-					if (types[i].equals(superType))
+				for (IType type : types)
+					if (type.equals(superType))
 						return true;
 			} catch (JavaModelException e) {
 				// ignore and return false
@@ -759,10 +756,10 @@ final class CompilationUnitCompletion extends CompletionRequestor {
 		if (fUnit != null) {
 			try {
 				IType[] cuTypes= fUnit.getAllTypes();
-				for (int i= 0; i < cuTypes.length; i++) {
-					String fqn= cuTypes[i].getFullyQualifiedName();
+				for (IType cuType : cuTypes) {
+					String fqn= cuType.getFullyQualifiedName();
 					String sig= Signature.createTypeSignature(fqn, true);
-					fLocalTypes.put(sig, cuTypes[i].getElementName());
+					fLocalTypes.put(sig, cuType.getElementName());
 				}
 			} catch (JavaModelException e) {
 				// ignore
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/CompilationUnitContextType.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/CompilationUnitContextType.java
index e5f5f79d85..b588dc3b33 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/CompilationUnitContextType.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/CompilationUnitContextType.java
@@ -163,15 +163,7 @@ public abstract class CompilationUnitContextType extends TemplateContextType {
 
 			try {
 				String[] arguments= method.getParameterNames();
-				StringBuilder buffer= new StringBuilder();
-
-				for (int i= 0; i < arguments.length; i++) {
-					if (i > 0)
-						buffer.append(", "); //$NON-NLS-1$
-					buffer.append(arguments[i]);
-				}
-
-				return buffer.toString();
+				return String.join(", ", arguments); //$NON-NLS-1$
 
 			} catch (JavaModelException e) {
 				return null;
@@ -195,8 +187,7 @@ public abstract class CompilationUnitContextType extends TemplateContextType {
 	@Override
 	protected void validateVariables(TemplateVariable[] variables) throws TemplateException {
 		// check for multiple cursor variables
-		for (int i= 0; i < variables.length; i++) {
-			TemplateVariable var= variables[i];
+		for (TemplateVariable var : variables) {
 			if (var.getType().equals(GlobalTemplateVariables.Cursor.NAME)) {
 				if (var.getOffsets().length > 1) {
 					throw new TemplateException(JavaTemplateMessages.ContextType_error_multiple_cursor_variables);
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/JavaContextCore.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/JavaContextCore.java
index e2fb324479..f0fcdf040d 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/JavaContextCore.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/JavaContextCore.java
@@ -575,8 +575,8 @@ public class JavaContextCore extends CompilationUnitContext implements IJavaCont
 	 */
 	private boolean hasMethod(IType type, String name) throws JavaModelException {
 		IMethod[] methods= type.getMethods();
-		for (int i= 0; i < methods.length; i++) {
-			if (name.equals(methods[i].getElementName()))
+		for (IMethod method : methods) {
+			if (name.equals(method.getElementName()))
 				return true;
 		}
 
@@ -641,8 +641,7 @@ public class JavaContextCore extends CompilationUnitContext implements IJavaCont
 		new SearchEngine().searchAllTypeNames(null, 0, simpleTypeName.toCharArray(), SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE, getSearchForConstant(typeKinds), searchScope, requestor, IJavaSearchConstants.FORCE_IMMEDIATE_SEARCH, monitor);
 
 		ArrayList<TypeNameMatch> typeRefsFound= new ArrayList<>(typeInfos.size());
-		for (int i= 0, len= typeInfos.size(); i < len; i++) {
-			TypeNameMatch curr= typeInfos.get(i);
+		for (TypeNameMatch curr : typeInfos) {
 			if (curr.getPackageName().length() > 0) { // do not suggest imports from the default package
 				if (isOfKind(curr, typeKinds, is50OrHigher) && isVisible(curr, cu)) {
 					typeRefsFound.add(curr);
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/NameResolver.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/NameResolver.java
index 35f3fa79c4..15b4cfc4ce 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/NameResolver.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/template/java/NameResolver.java
@@ -67,9 +67,9 @@ public class NameResolver extends TemplateVariableResolver {
 
 			refVar.getAllChoices();
 			Object[] types= flatten(refVar.getAllChoices());
-			for (int i= 0; i < types.length; i++) {
-				String[] names= jc.suggestVariableNames(mv.toString(types[i]));
-				mv.setChoices(types[i], names);
+			for (Object type : types) {
+				String[] names= jc.suggestVariableNames(mv.toString(type));
+				mv.setChoices(type, names);
 			}
 
 			mv.setKey(refVar.getCurrentChoice());
@@ -85,8 +85,8 @@ public class NameResolver extends TemplateVariableResolver {
 
 	private Object[] flatten(Object[][] allValues) {
 		List<Object> flattened= new ArrayList<>(allValues.length);
-		for (int i= 0; i < allValues.length; i++) {
-			flattened.addAll(Arrays.asList(allValues[i]));
+		for (Object[] allValue : allValues) {
+			flattened.addAll(Arrays.asList(allValue));
 		}
 		return flattened.toArray(new Object[flattened.size()]);
 	}
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java
index cae8e09017..90f0e5990f 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java
@@ -604,8 +604,8 @@ public final class JavaModelUtil {
 
 	public static boolean isExcludedPath(IPath resourcePath, IPath[] exclusionPatterns) {
 		char[] path = resourcePath.toString().toCharArray();
-		for (int i = 0, length = exclusionPatterns.length; i < length; i++) {
-			char[] pattern= exclusionPatterns[i].toString().toCharArray();
+		for (IPath exclusionPattern : exclusionPatterns) {
+			char[] pattern= exclusionPattern.toString().toCharArray();
 			if (CharOperation.pathMatch(pattern, path, true, '/')) {
 				return true;
 			}
@@ -626,8 +626,8 @@ public final class JavaModelUtil {
 	public static boolean isExcluded(IPath resourcePath, char[][] exclusionPatterns) {
 		if (exclusionPatterns == null) return false;
 		char[] path = resourcePath.toString().toCharArray();
-		for (int i = 0, length = exclusionPatterns.length; i < length; i++)
-			if (CharOperation.pathMatch(exclusionPatterns[i], path, true, '/'))
+		for (char[] exclusionPattern : exclusionPatterns)
+			if (CharOperation.pathMatch(exclusionPattern, path, true, '/'))
 				return true;
 		return false;
 	}
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/MethodsSourcePositionComparator.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/MethodsSourcePositionComparator.java
index 5dcb1a2c87..18b48845b8 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/MethodsSourcePositionComparator.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/MethodsSourcePositionComparator.java
@@ -100,11 +100,11 @@ public class MethodsSourcePositionComparator implements Comparator<IMethodBindin
 		}
 
 		ITypeBinding[] interfaces= fTypeBinding.getInterfaces();
-		for (int i= 0; i < interfaces.length; i++) {
-			if (firstMethodType.equals(interfaces[i])) {
+		for (ITypeBinding interface1 : interfaces) {
+			if (firstMethodType.equals(interface1)) {
 				return 1;
 			}
-			if (secondMethodType.equals(interfaces[i])) {
+			if (secondMethodType.equals(interface1)) {
 				return -1;
 			}
 		}
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/Resources.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/Resources.java
index bda6c64163..88843a5f99 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/Resources.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/Resources.java
@@ -17,7 +17,6 @@ import java.io.File;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -126,8 +125,7 @@ public class Resources {
 
 		IStatus modified= null;
 		Map<IFile, Long> newTimeStamps= createModificationStampMap(readOnlyFiles);
-		for (Iterator<IFile> iter= oldTimeStamps.keySet().iterator(); iter.hasNext();) {
-			IFile file= iter.next();
+		for (IFile file : oldTimeStamps.keySet()) {
 			if (!oldTimeStamps.get(file).equals(newTimeStamps.get(file)))
 				modified= addModified(modified, file);
 		}
@@ -138,8 +136,8 @@ public class Resources {
 
 	private static Map<IFile, Long> createModificationStampMap(List<IResource> files){
 		Map<IFile, Long> map= new HashMap<>();
-		for (Iterator<IResource> iter= files.iterator(); iter.hasNext(); ) {
-			IFile file= (IFile)iter.next();
+		for (IResource iResource : files) {
+			IFile file= (IFile)iResource;
 			map.put(file, Long.valueOf(file.getModificationStamp()));
 		}
 		return map;
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/SuperTypeHierarchyCache.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/SuperTypeHierarchyCache.java
index 0b1b5bb727..9981312e9f 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/SuperTypeHierarchyCache.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/SuperTypeHierarchyCache.java
@@ -156,8 +156,7 @@ public class SuperTypeHierarchyCache {
 				// find obsolete entries or remove entry that was least recently accessed
 				HierarchyCacheEntry oldest= null;
 				ArrayList<HierarchyCacheEntry> obsoleteHierarchies= new ArrayList<>(CACHE_SIZE);
-				for (int i= 0; i < nEntries; i++) {
-					HierarchyCacheEntry entry= fgHierarchyCache.get(i);
+				for (HierarchyCacheEntry entry : fgHierarchyCache) {
 					ITypeHierarchy curr= entry.getTypeHierarchy();
 					if (!curr.exists() || hierarchy.contains(curr.getType())) {
 						obsoleteHierarchies.add(entry);
@@ -168,8 +167,8 @@ public class SuperTypeHierarchyCache {
 					}
 				}
 				if (!obsoleteHierarchies.isEmpty()) {
-					for (int i= 0; i < obsoleteHierarchies.size(); i++) {
-						removeHierarchyEntryFromCache(obsoleteHierarchies.get(i));
+					for (HierarchyCacheEntry obsoleteHierarchie : obsoleteHierarchies) {
+						removeHierarchyEntryFromCache(obsoleteHierarchie);
 					}
 				} else if (oldest != null) {
 					removeHierarchyEntryFromCache(oldest);