Use jdk 5 for-each loopI20190616-1800I20190615-1800

Replace simple uses of Iterator with a corresponding for-each loop. Also
add missing braces on loops as necessary.

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

3 files changed, 6 insertions, 12 deletions

diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java
index 3791b47dc..6f4b6fd6e 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java
@@ -40,8 +40,7 @@ public class ScopeBuildingTests extends TeamTest {
 						IProgressMonitor monitor) throws CoreException {
 					super.initialize(monitor);
 					// Add the additional test mappings to the scope
-					for (int i = 0; i < additionalMappings.length; i++) {
-						ResourceMapping mapping = additionalMappings[i];
+					for (ResourceMapping mapping : additionalMappings) {
 						ResourceTraversal[] traversals = mapping.getTraversals(getContext(), monitor);
 						((ResourceMappingScope)getScope()).addMapping(mapping, traversals);
 						// TODO: The additional mappings and additional resources boolean will not be set
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java
index c5ec12e43..7db0fd74a 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java
@@ -85,8 +85,7 @@ public class ScopeTests extends TeamTest {
 
 	private boolean isInWorkingSet(IProject project) {
 		IAdaptable[] elements = workingSet.getElements();
-		for (int i = 0; i < elements.length; i++) {
-			IAdaptable adaptable = elements[i];
+		for (IAdaptable adaptable : elements) {
 			if (adaptable.equals(project))
 				return true;
 		}
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java
index 743c95943..f4d01f0b6 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java
@@ -101,8 +101,7 @@ public class ResourceContentTests extends TeamTest {
 	private void assertContentsMatch(IResource[] resources) {
 		Set paths = getPaths(ResourcesPlugin.getWorkspace().getRoot());
 		Set<Object> resourceSet = new HashSet<>();
-		for (int i = 0; i < resources.length; i++) {
-			IResource resource = resources[i];
+		for (IResource resource : resources) {
 			resourceSet.add(resource);
 		}
 		for (Iterator iterator = paths.iterator(); iterator.hasNext();) {
@@ -124,8 +123,7 @@ public class ResourceContentTests extends TeamTest {
 	private Set getPaths(Object root) {
 		Set<Object> result = new HashSet<>();
 		Object[] elements = provider.getElements(root);
-		for (int i = 0; i < elements.length; i++) {
-			Object object = elements[i];
+		for (Object object : elements) {
 			TreePath path = new TreePath(new Object[] { object });
 			Set childPaths = getPaths(provider, path);
 			result.addAll(childPaths);
@@ -138,8 +136,7 @@ public class ResourceContentTests extends TeamTest {
 		Set<TreePath> result = new HashSet<>();
 		if (children.length == 0)
 			result.add(path);
-		for (int i = 0; i < children.length; i++) {
-			Object object = children[i];
+		for (Object object : children) {
 			TreePath childPath = path.createChildPath(object);
 			Set childPaths = getPaths(provider, childPath);
 			result.addAll(childPaths);
@@ -172,8 +169,7 @@ public class ResourceContentTests extends TeamTest {
 
 	private IResource[] asResources(IProject project, String[] resourcePaths) {
 		List<IResource> resources = new ArrayList<>();
-		for (int i = 0; i < resourcePaths.length; i++) {
-			String path = resourcePaths[i];
+		for (String path : resourcePaths) {
 			if (path.endsWith("/")) {
 				resources.add(project.getFolder(path));
 			} else {