Use jdk 5 for-each-loop (security)

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

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

9 files changed, 38 insertions, 44 deletions

diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ConfigurationFactory.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ConfigurationFactory.java
index c57fcf5c5..b9cb6da56 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ConfigurationFactory.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ConfigurationFactory.java
@@ -44,10 +44,10 @@ public class ConfigurationFactory {
 		IExtension[] extensions = point.getExtensions();
 
 		ArrayList<Configuration> returnValue = new ArrayList<>(extensions.length);
-		for (int i = 0; i < extensions.length; i++) {
-			IConfigurationElement[] elements = extensions[i].getConfigurationElements();
-			for (int j = 0; j < elements.length; j++) {
-				Configuration provider = readProvider(elements[j]);
+		for (IExtension extension : extensions) {
+			IConfigurationElement[] elements = extension.getConfigurationElements();
+			for (IConfigurationElement element : elements) {
+				Configuration provider = readProvider(element);
 				if (provider != null)
 					returnValue.add(provider);
 			}
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ConfigurationFederator.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ConfigurationFederator.java
index 1b649d8e6..e26937780 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ConfigurationFederator.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ConfigurationFederator.java
@@ -50,13 +50,13 @@ public class ConfigurationFederator extends Configuration {
 			System.arraycopy(configs, 0, allConfigs, 0, configs.length);
 			allConfigs[configs.length] = defaultConfiguration;
 		}
-		for (int i = 0; i < allConfigs.length; i++) {
+		for (Configuration c : allConfigs) {
 			boolean found = false;
-			AppConfigurationEntry[] config = allConfigs[i].getAppConfigurationEntry(name);
+			AppConfigurationEntry[] config = c.getAppConfigurationEntry(name);
 			if (config == null)
 				continue;
 			String cachedProviderName = configToProviderMap.get(name);
-			if (cachedProviderName != null && !cachedProviderName.equals(allConfigs[i].getClass().getName())) {
+			if (cachedProviderName != null && !cachedProviderName.equals(c.getClass().getName())) {
 				String message = NLS.bind(SecAuthMessages.duplicateJaasConfig1, name, cachedProviderName);
 				AuthPlugin.getDefault().logError(message, null);
 			} else {
@@ -65,7 +65,7 @@ public class ConfigurationFederator extends Configuration {
 					AuthPlugin.getDefault().logError(message, null);
 				} else if ((config != null) && (config.length != 0)) {
 					returnValue = config;
-					configToProviderMap.put(name, allConfigs[i].getClass().getName());
+					configToProviderMap.put(name, c.getClass().getName());
 					configCache.put(name, returnValue);
 					found = true;
 				}
@@ -81,8 +81,9 @@ public class ConfigurationFederator extends Configuration {
 
 	@Override
 	public synchronized void refresh() {
-		for (int i = 0; i < federatedConfigs.length; i++)
-			federatedConfigs[i].refresh();
+		for (Configuration federatedConfig : federatedConfigs) {
+			federatedConfig.refresh();
+		}
 		if (defaultConfiguration != null)
 			defaultConfiguration.refresh();
 
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ext/loader/ExtCallbackHandlerLoader.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ext/loader/ExtCallbackHandlerLoader.java
index 445cb42d7..530582088 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ext/loader/ExtCallbackHandlerLoader.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ext/loader/ExtCallbackHandlerLoader.java
@@ -38,8 +38,8 @@ public class ExtCallbackHandlerLoader {
 		IExtensionPoint point = registry.getExtensionPoint(POINT_MAPPING);
 		IExtension[] extenders = point.getExtensions();
 		String extensionId = null;
-		for (int i = 0; i < extenders.length; i++) {
-			IConfigurationElement[] confEelements = extenders[i].getConfigurationElements();
+		for (IExtension extender : extenders) {
+			IConfigurationElement[] confEelements = extender.getConfigurationElements();
 			if (confEelements.length != 1)
 				continue; // TBD error message?
 			extensionId = loadMappingEntry(confEelements[0], configName);
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ext/loader/ExtLoginModuleLoader.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ext/loader/ExtLoginModuleLoader.java
index 92cef92e1..2e5a4948d 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ext/loader/ExtLoginModuleLoader.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/ext/loader/ExtLoginModuleLoader.java
@@ -40,12 +40,12 @@ public class ExtLoginModuleLoader {
 		String targetPoint = (String) options.get(ExtensionLoginModule.OPTION_MODULE_POINT);
 
 		LoginModule loginModule = null;
-		for (int i = 0; i < extensions.length; i++) {
-			String sourcePoint = extensions[i].getUniqueIdentifier();
+		for (IExtension extension : extensions) {
+			String sourcePoint = extension.getUniqueIdentifier();
 			if (sourcePoint == null) // technically, IDs on extensions are optional
 				continue;
 			if (sourcePoint.equals(targetPoint)) {
-				IConfigurationElement[] elements = extensions[i].getConfigurationElements();
+				IConfigurationElement[] elements = extension.getConfigurationElements();
 				int elementCount = elements.length;
 				if (elementCount == 1)
 					loginModule = readEntry(elements[0]);
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/JavaEncryption.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/JavaEncryption.java
index 052d59326..2f34cfdc3 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/JavaEncryption.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/JavaEncryption.java
@@ -246,9 +246,8 @@ public class JavaEncryption {
 		Provider[] providers = Security.getProviders();
 		Set<String> algorithms = new HashSet<>();
 		int prefixLength = prefix.length();
-		for (int i = 0; i < providers.length; i++) {
-			for (Iterator<Entry<Object, Object>> j = providers[i].entrySet().iterator(); j.hasNext();) {
-				Entry<Object, Object> entry = j.next();
+		for (Provider provider : providers) {
+			for (Entry<Object, Object> entry : provider.entrySet()) {
 				Object key = entry.getKey();
 				if (key == null)
 					continue;
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordManagement.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordManagement.java
index bfed37322..dbe42fb91 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordManagement.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordManagement.java
@@ -153,8 +153,8 @@ public class PasswordManagement {
 	static private String mashPassword(String[] answers) {
 		// form a string composing answers
 		StringBuffer tmp = new StringBuffer();
-		for (int i = 0; i < answers.length; i++) {
-			tmp.append(answers[i].trim());
+		for (String answer : answers) {
+			tmp.append(answer.trim());
 		}
 		// mix it up
 		StringBuffer mix = new StringBuffer();
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java
index 0b6e9f97c..329e1b1f7 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java
@@ -94,14 +94,14 @@ public class PasswordProviderSelector implements IRegistryEventListener {
 
 		ArrayList<ExtStorageModule> allAvailableModules = new ArrayList<>(extensions.length);
 
-		for (int i = 0; i < extensions.length; i++) {
-			String moduleID = extensions[i].getUniqueIdentifier();
+		for (IExtension extension : extensions) {
+			String moduleID = extension.getUniqueIdentifier();
 			if (moduleID == null) // IDs on those extensions are mandatory; if not specified, ignore the extension
 				continue;
 			moduleID = moduleID.toLowerCase();
 			if (expectedID != null && !expectedID.equals(moduleID))
 				continue;
-			IConfigurationElement[] elements = extensions[i].getConfigurationElements();
+			IConfigurationElement[] elements = extension.getConfigurationElements();
 			if (elements.length == 0)
 				continue;
 			IConfigurationElement element = elements[0]; // only one module is allowed per extension
@@ -118,21 +118,18 @@ public class PasswordProviderSelector implements IRegistryEventListener {
 				if (priority > 10)
 					priority = 10;
 			}
-			String name = extensions[i].getLabel();
-
+			String name = extension.getLabel();
 			String description = element.getAttribute(MODULE_DESCRIPTION);
-
 			List<String> suppliedHints = null;
 			IConfigurationElement[] hints = element.getChildren(HINTS_NAME);
 			if (hints.length != 0) {
 				suppliedHints = new ArrayList<>(hints.length);
-				for (int j = 0; j < hints.length; j++) {
-					String hint = hints[j].getAttribute(HINT_VALUE);
+				for (IConfigurationElement h : hints) {
+					String hint = h.getAttribute(HINT_VALUE);
 					if (hint != null)
 						suppliedHints.add(hint);
 				}
 			}
-
 			Object clazz;
 			try {
 				clazz = element.createExecutableExtension(CLASS_NAME);
@@ -143,7 +140,6 @@ public class PasswordProviderSelector implements IRegistryEventListener {
 			} catch (CoreException e) {
 				continue;
 			}
-
 			allAvailableModules.add(new ExtStorageModule(moduleID, element, priority, name, description, suppliedHints));
 		}
 
@@ -260,8 +256,8 @@ public class PasswordProviderSelector implements IRegistryEventListener {
 			return null;
 		HashSet<String> disabledModules = new HashSet<>();
 		String[] disabledProviders = tmp.split(","); //$NON-NLS-1$
-		for (int i = 0; i < disabledProviders.length; i++) {
-			disabledModules.add(disabledProviders[i]);
+		for (String disabledProvider : disabledProviders) {
+			disabledModules.add(disabledProvider);
 		}
 		return disabledModules;
 	}
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesRoot.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesRoot.java
index 3477e6dc4..a0ab7a76c 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesRoot.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesRoot.java
@@ -143,8 +143,7 @@ public class SecurePreferencesRoot extends SecurePreferences implements IStorage
 			properties.remove(KEY_FACTORY_KEY);
 		}
 
-		for (Iterator<Entry<Object, Object>> it = properties.entrySet().iterator(); it.hasNext();) {
-			Entry<Object, Object> entry = it.next();
+		for (Entry<Object, Object> entry : properties.entrySet()) {
 			Object externalKey = entry.getKey();
 			Object value = entry.getValue();
 			if (!(externalKey instanceof String))
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/friends/ReEncrypter.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/friends/ReEncrypter.java
index 8648060b2..6fe0bc819 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/friends/ReEncrypter.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/friends/ReEncrypter.java
@@ -72,22 +72,22 @@ public class ReEncrypter {
 		String[] keys = node.keys();
 		if (keys.length > 0) {
 			Map<String, String> map = new HashMap<>(keys.length); // could be less than that
-			for (int i = 0; i < keys.length; i++) {
+			for (String key : keys) {
 				try {
-					if (!node.isEncrypted(keys[i]))
+					if (!node.isEncrypted(key)) {
 						continue;
+					}
 					if (!(node instanceof SecurePreferencesWrapper))
 						continue;
-					String encryptionModule = ((SecurePreferencesWrapper) node).getModule(keys[i]);
+					String encryptionModule = ((SecurePreferencesWrapper) node).getModule(key);
 					if (encryptionModule == null)
 						continue;
 					if (!encryptionModule.equals(moduleID))
 						continue;
-
-					map.put(keys[i], node.get(keys[i], null));
+					map.put(key, node.get(key, null));
 				} catch (StorageException e) {
 					// this value will not be re-coded
-					String msg = NLS.bind(SecAuthMessages.decryptingError, keys[i], node.absolutePath());
+					String msg = NLS.bind(SecAuthMessages.decryptingError, key, node.absolutePath());
 					AuthPlugin.getDefault().logError(msg, e);
 					processedOK = false;
 				}
@@ -96,8 +96,8 @@ public class ReEncrypter {
 				elements.add(new TmpElement(node.absolutePath(), map));
 		}
 		String[] childrenNames = node.childrenNames();
-		for (int i = 0; i < childrenNames.length; i++) {
-			decrypt(node.node(childrenNames[i]));
+		for (String childrenName : childrenNames) {
+			decrypt(node.node(childrenName));
 		}
 	}
 
@@ -127,8 +127,7 @@ public class ReEncrypter {
 		for (TmpElement element : elements) {
 			ISecurePreferences node = root.node(element.getPath());
 			Map<String, String> values = element.getValues();
-			for (Iterator<Entry<String, String>> it = values.entrySet().iterator(); it.hasNext();) {
-				Entry<String, String> entry = it.next();
+			for (Entry<String, String> entry : values.entrySet()) {
 				String key = entry.getKey();
 				try {
 					node.put(key, entry.getValue(), true);