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

6 files changed, 27 insertions, 27 deletions

diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ActionManager.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ActionManager.java
index 73aebab23..a5c887e94 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ActionManager.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ActionManager.java
@@ -94,11 +94,10 @@ public class ActionManager implements IRegistryChangeListener {
 		IExtensionPoint point = RegistryFactory.getRegistry().getExtensionPoint(EngineActivator.ID, PT_ACTIONS);
 		IExtension[] extensions = point.getExtensions();
 		actionMap = new HashMap<>(extensions.length);
-		for (int i = 0; i < extensions.length; i++) {
+		for (IExtension extension : extensions) {
 			try {
-				IConfigurationElement[] elements = extensions[i].getConfigurationElements();
-				for (int j = 0; j < elements.length; j++) {
-					IConfigurationElement actionElement = elements[j];
+				IConfigurationElement[] elements = extension.getConfigurationElements();
+				for (IConfigurationElement actionElement : elements) {
 					if (!actionElement.getName().equals(ELEMENT_ACTION))
 						continue;
 
@@ -111,7 +110,7 @@ public class ActionManager implements IRegistryChangeListener {
 
 					actionMap.put(actionId, actionElement);
 				}
-			} catch (InvalidRegistryObjectException e) {
+			}catch (InvalidRegistryObjectException e) {
 				// skip
 			}
 		}
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java
index 64247a8d2..6b29cc85a 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java
@@ -139,27 +139,27 @@ public class TouchpointManager implements IRegistryChangeListener {
 		IExtensionPoint point = RegistryFactory.getRegistry().getExtensionPoint(EngineActivator.ID, PT_TOUCHPOINTS);
 		IExtension[] extensions = point.getExtensions();
 		touchpointEntries = new HashMap<>(extensions.length);
-		for (int i = 0; i < extensions.length; i++) {
+		for (IExtension extension : extensions) {
 			try {
-				IConfigurationElement[] elements = extensions[i].getConfigurationElements();
-				for (int j = 0; j < elements.length; j++) {
-					String elementName = elements[j].getName();
+				IConfigurationElement[] elements = extension.getConfigurationElements();
+				for (IConfigurationElement element : elements) {
+					String elementName = element.getName();
 					if (!ELEMENT_TOUCHPOINT.equalsIgnoreCase(elementName)) {
-						reportError(NLS.bind(Messages.TouchpointManager_Incorrectly_Named_Extension, elements[j].getName(), ELEMENT_TOUCHPOINT));
+						reportError(NLS.bind(Messages.TouchpointManager_Incorrectly_Named_Extension, element.getName(), ELEMENT_TOUCHPOINT));
 						continue;
 					}
-					String id = elements[j].getAttribute(ATTRIBUTE_TYPE);
+					String id = element.getAttribute(ATTRIBUTE_TYPE);
 					if (id == null) {
 						reportError(NLS.bind(Messages.TouchpointManager_Attribute_Not_Specified, ATTRIBUTE_TYPE));
 						continue;
 					}
 					if (touchpointEntries.get(id) == null) {
-						touchpointEntries.put(id, new TouchpointEntry(elements[j]));
+						touchpointEntries.put(id, new TouchpointEntry(element));
 					} else {
 						reportError(NLS.bind(Messages.TouchpointManager_Conflicting_Touchpoint_Types, id));
 					}
 				}
-			} catch (InvalidRegistryObjectException e) {
+			}catch (InvalidRegistryObjectException e) {
 				//skip this extension
 			}
 		}
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/Sizing.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/Sizing.java
index 724b3d9a1..0e4535989 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/Sizing.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/Sizing.java
@@ -86,8 +86,8 @@ public class Sizing extends InstallableUnitPhase {
 		for (IArtifactRequest[] requests : artifactRequests) {
 			if (requests == null)
 				continue;
-			for (int i = 0; i < requests.length; i++) {
-				artifactsToObtain.add(requests[i]);
+			for (IArtifactRequest request : requests) {
+				artifactsToObtain.add(request);
 			}
 		}
 
@@ -103,8 +103,7 @@ public class Sizing extends InstallableUnitPhase {
 			if (sub.isCanceled())
 				break;
 			boolean found = false;
-			for (int i = 0; i < repositories.length; i++) {
-				IArtifactRepository repo = repositories[i];
+			for (IArtifactRepository repo : repositories) {
 				if (sub.isCanceled())
 					return Status.CANCEL_STATUS;
 				IArtifactDescriptor[] descriptors = repo.getArtifactDescriptors(artifactRequest.getArtifactKey());
diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
index 9de9dd26c..97f4e2da1 100644
--- a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
@@ -110,9 +110,10 @@ public class ExtensionLocationArtifactRepository extends AbstractRepository<IArt
 		String[] fileNames = base.list();
 		if (fileNames == null)
 			return false;
-		for (int i = 0; i < fileNames.length; i++) {
-			if (fileNames[i].endsWith(DOT_XML) && fileNames[i].contains(SITE))
+		for (String fileName : fileNames) {
+			if (fileName.endsWith(DOT_XML) && fileName.contains(SITE)) {
 				return true;
+			}
 		}
 		return false;
 	}
diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java
index 8fda206cc..b388a6745 100644
--- a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java
@@ -135,9 +135,10 @@ public class ExtensionLocationMetadataRepository extends AbstractMetadataReposit
 		String[] fileNames = base.list();
 		if (fileNames == null)
 			return false;
-		for (int i = 0; i < fileNames.length; i++) {
-			if (fileNames[i].endsWith(DOT_XML) && fileNames[i].contains(SITE))
+		for (String fileName : fileNames) {
+			if (fileName.endsWith(DOT_XML) && fileName.contains(SITE)) {
 				return true;
+			}
 		}
 		return false;
 	}
diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java
index 9b23804cf..4a277b005 100644
--- a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java
+++ b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java
@@ -54,9 +54,11 @@ public class SiteListener extends DirectoryChangeListener {
 	 */
 	private static boolean contains(String[] plugins, File file) {
 		String filename = file.getAbsolutePath();
-		for (int i = 0; i < plugins.length; i++)
-			if (filename.endsWith(plugins[i]))
+		for (String plugin : plugins) {
+			if (filename.endsWith(plugin)) {
 				return true;
+			}
+		}
 		return false;
 	}
 
@@ -170,8 +172,7 @@ public class SiteListener extends DirectoryChangeListener {
 		Feature feature = getFeature(file);
 		if (feature == null)
 			return false;
-		for (int i = 0; i < removed.length; i++) {
-			String line = removed[i];
+		for (String line : removed) {
 			// the line is a versioned identifier which is id_version
 			if (line.equals(feature.getId() + '_' + feature.getVersion()))
 				return true;
@@ -267,8 +268,7 @@ public class SiteListener extends DirectoryChangeListener {
 			result.add(featureFile.toString());
 			Feature feature = featureCache.get(featureFile);
 			FeatureEntry[] entries = feature.getEntries();
-			for (int inner = 0; inner < entries.length; inner++) {
-				FeatureEntry entry = entries[inner];
+			for (FeatureEntry entry : entries) {
 				// grab the right location from the plug-in cache
 				String key = entry.getId() + '/' + entry.getVersion();
 				File pluginLocation = pluginCache.get(key);