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>

3 files changed, 8 insertions, 7 deletions

diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeWriter.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeWriter.java
index 68b0f41bc..e06da2ba8 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeWriter.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeWriter.java
@@ -39,8 +39,9 @@ public class CompositeWriter extends XMLWriter implements XMLConstants {
 			return;
 		start(CHILDREN_ELEMENT);
 		attribute(COLLECTION_SIZE_ATTRIBUTE, children.length);
-		for (int i = 0; i < children.length; i++)
-			writeChild(children[i]);
+		for (URI child : children) {
+			writeChild(child);
+		}
 		end(CHILDREN_ELEMENT);
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java
index 79e96f5d2..011417df1 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java
@@ -71,8 +71,8 @@ public class XMLWriter implements XMLConstants {
 		this.open = false;
 		this.indent = "  "; //$NON-NLS-1$
 		if (piElements != null) {
-			for (int i = 0; i < piElements.length; i++) {
-				println(piElements[i].toString());
+			for (ProcessingInstruction piElement : piElements) {
+				println(piElement.toString());
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java
index 7cd469d4a..99b3e9f41 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java
@@ -274,11 +274,11 @@ public class CacheManager {
 	void deleteCache(URI repositoryLocation) {
 		for (String prefix : knownPrefixes) {
 			File[] cacheFiles = getCacheFiles(repositoryLocation, prefix);
-			for (int i = 0; i < cacheFiles.length; i++) {
+			for (File cacheFile : cacheFiles) {
 				// delete the cache file if it exists
-				safeDelete(cacheFiles[i]);
+				safeDelete(cacheFile);
 				// delete a resumable download if it exists
-				safeDelete(new File(new File(cacheFiles[i].getParentFile(), DOWNLOADING), cacheFiles[i].getName()));
+				safeDelete(new File(new File(cacheFile.getParentFile(), DOWNLOADING), cacheFile.getName()));
 			}
 		}
 	}