Use jdk 5 for-each loop

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

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

4 files changed, 10 insertions, 10 deletions

diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java
index 87af4e37d..2ad1cb778 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java
@@ -152,10 +152,9 @@ public abstract class AbstractRepositoryTask extends Task {
 				DirectoryScanner scanner = fileset.getDirectoryScanner(getProject());
 				String[][] elements = new String[][] {scanner.getIncludedDirectories(), scanner.getIncludedFiles()};
 				for (int i = 0; i < 2; i++) {
-					for (int j = 0; j < elements[i].length; j++) {
-						File file = new File(fileset.getDir(), elements[i][j]);
+					for (String element : elements[i]) {
+						File file = new File(fileset.getDir(), element);
 						URI uri = file.toURI();
-
 						if (file.isFile() && file.getName().endsWith(".zip")) { //$NON-NLS-1$
 							uri = URIUtil.toJarURI(uri, null);
 						}
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AntMirrorLog.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AntMirrorLog.java
index d58211fa5..a2f49c70f 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AntMirrorLog.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AntMirrorLog.java
@@ -53,8 +53,9 @@ public class AntMirrorLog implements IArtifactMirrorLog {
 		// Log any children of this status
 		IStatus[] nestedStatus = status.getChildren();
 		if (nestedStatus != null)
-			for (int i = 0; i < nestedStatus.length; i++)
-				log(nestedStatus[i]);
+			for (IStatus s : nestedStatus) {
+				log(s);
+			}
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RemoveIUTask.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RemoveIUTask.java
index 261042a2a..8c9097062 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RemoveIUTask.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RemoveIUTask.java
@@ -91,9 +91,9 @@ public class RemoveIUTask extends AbstractRepositoryTask {
 								artifacts.removeDescriptor(key, new NullProgressMonitor());
 							} else {
 								IArtifactDescriptor[] descriptors = artifacts.getArtifactDescriptors(key);
-								for (int j = 0; j < descriptors.length; j++) {
-									if (filter.match(createDictionary(descriptors[j]))) {
-										artifacts.removeDescriptor(descriptors[j], new NullProgressMonitor());
+								for (IArtifactDescriptor descriptor : descriptors) {
+									if (filter.match(createDictionary(descriptor))) {
+										artifacts.removeDescriptor(descriptor, new NullProgressMonitor());
 									} else {
 										removeMetadata = false;
 									}
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/TaskHelper.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/TaskHelper.java
index 33bf77b01..5be773c85 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/TaskHelper.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/TaskHelper.java
@@ -29,8 +29,8 @@ public class TaskHelper {
 				b.append('\n');
 			b.append(status.getMessage());
 		}
-		for (int i = 0; i < nestedStatus.length; i++) {
-			statusToString(nestedStatus[i], severities, b);
+		for (IStatus s : nestedStatus) {
+			statusToString(s, severities, b);
 		}
 		return b;
 	}