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

18 files changed, 117 insertions, 126 deletions

diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/compatibility/GeneratorApplication.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/compatibility/GeneratorApplication.java
index 76be47a1a..4ae7d93b7 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/compatibility/GeneratorApplication.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/compatibility/GeneratorApplication.java
@@ -131,8 +131,7 @@ public class GeneratorApplication implements IApplication {
 
 	private String[] flattenMap(Map<String, String> map) {
 		ArrayList<String> list = new ArrayList<>(map.size());
-		for (Iterator<String> iterator = map.keySet().iterator(); iterator.hasNext();) {
-			String key = iterator.next();
+		for (String key : map.keySet()) {
 			String value = map.get(key);
 			list.add(key);
 			if (value != null)
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
index 58e023c07..fe2d176d4 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
@@ -144,9 +144,10 @@ public class BrandingIron {
 		if (brandIcons) {
 			File icon = null;
 			if (icons.length > 0) {
-				for (int i = 0; i < icons.length; i++) {
-					if (icons[i].toLowerCase().endsWith(".xpm")) { //$NON-NLS-1$
-						icon = new File(icons[i]);
+				for (String icon1 : icons) {
+					if (icon1.toLowerCase().endsWith(".xpm")) {
+						//$NON-NLS-1$
+						icon = new File(icon1);
 						break;
 					}
 				}
@@ -165,9 +166,7 @@ public class BrandingIron {
 			return;
 
 		File root = descriptor.getLocation();
-		for (int i = 0; i < icons.length; i++) {
-			String icon = icons[i];
-
+		for (String icon : icons) {
 			int iconNameLength = icon.length();
 			if (iconNameLength < 5)
 				continue;
@@ -209,9 +208,10 @@ public class BrandingIron {
 		String iconName = ""; //$NON-NLS-1$
 		if (brandIcons) {
 			File icon = null;
-			for (int i = 0; i < icons.length; i++) {
-				if (icons[i].toLowerCase().endsWith(".icns")) { //$NON-NLS-1$
-					icon = new File(icons[i]);
+			for (String icon1 : icons) {
+				if (icon1.toLowerCase().endsWith(".icns")) {
+					//$NON-NLS-1$
+					icon = new File(icon1);
 					if (icon.exists()) {
 						break;
 					}
@@ -333,13 +333,14 @@ public class BrandingIron {
 		if (source.isDirectory()) {
 			target.mkdirs();
 			File[] contents = source.listFiles();
-			for (int i = 0; i < contents.length; i++) {
-				File dest = new File(target, contents[i].getName());
-				if (contents[i].isFile()) {
-					contents[i].renameTo(dest);
-					descriptor.replace(contents[i], dest);
-				} else
-					moveContents(descriptor, contents[i], dest);
+			for (File content : contents) {
+				File dest = new File(target, content.getName());
+				if (content.isFile()) {
+					content.renameTo(dest);
+					descriptor.replace(content, dest);
+				} else {
+					moveContents(descriptor, content, dest);
+				}
 			}
 			source.delete();
 		} else {
@@ -563,11 +564,12 @@ public class BrandingIron {
 
 	private int scan(StringBuffer buf, int start, String[] targets) {
 		for (int i = start; i < buf.length(); i++) {
-			for (int j = 0; j < targets.length; j++) {
-				if (i < buf.length() - targets[j].length()) {
-					String match = buf.substring(i, i + targets[j].length());
-					if (targets[j].equalsIgnoreCase(match))
+			for (String target : targets) {
+				if (i < buf.length() - target.length()) {
+					String match = buf.substring(i, i + target.length());
+					if (target.equalsIgnoreCase(match)) {
 						return i;
+					}
 				}
 			}
 		}
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java
index 809866615..c7f44a01e 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java
@@ -133,8 +133,9 @@ public class ExecutablesDescriptor {
 			this.files = new HashSet<>(11);
 		else {
 			this.files = new HashSet<>(files.length);
-			for (int i = 0; i < files.length; i++)
-				addAllFiles(files[i]);
+			for (File file : files) {
+				addAllFiles(file);
+			}
 		}
 	}
 
@@ -152,8 +153,9 @@ public class ExecutablesDescriptor {
 		else {
 			File absolute = file.isAbsolute() ? file : new File(location, file.getPath());
 			File[] list = absolute.listFiles();
-			for (int i = 0; i < list.length; i++)
-				addAllFiles(list[i]);
+			for (File list1 : list) {
+				addAllFiles(list1);
+			}
 		}
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
index bd896cc7a..03d3c4f97 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
@@ -323,15 +323,14 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor {
 					filteredKeys[2] = os + "." + arch; //$NON-NLS-1$
 				}
 			}
-			for (int i = 0; i < filteredKeys.length; i++) {
-				if (filteredKeys[i] != null) {
+			for (String filteredKey : filteredKeys) {
+				if (filteredKey != null) {
 					// copy all mappings that are filtered for this os and/or arch
-					HashMap<String, String> innerMap = filteredProperties.get(filteredKeys[i]);
+					HashMap<String, String> innerMap = filteredProperties.get(filteredKey);
 					if (innerMap != null) {
 						result.putAll(innerMap);
 					}
 				}
-
 			}
 		}
 		if (application != null && !result.containsKey(PROPERTY_ECLIPSE_APPLICATION))
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ApplicationLauncherAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ApplicationLauncherAction.java
index 2b2c6c2ea..771dcaa5a 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ApplicationLauncherAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ApplicationLauncherAction.java
@@ -134,9 +134,9 @@ public class ApplicationLauncherAction extends AbstractPublisherAction {
 
 	protected Collection<IPublisherAction> createExecutablesActions(String[] configs) {
 		Collection<IPublisherAction> actions = new ArrayList<>(configs.length);
-		for (int i = 0; i < configs.length; i++) {
-			ExecutablesDescriptor executables = computeExecutables(configs[i]);
-			IPublisherAction action = new EquinoxExecutableAction(executables, configs[i], id, version, flavor);
+		for (String config : configs) {
+			ExecutablesDescriptor executables = computeExecutables(config);
+			IPublisherAction action = new EquinoxExecutableAction(executables, config, id, version, flavor);
 			actions.add(action);
 		}
 		return actions;
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
index cdb52b9d2..1eaa16014 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
@@ -831,8 +831,7 @@ public class BundlesAction extends AbstractPublisherAction {
 	private void expandLocations(File[] list, ArrayList<File> result) {
 		if (list == null)
 			return;
-		for (int i = 0; i < list.length; i++) {
-			File location = list[i];
+		for (File location : list) {
 			if (location.isDirectory()) {
 				// if the location is itself a bundle, just add it.  Otherwise r down
 				if (new File(location, JarFile.MANIFEST_NAME).exists())
@@ -969,16 +968,16 @@ public class BundlesAction extends AbstractPublisherAction {
 		if (bundleLocations == null)
 			return new BundleDescription[0];
 		List<BundleDescription> result = new ArrayList<>(bundleLocations.length);
-		for (int i = 0; i < bundleLocations.length; i++) {
+		for (File bundleLocation : bundleLocations) {
 			if (monitor.isCanceled())
 				throw new OperationCanceledException();
 			BundleDescription description = null;
 			try {
-				description = createBundleDescription(bundleLocations[i]);
+				description = createBundleDescription(bundleLocation);
 			} catch (IOException e) {
-				addPublishingErrorToFinalStatus(e, bundleLocations[i]);
+				addPublishingErrorToFinalStatus(e, bundleLocation);
 			} catch (BundleException e) {
-				addPublishingErrorToFinalStatus(e, bundleLocations[i]);
+				addPublishingErrorToFinalStatus(e, bundleLocation);
 			}
 			if (description != null) {
 				result.add(description);
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ConfigCUsAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ConfigCUsAction.java
index 514e1079f..c92ba5417 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ConfigCUsAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ConfigCUsAction.java
@@ -101,10 +101,10 @@ public class ConfigCUsAction extends AbstractPublisherAction {
 		// we have N platforms, generate a CU for each
 		// TODO try and find common properties across platforms
 		String[] configSpecs = publisherInfo.getConfigurations();
-		for (int i = 0; i < configSpecs.length; i++) {
+		for (String configSpec1 : configSpecs) {
 			if (monitor.isCanceled())
 				return Status.CANCEL_STATUS;
-			String configSpec = configSpecs[i];
+			String configSpec = configSpec1;
 			Collection<IConfigAdvice> configAdvice = publisherInfo.getAdvice(configSpec, false, id, version, IConfigAdvice.class);
 			BundleInfo[] bundles = fillInBundles(configAdvice, results);
 			publishBundleCUs(publisherInfo, bundles, configSpec, innerResult);
@@ -144,17 +144,14 @@ public class ConfigCUsAction extends AbstractPublisherAction {
 			}
 
 			BundleInfo[] bundles = advice.getBundles();
-			for (int i = 0; i < bundles.length; i++) {
-				BundleInfo bundleInfo = bundles[i];
-
+			for (BundleInfo bundleInfo : bundles) {
 				if (bundleInfo.getStartLevel() != BundleInfo.NO_LEVEL && bundleInfo.getStartLevel() == defaultStart) {
 					bundleInfo.setStartLevel(BundleInfo.NO_LEVEL);
 				}
-
 				// prime the result with the current info.  This will be replaced if there is more info...
-				if ((bundleInfo.getSymbolicName() != null && bundleInfo.getVersion() != null) || bundleInfo.getLocation() == null)
-					result.add(bundles[i]);
-				else {
+				if ((bundleInfo.getSymbolicName() != null && bundleInfo.getVersion() != null) || bundleInfo.getLocation() == null) {
+					result.add(bundleInfo);
+				} else {
 					try {
 						File location = new File(bundleInfo.getLocation());
 						Dictionary<String, String> manifest = BundlesAction.loadManifestIgnoringExceptions(location);
@@ -300,14 +297,15 @@ public class ConfigCUsAction extends AbstractPublisherAction {
 		Set<String> programSet = new HashSet<>();
 		for (IExecutableAdvice advice : launchingAdvice) {
 			String[] jvmArgs = advice.getVMArguments();
-			for (int i = 0; i < jvmArgs.length; i++)
-				if (shouldPublishJvmArg(jvmArgs[i]) && !jvmSet.contains(jvmArgs[i])) {
-					jvmSet.add(jvmArgs[i]);
+			for (String jvmArg : jvmArgs) {
+				if (shouldPublishJvmArg(jvmArg) && !jvmSet.contains(jvmArg)) {
+					jvmSet.add(jvmArg);
 					touchpointParameters.clear();
-					touchpointParameters.put("jvmArg", jvmArgs[i]); //$NON-NLS-1$
+					touchpointParameters.put("jvmArg", jvmArg); //$NON-NLS-1$
 					configurationData += TouchpointInstruction.encodeAction("addJvmArg", touchpointParameters); //$NON-NLS-1$
 					unconfigurationData += TouchpointInstruction.encodeAction("removeJvmArg", touchpointParameters); //$NON-NLS-1$
 				}
+			}
 			String[] programArgs = advice.getProgramArguments();
 			for (int i = 0; i < programArgs.length; i++)
 				if (shouldPublishProgramArg(programArgs[i]) && !programSet.contains(programArgs[i])) {
@@ -341,17 +339,14 @@ public class ConfigCUsAction extends AbstractPublisherAction {
 			filter = createFilterSpec(configSpec);
 		}
 
-		for (int i = 0; i < bundles.length; i++) {
-			GeneratorBundleInfo bundle = createGeneratorBundleInfo(bundles[i], result);
+		for (BundleInfo bundle1 : bundles) {
+			GeneratorBundleInfo bundle = createGeneratorBundleInfo(bundle1, result);
 			if (bundle == null)
 				continue;
-
 			IInstallableUnit iu = bundle.getIU();
-
 			// If there is no host, or the filters don't match, skip this one.
 			if (iu == null || !filterMatches(iu.getFilter(), configSpec))
 				continue;
-
 			// TODO need to factor this out into its own action
 			if (bundle.getSymbolicName().equals(ORG_ECLIPSE_UPDATE_CONFIGURATOR)) {
 				bundle.setStartLevel(BundleInfo.NO_LEVEL);
@@ -362,13 +357,11 @@ public class ConfigCUsAction extends AbstractPublisherAction {
 				// this bundle does not require any particular configuration, the plug-in default IU will handle installing it
 				continue;
 			}
-
 			IInstallableUnit cu = null;
 			if (this.version != null && !this.version.equals(Version.emptyVersion))
 				cu = BundlesAction.createBundleConfigurationUnit(bundle.getSymbolicName(), this.version, false, bundle, flavor + cuIdPrefix, filter);
 			else
 				cu = BundlesAction.createBundleConfigurationUnit(bundle.getSymbolicName(), Version.parseVersion(bundle.getVersion()), false, bundle, flavor + cuIdPrefix, filter);
-
 			if (cu != null) {
 				// Product Query will run against the repo, make sure these CUs are in before then
 				// TODO review the aggressive addition to the metadata repo.  perhaps the query can query the result as well.
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EclipseInstallAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EclipseInstallAction.java
index 4059fe2f1..473b097c5 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EclipseInstallAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EclipseInstallAction.java
@@ -57,10 +57,10 @@ public class EclipseInstallAction extends AbstractPublisherAction {
 		this.info = publisherInfo;
 		IPublisherAction[] actions = createActions();
 		MultiStatus finalStatus = new MultiStatus(EclipseInstallAction.class.getName(), 0, "publishing result", null); //$NON-NLS-1$
-		for (int i = 0; i < actions.length; i++) {
+		for (IPublisherAction action : actions) {
 			if (monitor.isCanceled())
 				return Status.CANCEL_STATUS;
-			finalStatus.merge(actions[i].perform(publisherInfo, results, monitor));
+			finalStatus.merge(action.perform(publisherInfo, results, monitor));
 		}
 		if (!finalStatus.isOK())
 			return finalStatus;
@@ -120,8 +120,7 @@ public class EclipseInstallAction extends AbstractPublisherAction {
 			configuration = null;
 
 		Collection<IPublisherAction> result = new ArrayList<>(configs.length);
-		for (int i = 0; i < configs.length; i++) {
-			String configSpec = configs[i];
+		for (String configSpec : configs) {
 			String os = AbstractPublisherAction.parseConfigSpec(configSpec)[1];
 			File executable = ExecutablesDescriptor.findExecutable(os, computeExecutableLocation(configSpec), "eclipse"); //$NON-NLS-1$
 			if (!executable.exists())
@@ -143,9 +142,9 @@ public class EclipseInstallAction extends AbstractPublisherAction {
 
 	protected Collection<IPublisherAction> createExecutablesActions(String[] configSpecs) {
 		Collection<IPublisherAction> result = new ArrayList<>(configSpecs.length);
-		for (int i = 0; i < configSpecs.length; i++) {
-			ExecutablesDescriptor executables = computeExecutables(configSpecs[i]);
-			IPublisherAction action = new EquinoxExecutableAction(executables, configSpecs[i], id, version, flavor);
+		for (String configSpec : configSpecs) {
+			ExecutablesDescriptor executables = computeExecutables(configSpec);
+			IPublisherAction action = new EquinoxExecutableAction(executables, configSpec, id, version, flavor);
 			result.add(action);
 		}
 		return result;
@@ -160,8 +159,9 @@ public class EclipseInstallAction extends AbstractPublisherAction {
 		if (baseExclusions != null)
 			info.addAdvice(new RootFilesAdvice(null, null, baseExclusions, null));
 		String[] configs = info.getConfigurations();
-		for (int i = 0; i < configs.length; i++)
-			info.addAdvice(computeRootFileAdvice(configs[i]));
+		for (String config : configs) {
+			info.addAdvice(computeRootFileAdvice(config));
+		}
 	}
 
 	protected IPublisherAdvice computeRootFileAdvice(String configSpec) {
@@ -184,8 +184,7 @@ public class EclipseInstallAction extends AbstractPublisherAction {
 		if (nonRootFiles == null || nonRootFiles.length == 0)
 			return null;
 		ArrayList<File> result = new ArrayList<>();
-		for (int i = 0; i < nonRootFiles.length; i++) {
-			String filename = nonRootFiles[i];
+		for (String filename : nonRootFiles) {
 			File file = new File(filename);
 			if (file.isAbsolute())
 				result.add(file);
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java
index ec20e2ccc..862574d17 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java
@@ -191,8 +191,9 @@ public class EquinoxExecutableAction extends AbstractPublisherAction {
 		if (!Constants.OS_WIN32.equals(os)) {
 			// We are on linux/unix.  by default set all of the files to be executable.
 			File[] fileList = execDescriptor.getFiles();
-			for (int i = 0; i < fileList.length; i++)
-				configurationData += " chmod(targetDir:${installFolder}, targetFile:" + fileList[i].getName() + ", permissions:755);"; //$NON-NLS-1$ //$NON-NLS-2$
+			for (File fileList1 : fileList) {
+				configurationData += " chmod(targetDir:${installFolder}, targetFile:" + fileList1.getName() + ", permissions:755);"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
 		}
 		touchpointData.put("install", configurationData); //$NON-NLS-1$
 		String unConfigurationData = "cleanupzip(source:@artifact, target:${installFolder});"; //$NON-NLS-1$
@@ -273,8 +274,9 @@ public class EquinoxExecutableAction extends AbstractPublisherAction {
 
 	protected void partialBrandExecutables(ExecutablesDescriptor descriptor) {
 		File[] list = descriptor.getFiles();
-		for (int i = 0; i < list.length; i++)
-			mungeExecutableFileName(list[i], descriptor);
+		for (File list1 : list) {
+			mungeExecutableFileName(list1, descriptor);
+		}
 		descriptor.setExecutableName("eclipse", true); //$NON-NLS-1$
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java
index 0f015a1f8..0d15c6408 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java
@@ -60,8 +60,7 @@ public class EquinoxLauncherCUAction extends AbstractPublisherAction {
 	 */
 	private void publishLauncherFragmentCUs(IPublisherResult results) {
 		String id = null;
-		for (int i = 0; i < configSpecs.length; i++) {
-			String configSpec = configSpecs[i];
+		for (String configSpec : configSpecs) {
 			String[] specs = Utils.getTokens(configSpec, "."); //$NON-NLS-1$
 			if (specs.length > 0 && !AbstractPublisherAction.CONFIG_ANY.equalsIgnoreCase(specs[0])) {
 				if (specs.length > 2 && Constants.OS_MACOSX.equals(specs[1]) && !Constants.ARCH_X86_64.equals(specs[2])) {
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java
index 1cfd148d7..5c3d9a2a5 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java
@@ -184,8 +184,7 @@ public class FeaturesAction extends AbstractPublisherAction {
 	 */
 	private void createBundleShapeAdvice(Feature feature, IPublisherInfo publisherInfo) {
 		FeatureEntry entries[] = feature.getEntries();
-		for (int i = 0; i < entries.length; i++) {
-			FeatureEntry entry = entries[i];
+		for (FeatureEntry entry : entries) {
 			if (entry.isUnpack() && entry.isPlugin() && !entry.isRequires())
 				publisherInfo.addAdvice(new BundleShapeAdvice(entry.getId(), Version.parseVersion(entry.getVersion()), IBundleShapeAdvice.DIR));
 		}
@@ -246,10 +245,10 @@ public class FeaturesAction extends AbstractPublisherAction {
 
 		FeatureEntry entries[] = feature.getEntries();
 		List<IRequirement> required = new ArrayList<>(entries.length + (childIUs == null ? 0 : childIUs.size()));
-		for (int i = 0; i < entries.length; i++) {
-			VersionRange range = getVersionRange(entries[i]);
-			String requiredId = getTransformedId(entries[i].getId(), entries[i].isPlugin(), /*isGroup*/true);
-			required.add(MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, requiredId, range, getFilter(entries[i]), entries[i].isOptional(), false));
+		for (FeatureEntry entry : entries) {
+			VersionRange range = getVersionRange(entry);
+			String requiredId = getTransformedId(entry.getId(), entry.isPlugin(), /*isGroup*/true);
+			required.add(MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, requiredId, range, getFilter(entry), entry.isOptional(), false));
 		}
 
 		// link in all the children (if any) as requirements.
@@ -321,18 +320,18 @@ public class FeaturesAction extends AbstractPublisherAction {
 		ArrayList<IRequirement> applicabilityScope = new ArrayList<>();
 		ArrayList<IRequirement> patchRequirements = new ArrayList<>();
 		ArrayList<IRequirementChange> requirementChanges = new ArrayList<>();
-		for (int i = 0; i < entries.length; i++) {
-			VersionRange range = getVersionRange(entries[i]);
-			IRequirement req = MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, getTransformedId(entries[i].getId(), entries[i].isPlugin(), /*isGroup*/true), range, getFilter(entries[i]), entries[i].isOptional(), false);
-			if (entries[i].isRequires()) {
+		for (FeatureEntry entry : entries) {
+			VersionRange range = getVersionRange(entry);
+			IRequirement req = MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, getTransformedId(entry.getId(), entry.isPlugin(), /*isGroup*/true), range, getFilter(entry), entry.isOptional(), false);
+			if (entry.isRequires()) {
 				applicabilityScope.add(req);
 				if (applicabilityScope.size() == 1) {
-					iu.setLifeCycle(MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, getTransformedId(entries[i].getId(), entries[i].isPlugin(), /*isGroup*/true), range, null, false, false, false));
+					iu.setLifeCycle(MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, getTransformedId(entry.getId(), entry.isPlugin(), /*isGroup*/true), range, null, false, false, false));
 				}
 				continue;
 			}
-			if (entries[i].isPlugin()) {
-				IRequirement from = MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, getTransformedId(entries[i].getId(), entries[i].isPlugin(), /*isGroup*/true), VersionRange.emptyRange, getFilter(entries[i]), entries[i].isOptional(), false);
+			if (entry.isPlugin()) {
+				IRequirement from = MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, getTransformedId(entry.getId(), entry.isPlugin(), /*isGroup*/true), VersionRange.emptyRange, getFilter(entry), entry.isOptional(), false);
 				requirementChanges.add(MetadataFactory.createRequirementChange(from, req));
 				continue;
 			}
@@ -390,8 +389,7 @@ public class FeaturesAction extends AbstractPublisherAction {
 	private void expandLocations(File[] list, ArrayList<File> result) {
 		if (list == null)
 			return;
-		for (int i = 0; i < list.length; i++) {
-			File location = list[i];
+		for (File location : list) {
 			if (location.isDirectory()) {
 				// if the location is itself a feature, just add it.  Otherwise r down
 				if (new File(location, "feature.xml").exists()) //$NON-NLS-1$
@@ -406,8 +404,7 @@ public class FeaturesAction extends AbstractPublisherAction {
 
 	protected void generateFeatureIUs(Feature[] featureList, IPublisherResult result) {
 		// Build Feature IUs, and add them to any corresponding categories
-		for (int i = 0; i < featureList.length; i++) {
-			Feature feature = featureList[i];
+		for (Feature feature : featureList) {
 			//first gather any advice that might help us
 			createBundleShapeAdvice(feature, info);
 			createAdviceFileAdvice(feature, info);
@@ -453,9 +450,7 @@ public class FeaturesAction extends AbstractPublisherAction {
 
 		IFeatureRootAdvice advice = collection.iterator().next();
 		String[] configs = advice.getConfigurations();
-		for (int i = 0; i < configs.length; i++) {
-			String config = configs[i];
-
+		for (String config : configs) {
 			FileSetDescriptor descriptor = advice.getDescriptor(config);
 			if (descriptor != null && descriptor.size() > 0) {
 				IInstallableUnit iu = createFeatureRootFileIU(feature.getId(), feature.getVersion(), null, descriptor);
@@ -512,18 +507,19 @@ public class FeaturesAction extends AbstractPublisherAction {
 		if (updateURL != null)
 			generateSiteReference(updateURL.getURL(), updateURL.getAnnotation(), feature.getId(), collector);
 		URLEntry[] discoverySites = feature.getDiscoverySites();
-		for (int i = 0; i < discoverySites.length; i++)
-			generateSiteReference(discoverySites[i].getURL(), discoverySites[i].getAnnotation(), feature.getId(), collector);
+		for (URLEntry discoverySite : discoverySites) {
+			generateSiteReference(discoverySite.getURL(), discoverySite.getAnnotation(), feature.getId(), collector);
+		}
 		if (!collector.isEmpty())
 			publisherInfo.getMetadataRepository().addReferences(collector);
 	}
 
 	protected Feature[] getFeatures(File[] featureLocations) {
 		ArrayList<Feature> result = new ArrayList<>(featureLocations.length);
-		for (int i = 0; i < featureLocations.length; i++) {
-			Feature feature = new FeatureParser().parse(featureLocations[i]);
+		for (File featureLocation : featureLocations) {
+			Feature feature = new FeatureParser().parse(featureLocation);
 			if (feature != null) {
-				feature.setLocation(featureLocations[i].getAbsolutePath());
+				feature.setLocation(featureLocation.getAbsolutePath());
 				result.add(feature);
 			}
 		}
@@ -594,9 +590,10 @@ public class FeaturesAction extends AbstractPublisherAction {
 
 	private boolean isPatch(Feature feature) {
 		FeatureEntry[] entries = feature.getEntries();
-		for (int i = 0; i < entries.length; i++) {
-			if (entries[i].isPatch())
+		for (FeatureEntry entry : entries) {
+			if (entry.isPatch()) {
 				return true;
+			}
 		}
 		return false;
 	}
@@ -659,8 +656,7 @@ public class FeaturesAction extends AbstractPublisherAction {
 	private void setupPermissions(InstallableUnitDescription iu, FileSetDescriptor descriptor) {
 		Map<String, String> touchpointData = new HashMap<>();
 		String[][] permsList = descriptor.getPermissions();
-		for (int i = 0; i < permsList.length; i++) {
-			String[] permSpec = permsList[i];
+		for (String[] permSpec : permsList) {
 			String configurationData = " chmod(targetDir:${installFolder}, targetFile:" + permSpec[1] + ", permissions:" + permSpec[0] + ");"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			touchpointData.put("install", configurationData); //$NON-NLS-1$
 			iu.addTouchpointData(MetadataFactory.createTouchpointData(touchpointData));
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java
index 7ae698ff8..474c23abb 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java
@@ -142,10 +142,10 @@ public class ProductAction extends AbstractPublisherAction {
 		publisherResults = results;
 		finalStatus = new MultiStatus(Activator.ID, 0, NLS.bind(Messages.message_problemPublishingProduct, product.getId()), null);
 		IPublisherAction[] actions = createActions(results);
-		for (int i = 0; i < actions.length; i++) {
+		for (IPublisherAction action : actions) {
 			if (monitor.isCanceled())
 				return Status.CANCEL_STATUS;
-			finalStatus.merge(actions[i].perform(publisherInfo, results, monitor));
+			finalStatus.merge(action.perform(publisherInfo, results, monitor));
 		}
 		if (!finalStatus.isOK())
 			return finalStatus;
@@ -210,8 +210,9 @@ public class ProductAction extends AbstractPublisherAction {
 			name = product.getId();
 
 		String[] configSpecs = info.getConfigurations();
-		for (int i = 0; i < configSpecs.length; i++)
-			info.addAdvice(new ProductFileAdvice(product, configSpecs[i]));
+		for (String configSpec : configSpecs) {
+			info.addAdvice(new ProductFileAdvice(product, configSpec));
+		}
 	}
 
 	private Collection<IVersionedId> versionElements(Collection<IVersionedId> elements, String namespace) {
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java
index 678dc7b56..551796a7a 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java
@@ -204,10 +204,9 @@ public class ProductFileAdvice extends AbstractAdvice implements ILicenseAdvice,
 		Map<String, List<BundleInfo>> unboundedBundles = new HashMap<>();
 
 		BundleInfo[] bundles = data.getBundles();
-		for (int i = 0; i < bundles.length; i++) {
+		for (BundleInfo bundleInfo : bundles) {
 			// For each bundle we know about, cache it.  If the bundle doesn't have a version
 			// add it to a list of bundles by name
-			BundleInfo bundleInfo = bundles[i];
 			if (bundleInfo.getVersion().equals(BundleInfo.EMPTY_VERSION)) {
 				addUnboundedBundle(unboundedBundles, bundleInfo);
 			} else {
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/build/publisher/FeatureRootAdvice.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/build/publisher/FeatureRootAdvice.java
index fe17736ce..dc2ac8c63 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/build/publisher/FeatureRootAdvice.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/build/publisher/FeatureRootAdvice.java
@@ -78,8 +78,8 @@ public class FeatureRootAdvice extends AbstractAdvice implements IFeatureRootAdv
 
 	public void addPermissions(String config, String permissions, String[] files) {
 		FileSetDescriptor descriptor = getDescriptor(config);
-		for (int i = 0; i < files.length; i++) {
-			descriptor.addPermissions(new String[] {permissions, files[i]});
+		for (String file : files) {
+			descriptor.addPermissions(new String[]{permissions, file});
 		}
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/build/publisher/GatheringComputer.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/build/publisher/GatheringComputer.java
index fc215c9d2..e3c26223c 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/build/publisher/GatheringComputer.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/build/publisher/GatheringComputer.java
@@ -52,8 +52,8 @@ public class GatheringComputer implements IPathComputer {
 	}
 
 	public void addFiles(String prefix, String[] files) {
-		for (int i = 0; i < files.length; i++) {
-			filesMap.put(new File(prefix, files[i]), prefix);
+		for (String file : files) {
+			filesMap.put(new File(prefix, file), prefix);
 		}
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/publishing/Utils.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/publishing/Utils.java
index 0d72a114a..8f603e313 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/publishing/Utils.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/publishing/Utils.java
@@ -70,9 +70,10 @@ public final class Utils {
 		if (classpath.length == 0)
 			return false;
 
-		for (int i = 0; i < classpath.length; i++) {
-			if (classpath[i].equals(".")) //$NON-NLS-1$
+		for (String classpath1 : classpath) {
+			if (classpath1.equals(".")) {
 				return false;
+			}
 		}
 		return true;
 	}
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/swt/tools/IconExe.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/swt/tools/IconExe.java
index 052aa07c4..64d908d60 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/swt/tools/IconExe.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/swt/tools/IconExe.java
@@ -77,8 +77,8 @@ public class IconExe {
 			try {
 				//An ICO should contain 7 images, a BMP will contain 1
 				ImageData[] current = loader.load(args[i]);
-				for (int j = 0; j < current.length; j++) {
-					images.add(current[j]);
+				for (ImageData id : current) {
+					images.add(id);
 				}
 			} catch (RuntimeException e) {
 				//ignore so that we process the other images
@@ -291,15 +291,15 @@ public class IconExe {
 			imageResourceDirectoryEntries[i] = new IMAGE_RESOURCE_DIRECTORY_ENTRY();
 			read(raf, imageResourceDirectoryEntries[i]);
 		}
-		for (int i = 0; i < imageResourceDirectoryEntries.length; i++) {
-			if (imageResourceDirectoryEntries[i].DataIsDirectory) {
-				dumpResourceDirectory(raf, imageResourceDirectoryEntries[i].OffsetToDirectory + resourceBase, resourceBase, delta, imageResourceDirectoryEntries[i].Id, level + 1, rt_icon_root ? true : type == RT_ICON);
+		for (IMAGE_RESOURCE_DIRECTORY_ENTRY imageResourceDirectoryEntry : imageResourceDirectoryEntries) {
+			if (imageResourceDirectoryEntry.DataIsDirectory) {
+				dumpResourceDirectory(raf, imageResourceDirectoryEntry.OffsetToDirectory + resourceBase, resourceBase, delta, imageResourceDirectoryEntry.Id, level + 1, rt_icon_root ? true : type == RT_ICON);
 			} else {
 				// Resource found
 				/// pResDirEntry->Name
-				IMAGE_RESOURCE_DIRECTORY_ENTRY irde = imageResourceDirectoryEntries[i];
+				IMAGE_RESOURCE_DIRECTORY_ENTRY irde = imageResourceDirectoryEntry;
 				IMAGE_RESOURCE_DATA_ENTRY data = new IMAGE_RESOURCE_DATA_ENTRY();
-				raf.seek(imageResourceDirectoryEntries[i].OffsetToData + resourceBase);
+				raf.seek(imageResourceDirectoryEntry.OffsetToData + resourceBase);
 				read(raf, data);
 				if (DEBUG)
 					System.out.println("Resource Id " + irde.Id + " Data Offset RVA " + data.OffsetToData + ", Size " + data.Size); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src_ant/org/eclipse/equinox/internal/p2/publisher/ant/FeaturesAndBundlesPublisherTask.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src_ant/org/eclipse/equinox/internal/p2/publisher/ant/FeaturesAndBundlesPublisherTask.java
index 0009ca980..9cbf8720d 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src_ant/org/eclipse/equinox/internal/p2/publisher/ant/FeaturesAndBundlesPublisherTask.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src_ant/org/eclipse/equinox/internal/p2/publisher/ant/FeaturesAndBundlesPublisherTask.java
@@ -59,8 +59,8 @@ public class FeaturesAndBundlesPublisherTask extends AbstractPublishTask {
 				DirectoryScanner scanner = set.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++) {
-						results.add(new File(set.getDir(), elements[i][j]));
+					for (String element : elements[i]) {
+						results.add(new File(set.getDir(), element));
 					}
 				}
 			} else if (obj instanceof File) {