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

5 files changed, 16 insertions, 17 deletions

diff --git a/bundles/org.eclipse.equinox.p2.director.app/src_ant/org/eclipse/equinox/p2/director/app/ant/DirectorTask.java b/bundles/org.eclipse.equinox.p2.director.app/src_ant/org/eclipse/equinox/p2/director/app/ant/DirectorTask.java
index 71d662416..4dd59101a 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/src_ant/org/eclipse/equinox/p2/director/app/ant/DirectorTask.java
+++ b/bundles/org.eclipse.equinox.p2.director.app/src_ant/org/eclipse/equinox/p2/director/app/ant/DirectorTask.java
@@ -274,8 +274,8 @@ public class DirectorTask extends Task implements ILog {
 		log(0, status);
 		if (status.isMultiStatus()) {
 			IStatus[] children = status.getChildren();
-			for (int i = 0; i < children.length; i++) {
-				log(1, children[i]);
+			for (IStatus child : children) {
+				log(1, child);
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF
index 0e8f92553..ca154aab4 100644
--- a/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.p2.directorywatcher;singleton:=true
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.2.400.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.equinox.internal.provisional.p2.directorywatcher;x-friends:="org.eclipse.equinox.p2.reconciler.dropins,org.eclipse.equinox.p2.extensionlocation"
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml b/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml
index deb55ea8c..95f2260bf 100644
--- a/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.p2.directorywatcher</artifactId>
-  <version>1.2.300-SNAPSHOT</version>
+  <version>1.2.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java
index 104bb1ec1..cafc76056 100644
--- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java
@@ -101,10 +101,10 @@ public class CachingArtifactRepository implements IFileArtifactRepository {
 	public synchronized void addDescriptors(IArtifactDescriptor[] descriptors, IProgressMonitor monitor) {
 		try {
 			SubMonitor subMonitor = SubMonitor.convert(monitor, descriptors.length);
-			for (int i = 0; i < descriptors.length; i++) {
-				((ArtifactDescriptor) descriptors[i]).setRepository(this);
-				descriptorsToAdd.add(descriptors[i]);
-				mapDescriptor(descriptors[i]);
+			for (IArtifactDescriptor descriptor : descriptors) {
+				((ArtifactDescriptor) descriptor).setRepository(this);
+				descriptorsToAdd.add(descriptor);
+				mapDescriptor(descriptor);
 				subMonitor.worked(1);
 			}
 		} finally {
@@ -185,8 +185,9 @@ public class CachingArtifactRepository implements IFileArtifactRepository {
 		try {
 			SubMonitor subMonitor = SubMonitor.convert(monitor, 1);
 			IArtifactDescriptor[] toRemove = descriptorsToAdd.toArray(new IArtifactDescriptor[descriptorsToAdd.size()]);
-			for (int i = 0; i < toRemove.length; i++)
-				doRemoveArtifact(toRemove[i]);
+			for (IArtifactDescriptor toRemove1 : toRemove) {
+				doRemoveArtifact(toRemove1);
+			}
 			subMonitor.worked(1);
 		} finally {
 			if (monitor != null)
@@ -223,8 +224,8 @@ public class CachingArtifactRepository implements IFileArtifactRepository {
 		try {
 			IArtifactDescriptor[] toRemove = getArtifactDescriptors(key);
 			SubMonitor subMonitor = SubMonitor.convert(monitor, toRemove.length);
-			for (int i = 0; i < toRemove.length; i++) {
-				doRemoveArtifact(toRemove[i]);
+			for (IArtifactDescriptor toRemove1 : toRemove) {
+				doRemoveArtifact(toRemove1);
 				subMonitor.worked(1);
 			}
 		} finally {
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/DirectoryWatcher.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/DirectoryWatcher.java
index 7e8ff8082..f09324dbb 100644
--- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/DirectoryWatcher.java
+++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/DirectoryWatcher.java
@@ -142,15 +142,13 @@ public class DirectoryWatcher {
 	}
 
 	private void scanDirectories() {
-		for (int index = 0; index < directories.length; index++) {
-			File directory = directories[index];
+		for (File directory : directories) {
 			File list[] = directory.listFiles();
 			if (list == null)
 				continue;
-			for (int i = 0; i < list.length; i++) {
-				File file = list[i];
+			for (File file : list) {
 				// if this is a deletion marker then add to the list of pending deletions.
-				if (list[i].getPath().endsWith(DEL_EXT)) {
+				if (file.getPath().endsWith(DEL_EXT)) {
 					File target = new File(file.getPath().substring(0, file.getPath().length() - 4));
 					removals.add(target);
 					pendingDeletions.add(target);