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

9 files changed, 31 insertions, 46 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dnd/ResourceTransferDragAdapter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dnd/ResourceTransferDragAdapter.java
index d2a34db6fb..62222dc09e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dnd/ResourceTransferDragAdapter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dnd/ResourceTransferDragAdapter.java
@@ -14,7 +14,6 @@
 package org.eclipse.jdt.internal.ui.dnd;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.dnd.DND;
@@ -103,8 +102,7 @@ public class ResourceTransferDragAdapter extends DragSourceAdapter implements Tr
 			return EMPTY_LIST;
 		IStructuredSelection selection= (IStructuredSelection)s;
 		List<IResource> result= new ArrayList<>(selection.size());
-		for (Iterator<?> iter= selection.iterator(); iter.hasNext();) {
-			Object element= iter.next();
+		for (Object element : selection) {
 			IResource resource= null;
 			if (element instanceof IJavaElement) {
 				// don't use IAdaptable as for members only the top level type adapts
@@ -125,8 +123,7 @@ public class ResourceTransferDragAdapter extends DragSourceAdapter implements Tr
 			JavaUIMessages.ResourceTransferDragAdapter_cannot_delete_resource,
 			null);
 		List<IResource> resources= convertSelection();
-		for (Iterator<IResource> iter= resources.iterator(); iter.hasNext();) {
-			IResource resource= iter.next();
+		for (IResource resource : resources) {
 			try {
 				resource.delete(true, null);
 			} catch (CoreException e) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/filters/CustomFiltersDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/filters/CustomFiltersDialog.java
index 3b24771289..1ca4c42bdf 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/filters/CustomFiltersDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/filters/CustomFiltersDialog.java
@@ -284,9 +284,9 @@ public class CustomFiltersDialog extends SelectionDialog {
 	protected void okPressed() {
 		if (fBuiltInFilters != null) {
 			ArrayList<FilterDescriptor> result= new ArrayList<>();
-			for (int i= 0; i < fBuiltInFilters.length; ++i) {
-				if (fCheckBoxList.getChecked(fBuiltInFilters[i]))
-					result.add(fBuiltInFilters[i]);
+			for (FilterDescriptor fBuiltInFilter : fBuiltInFilters) {
+				if (fCheckBoxList.getChecked(fBuiltInFilter))
+					result.add(fBuiltInFilter);
 			}
 			setResult(result);
 		}
@@ -428,8 +428,7 @@ public class CustomFiltersDialog extends SelectionDialog {
 	private static String escapeSeparator(String pattern, String separator) {
 		int length= pattern.length();
 		StringBuilder buf= new StringBuilder(length);
-		for (int i= 0; i < length; i++) {
-			char ch= pattern.charAt(i);
+		for (char ch : pattern.toCharArray()) {
 			if (separator.equals(String.valueOf(ch)))
 				buf.append(ch);
 			buf.append(ch);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/filters/OutputFolderFilter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/filters/OutputFolderFilter.java
index a8cefc62df..375bdd63eb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/filters/OutputFolderFilter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/filters/OutputFolderFilter.java
@@ -70,8 +70,8 @@ public class OutputFolderFilter extends ViewerFilter {
 
 				// Check output location for each class path entry
 				IClasspathEntry[] cpEntries= jProject.getRawClasspath();
-				for (int i= 0, length= cpEntries.length; i < length; i++) {
-					IPath outputLocation= cpEntries[i].getOutputLocation();
+				for (IClasspathEntry cpEntrie : cpEntries) {
+					IPath outputLocation= cpEntrie.getOutputLocation();
 					if (outputLocation != null && outputLocation.equals(folderPath))
 						return false;
 				}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AbstractMultiFix.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AbstractMultiFix.java
index 3350eef437..9dabbcacce 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AbstractMultiFix.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AbstractMultiFix.java
@@ -111,8 +111,7 @@ public abstract class AbstractMultiFix extends AbstractCleanUp implements IMulti
 	}
 
 	private static boolean contains(ArrayList<IProblemLocation> problems, IProblemLocation problem) {
-		for (int i= 0; i < problems.size(); i++) {
-			IProblemLocation existing= problems.get(i);
+		for (IProblemLocation existing : problems) {
 			if (existing.getProblemId() == problem.getProblemId() && existing.getOffset() == problem.getOffset() && existing.getLength() == problem.getLength()) {
 				return true;
 			}
@@ -122,8 +121,8 @@ public abstract class AbstractMultiFix extends AbstractCleanUp implements IMulti
 	}
 
 	private static boolean contains(int[] ids, int id) {
-		for (int i= 0; i < ids.length; i++) {
-			if (ids[i] == id)
+		for (int id2 : ids) {
+			if (id2 == id)
 				return true;
 		}
 		return false;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PushDownNegationCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PushDownNegationCleanUp.java
index 4940f86fc1..a5a4441e20 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PushDownNegationCleanUp.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PushDownNegationCleanUp.java
@@ -155,8 +155,7 @@ public class PushDownNegationCleanUp extends AbstractMultiFix {
 		}
 
 		RemoveDoubleNegationOperation lastDoubleNegation= null;
-		for (int i= 0; i < rewriteOperations.size(); ++i) {
-			CompilationUnitRewriteOperation op= rewriteOperations.get(i);
+		for (CompilationUnitRewriteOperation op : rewriteOperations) {
 			if (op instanceof ReplacementOperation) {
 				ReplacementOperation chainedOp= (ReplacementOperation) op;
 				if (lastDoubleNegation != null && chainedOp.getNode().subtreeMatch(new ASTMatcher(), lastDoubleNegation.getReplacementExpression())) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/SortMembersCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/SortMembersCleanUp.java
index 836128344c..ff4a9c5562 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/SortMembersCleanUp.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/SortMembersCleanUp.java
@@ -15,7 +15,6 @@
 package org.eclipse.jdt.internal.ui.fix;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 
 import com.ibm.icu.text.MessageFormat;
@@ -85,8 +84,8 @@ public class SortMembersCleanUp extends AbstractCleanUp {
 
 			try {
 				RefactoringStatus result= new RefactoringStatus();
-    			for (Iterator<IResource> iterator= fTouchedFiles.iterator(); iterator.hasNext();) {
-    	            IFile file= (IFile)iterator.next();
+    			for (IResource iResource : fTouchedFiles) {
+    	            IFile file= (IFile)iResource;
     	            if (containsRelevantMarkers(file)) {
     	            	String fileLocation= BasicElementLabels.getPathLabel(file.getProjectRelativePath(), false);
     	            	String projectName= file.getProject().getName();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnimplementedCodeCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnimplementedCodeCleanUp.java
index bad8a80ba0..166ed82486 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnimplementedCodeCleanUp.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnimplementedCodeCleanUp.java
@@ -197,9 +197,9 @@ public class UnimplementedCodeCleanUp extends AbstractMultiFix {
 		StringBuilder buf= new StringBuilder();
 		buf.append(indent);
 		char[] codeArray= code.toCharArray();
-		for (int i= 0; i < codeArray.length; i++) {
-			buf.append(codeArray[i]);
-			if (codeArray[i] == '\n')
+		for (char element : codeArray) {
+			buf.append(element);
+			if (element == '\n')
 				buf.append(indent);
 		}
 		buf.append("\n"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/CheckboxTreeAndListGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/CheckboxTreeAndListGroup.java
index 3ffdd39ee6..c8c8a8f788 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/CheckboxTreeAndListGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/CheckboxTreeAndListGroup.java
@@ -14,6 +14,8 @@
 package org.eclipse.jdt.internal.ui.jarpackager;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -148,12 +150,7 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 	 */
 	protected boolean areAllChildrenWhiteChecked(Object treeElement) {
 		Object[] children= getTreeChildren(treeElement);
-		for (int i= 0; i < children.length; ++i) {
-			if (!fWhiteCheckedTreeItems.contains(children[i]))
-				return false;
-		}
-
-		return true;
+		return fWhiteCheckedTreeItems.containsAll(Arrays.asList(children));
 	}
 	/**
 	 *	Returns a boolean indicating whether all list elements associated with
@@ -175,8 +172,7 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 	 * @param elements
 	 */
 	protected void checkNewTreeElements(Object[] elements) {
-		for (int i= 0; i < elements.length; ++i) {
-			Object currentElement= elements[i];
+		for (Object currentElement : elements) {
 			boolean checked= fCheckedStateStore.containsKey(currentElement);
 			fTreeViewer.setChecked(currentElement, checked);
 			fTreeViewer.setGrayed(
@@ -294,8 +290,8 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 		// if any children of treeElement are still gray-checked then treeElement
 		// must remain gray-checked as well
 		Object[] children= getTreeChildren(treeElement);
-		for (int i= 0; i < children.length; ++i) {
-			if (fCheckedStateStore.containsKey(children[i]))
+		for (Object element : children) {
+			if (fCheckedStateStore.containsKey(element))
 				return true;
 		}
 
@@ -323,8 +319,8 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 		// statuses will be needed to determine the white-checked status for
 		// this tree element
 		Object[] children= getTreeChildren(treeElement);
-		for (int i= 0; i < children.length; ++i)
-			determineWhiteCheckedDescendents(children[i]);
+		for (Object element : children)
+			determineWhiteCheckedDescendents(element);
 
 		// now determine the white-checked status for this tree element
 		if (determineShouldBeWhiteChecked(treeElement))
@@ -611,8 +607,7 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 		if (state) {
 			Object[] listItems= getListElements(treeElement);
 			List<Object> listItemsChecked= new ArrayList<>();
-			for (int i= 0; i < listItems.length; ++i)
-				listItemsChecked.add(listItems[i]);
+			Collections.addAll(listItemsChecked, listItems);
 
 			fCheckedStateStore.put(treeElement, listItemsChecked);
 		} else
@@ -624,8 +619,8 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 
 		// now logically check/uncheck all children as well
 		Object[] children= getTreeChildren(treeElement);
-		for (int i= 0; i < children.length; ++i) {
-			setTreeChecked(children[i], state);
+		for (Object child : children) {
+			setTreeChecked(child, state);
 		}
 	}
 	/**
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java
index 8bf92f5b2b..7697e768d0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java
@@ -17,7 +17,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.jar.Attributes;
@@ -909,8 +908,8 @@ class JarManifestWizardPage extends WizardPage implements IJarPackageWizardPage
 	 */
 	protected SelectionDialog createPackageDialog(Set<IJavaElement> packageFragments) {
 		List<IPackageFragment> packages= new ArrayList<>(packageFragments.size());
-		for (Iterator<IJavaElement> iter= packageFragments.iterator(); iter.hasNext();) {
-			IPackageFragment fragment= (IPackageFragment)iter.next();
+		for (IJavaElement iJavaElement : packageFragments) {
+			IPackageFragment fragment= (IPackageFragment)iJavaElement;
 			boolean containsJavaElements= false;
 			int kind;
 			try {
@@ -1008,9 +1007,7 @@ class JarManifestWizardPage extends WizardPage implements IJarPackageWizardPage
 	 */
 	private Set<IJavaElement> getPackagesForSelectedResources() {
 		Set<IJavaElement> packages= new HashSet<>();
-		int n= fJarPackage.getElements().length;
-		for (int i= 0; i < n; i++) {
-			Object element= fJarPackage.getElements()[i];
+		for (Object element : fJarPackage.getElements()) {
 			if (element instanceof ICompilationUnit) {
 				packages.add(((ICompilationUnit) element).getParent());
 			}