This is an automated email from the ASF dual-hosted git repository. stbischof pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit afef558e16b6aa375fff12fc98bfa6f85a03f446 Author: Stefan Bischof <[email protected]> AuthorDate: Sat Apr 5 09:26:58 2025 +0200 [fw] Convert to enhanced 'for' loops Signed-off-by: Stefan Bischof <[email protected]> --- .../apache/felix/framework/BundleContextImpl.java | 5 ++- .../org/apache/felix/framework/BundleImpl.java | 14 ++++---- .../apache/felix/framework/ExtensionManager.java | 15 ++++---- .../java/org/apache/felix/framework/Felix.java | 40 +++++++++------------- .../felix/framework/ServiceRegistrationImpl.java | 11 +++--- .../apache/felix/framework/ServiceRegistry.java | 26 ++++++-------- .../apache/felix/framework/StatefulResolver.java | 12 +++---- .../org/apache/felix/framework/URLHandlers.java | 7 ++-- .../apache/felix/framework/cache/BundleCache.java | 5 ++- .../felix/framework/cache/DirectoryContent.java | 7 ++-- .../framework/capabilityset/CapabilitySet.java | 28 ++++++--------- .../framework/capabilityset/SimpleFilter.java | 5 ++- .../apache/felix/framework/util/SecureAction.java | 22 ++++++------ .../java/org/apache/felix/framework/util/Util.java | 10 +++--- .../util/manifestparser/ManifestParser.java | 23 +++++-------- .../util/manifestparser/NativeLibraryClause.java | 5 +-- 16 files changed, 96 insertions(+), 139 deletions(-) diff --git a/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java index 5386a3f514..dcfbdd5fe3 100644 --- a/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java +++ b/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java @@ -317,10 +317,9 @@ class BundleContextImpl implements BundleContext { if (clazzes != null) { - for (int i = 0;i < clazzes.length;i++) - { + for (String clazz : clazzes) { ((SecurityManager) sm).checkPermission( - new ServicePermission(clazzes[i], ServicePermission.REGISTER)); + new ServicePermission(clazz, ServicePermission.REGISTER)); } } } diff --git a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java index e0a503957a..a114700b1b 100644 --- a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java +++ b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java @@ -720,14 +720,13 @@ class BundleImpl implements Bundle, BundleRevisions List result = new ArrayList(); - for (int i = 0; i < refs.length; i++) - { + for (ServiceReference ref : refs) { try { ((SecurityManager) sm).checkPermission(new ServicePermission( - refs[i], ServicePermission.GET)); + ref, ServicePermission.GET)); - result.add(refs[i]); + result.add(ref); } catch (Exception ex) { @@ -764,14 +763,13 @@ class BundleImpl implements Bundle, BundleRevisions List result = new ArrayList(); - for (int i = 0; i < refs.length; i++) - { + for (ServiceReference ref : refs) { try { ((SecurityManager) sm).checkPermission( - new ServicePermission(refs[i], ServicePermission.GET)); + new ServicePermission(ref, ServicePermission.GET)); - result.add(refs[i]); + result.add(ref); } catch (Exception ex) { diff --git a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java index afd7dacc0f..c5de7ec516 100644 --- a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java +++ b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java @@ -679,23 +679,22 @@ class ExtensionManager implements Content void startPendingExtensionBundles(Felix felix) { - for (int i = 0;i < m_extensionTuples.size();i++) - { - if (!m_extensionTuples.get(i).m_started) + for (ExtensionTuple m_extensionTuple : m_extensionTuples) { + if (!m_extensionTuple.m_started) { - m_extensionTuples.get(i).m_started = true; + m_extensionTuple.m_started = true; try { - Felix.m_secureAction.startActivator(m_extensionTuples.get(i).m_activator, felix._getBundleContext()); + Felix.m_secureAction.startActivator(m_extensionTuple.m_activator, felix._getBundleContext()); } catch (Throwable ex) { - m_extensionTuples.get(i).m_failed = true; + m_extensionTuple.m_failed = true; - felix.fireFrameworkEvent(FrameworkEvent.ERROR, m_extensionTuples.get(i).m_bundle, + felix.fireFrameworkEvent(FrameworkEvent.ERROR, m_extensionTuple.m_bundle, new BundleException("Unable to start Bundle", BundleException.ACTIVATOR_ERROR, ex)); - m_logger.log(m_extensionTuples.get(i).m_bundle, Logger.LOG_WARNING, + m_logger.log(m_extensionTuple.m_bundle, Logger.LOG_WARNING, "Unable to start Extension Activator", ex); } } diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java index 9d60627650..10e15acda3 100644 --- a/framework/src/main/java/org/apache/felix/framework/Felix.java +++ b/framework/src/main/java/org/apache/felix/framework/Felix.java @@ -3782,22 +3782,21 @@ public class Felix extends BundleImpl implements Framework // service object is a service factory. if (!(svcObj instanceof ServiceFactory)) { - for (int i = 0; i < classNames.length; i++) - { - Class clazz = Util.loadClassUsingClass(svcObj.getClass(), classNames[i], m_secureAction); + for (String className : classNames) { + Class clazz = Util.loadClassUsingClass(svcObj.getClass(), className, m_secureAction); if (clazz == null) { - if (!Util.checkImplementsWithName(svcObj.getClass(), classNames[i])) + if (!Util.checkImplementsWithName(svcObj.getClass(), className)) { throw new IllegalArgumentException( - "Cannot cast service: " + classNames[i]); + "Cannot cast service: " + className); } } else if (!clazz.isAssignableFrom(svcObj.getClass())) { throw new IllegalArgumentException( "Service object is not an instance of \"" - + classNames[i] + "\"."); + + className + "\"."); } } } @@ -3955,12 +3954,11 @@ public class Felix extends BundleImpl implements Framework List result = new ArrayList(); - for (int i = 0; i < refs.length; i++) - { + for (ServiceReference ref : refs) { try { - ((SecurityManager) sm).checkPermission(new ServicePermission(refs[i], ServicePermission.GET)); - result.add(refs[i]); + ((SecurityManager) sm).checkPermission(new ServicePermission(ref, ServicePermission.GET)); + result.add(ref); } catch (Exception ex) { @@ -4243,10 +4241,9 @@ public class Felix extends BundleImpl implements Framework // Now get exported packages from installed bundles. Bundle[] bundles = getBundles(); - for (int bundleIdx = 0; bundleIdx < bundles.length; bundleIdx++) - { - BundleImpl bundle = (BundleImpl) bundles[bundleIdx]; - getExportedPackages(bundle, list); + for (Bundle bundle : bundles) { + BundleImpl bundleImpl = (BundleImpl) bundle; + getExportedPackages(bundleImpl, list); } } finally @@ -5172,9 +5169,8 @@ public class Felix extends BundleImpl implements Framework // Refresh all updated bundles. Bundle[] bundles = getBundles(); - for (int i = 0; i < bundles.length; i++) - { - BundleImpl bundle = (BundleImpl) bundles[i]; + for (Bundle bundle2 : bundles) { + BundleImpl bundle = (BundleImpl) bundle2; if (bundle.isRemovalPending()) { try @@ -5210,19 +5206,17 @@ public class Felix extends BundleImpl implements Framework // Dispose of the bundles to close their associated contents. bundles = getBundles(); - for (int i = 0; i < bundles.length; i++) - { - ((BundleImpl) bundles[i]).close(); + for (Bundle bundle : bundles) { + ((BundleImpl) bundle).close(); } m_extensionManager.stopExtensionBundles(Felix.this); // Stop all system bundle activators. - for (int i = 0; i < m_activatorList.size(); i++) - { + for (Object element : m_activatorList) { try { Felix.m_secureAction.stopActivator((BundleActivator) - m_activatorList.get(i), _getBundleContext()); + element, _getBundleContext()); } catch (Throwable throwable) { diff --git a/framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java b/framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java index 614797a91a..4ca8db7e48 100644 --- a/framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java +++ b/framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java @@ -356,25 +356,24 @@ class ServiceRegistrationImpl implements ServiceRegistration } if (svcObj != null) { - for (int i = 0; i < m_classes.length; i++) - { + for (String m_Class : m_classes) { Class clazz = Util.loadClassUsingClass( - svcObj.getClass(), m_classes[i], Felix.m_secureAction); + svcObj.getClass(), m_Class, Felix.m_secureAction); if ((clazz == null) || !clazz.isAssignableFrom(svcObj.getClass())) { if (clazz == null) { - if (!Util.checkImplementsWithName(svcObj.getClass(), m_classes[i])) + if (!Util.checkImplementsWithName(svcObj.getClass(), m_Class)) { throw new ServiceException( - "Service cannot be cast due to missing class: " + m_classes[i], + "Service cannot be cast due to missing class: " + m_Class, ServiceException.FACTORY_ERROR); } } else { throw new ServiceException( - "Service cannot be cast: " + m_classes[i], + "Service cannot be cast: " + m_Class, ServiceException.FACTORY_ERROR); } } diff --git a/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java b/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java index 34d49d5603..dab70b7b71 100644 --- a/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java +++ b/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java @@ -22,9 +22,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Dictionary; -import java.util.Iterator; import java.util.List; -import java.util.Map; +import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CountDownLatch; @@ -281,10 +280,9 @@ public class ServiceRegistry { final ServiceReference<?>[] refs = new ServiceReference[usages.length]; int count = 0; - for (int i = 0; i < usages.length; i++) - { - if (usages[i].m_count.get() > 0) { - refs[count++] = usages[i].m_ref; + for (UsageCount usage : usages) { + if (usage.m_count.get() > 0) { + refs[count++] = usage.m_ref; } } @@ -572,13 +570,12 @@ public class ServiceRegistry // Remove each service object from the // service cache. - for (int i = 0; i < usages.length; i++) - { - if (usages[i].m_svcHolderRef.get() == null) + for (UsageCount usage : usages) { + if (usage.m_svcHolderRef.get() == null) continue; // Keep ungetting until all usage count is zero. - while (ungetService(bundle, usages[i].m_ref, usages[i].m_prototype ? usages[i].getService() : null)) + while (ungetService(bundle, usage.m_ref, usage.m_prototype ? usage.getService() : null)) { // Empty loop body. } @@ -588,14 +585,11 @@ public class ServiceRegistry public Bundle[] getUsingBundles(ServiceReference<?> ref) { Bundle[] bundles = null; - for (Iterator<Map.Entry<Bundle, UsageCount[]>> iter = m_inUseMap.entrySet().iterator(); iter.hasNext(); ) - { - Map.Entry<Bundle, UsageCount[]> entry = iter.next(); + for (Entry<Bundle, UsageCount[]> entry : m_inUseMap.entrySet()) { Bundle bundle = entry.getKey(); UsageCount[] usages = entry.getValue(); - for (int useIdx = 0; useIdx < usages.length; useIdx++) - { - if (usages[useIdx].m_ref.equals(ref) && usages[useIdx].m_count.get() > 0) + for (UsageCount usage : usages) { + if (usage.m_ref.equals(ref) && usage.m_count.get() > 0) { // Add the bundle to the array to be returned. if (bundles == null) diff --git a/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java b/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java index cca854408f..d4fd25743c 100644 --- a/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java +++ b/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java @@ -1287,12 +1287,9 @@ class StatefulResolver { if (wireMap != null) { - Iterator<Entry<Resource, List<Wire>>> iter = - wireMap.entrySet().iterator(); + // Iterate over the map to fire necessary RESOLVED events. - while (iter.hasNext()) - { - Entry<Resource, List<Wire>> entry = iter.next(); + for (Entry<Resource, List<Wire>> entry : wireMap.entrySet()) { Resource resource = entry.getKey(); if (!(resource instanceof BundleRevision)) continue; @@ -1302,10 +1299,9 @@ class StatefulResolver // Fire RESOLVED events for all fragments. List<BundleRevision> fragments = Util.getFragments(revision.getWiring()); - for (int i = 0; i < fragments.size(); i++) - { + for (BundleRevision fragment : fragments) { m_felix.fireBundleEvent( - BundleEvent.RESOLVED, fragments.get(i).getBundle()); + BundleEvent.RESOLVED, fragment.getBundle()); } m_felix.fireBundleEvent(BundleEvent.RESOLVED, revision.getBundle()); } diff --git a/framework/src/main/java/org/apache/felix/framework/URLHandlers.java b/framework/src/main/java/org/apache/felix/framework/URLHandlers.java index 36b9948a48..75ddbc0cc0 100644 --- a/framework/src/main/java/org/apache/felix/framework/URLHandlers.java +++ b/framework/src/main/java/org/apache/felix/framework/URLHandlers.java @@ -763,9 +763,8 @@ class URLHandlers implements URLStreamHandlerFactory, ContentHandlerFactory // Find the first class that is loaded from a bundle. Class targetClass = null; ClassLoader targetClassLoader = null; - for (int i = 0; i < stack.length; i++) - { - ClassLoader classLoader = m_secureAction.getClassLoader(stack[i]); + for (Class element : stack) { + ClassLoader classLoader = m_secureAction.getClassLoader(element); if (classLoader != null) { String name = classLoader.getClass().getName(); @@ -773,7 +772,7 @@ class URLHandlers implements URLStreamHandlerFactory, ContentHandlerFactory || name.equals("org.apache.felix.framework.searchpolicy.ContentClassLoader") || name.startsWith("org.apache.felix.framework.BundleWiringImpl$BundleClassLoader")) { - targetClass = stack[i]; + targetClass = element; targetClassLoader = classLoader; break; } diff --git a/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java b/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java index 27e59da68e..4988b4b809 100644 --- a/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java +++ b/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java @@ -624,9 +624,8 @@ public class BundleCache File[] files = getSecureAction().listDirectory(target); if (files != null) { - for (int i = 0; i < files.length; i++) - { - deleteDirectoryTreeRecursive(files[i]); + for (File file : files) { + deleteDirectoryTreeRecursive(file); } } } diff --git a/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java b/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java index 95f898c6ee..73ad522b1c 100644 --- a/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java +++ b/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java @@ -450,11 +450,10 @@ public class DirectoryContent implements Content File[] combined = children; if (children != null) { - for (int i = 0; i < children.length; i++) - { - if (BundleCache.getSecureAction().isFileDirectory(children[i])) + for (File child : children) { + if (BundleCache.getSecureAction().isFileDirectory(child)) { - File[] grandchildren = listFilesRecursive(children[i]); + File[] grandchildren = listFilesRecursive(child); if (grandchildren != null && grandchildren.length > 0) { File[] tmp = new File[combined.length + grandchildren.length]; diff --git a/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java b/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java index 5a8de58560..92fc22c37b 100644 --- a/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java +++ b/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java @@ -216,9 +216,8 @@ public class CapabilitySet // Evaluate each subfilter against the remaining capabilities. // For OR we calculate the union of each subfilter. List<SimpleFilter> sfs = (List<SimpleFilter>) sf.getValue(); - for (int i = 0; i < sfs.size(); i++) - { - matches.addAll(match(caps, sfs.get(i))); + for (SimpleFilter sFilter : sfs) { + matches.addAll(match(caps, sFilter)); } } else if (sf.getOperation() == SimpleFilter.NOT) @@ -227,9 +226,8 @@ public class CapabilitySet // For OR we calculate the union of each subfilter. matches.addAll(caps); List<SimpleFilter> sfs = (List<SimpleFilter>) sf.getValue(); - for (int i = 0; i < sfs.size(); i++) - { - matches.removeAll(match(caps, sfs.get(i))); + for (SimpleFilter sFilter : sfs) { + matches.removeAll(match(caps, sFilter)); } } else @@ -249,9 +247,7 @@ public class CapabilitySet } else { - for (Iterator<Capability> it = caps.iterator(); it.hasNext(); ) - { - Capability cap = it.next(); + for (Capability cap : caps) { Object lhs = cap.getAttributes().get(sf.getName()); if (lhs != null) { @@ -308,9 +304,8 @@ public class CapabilitySet // Evaluate each subfilter against the remaining capabilities. // For OR we calculate the union of each subfilter. List<SimpleFilter> sfs = (List<SimpleFilter>) sf.getValue(); - for (int i = 0; i < sfs.size(); i++) - { - matched = !(matchesInternal(cap, sfs.get(i))); + for (SimpleFilter sFilter : sfs) { + matched = !(matchesInternal(cap, sFilter)); } } else @@ -363,11 +358,10 @@ public class CapabilitySet else if (sf.getOperation() == SimpleFilter.AND) { List list = (List) sf.getValue(); - for (int i = 0; i < list.size(); i++) - { - SimpleFilter sf2 = (SimpleFilter) list.get(i); - if ((sf2.getName() != null) - && sf2.getName().equals(attrName)) + for (Object element : list) { + SimpleFilter sFilter = (SimpleFilter) element; + if ((sFilter.getName() != null) + && sFilter.getName().equals(attrName)) { return true; } diff --git a/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java b/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java index b3d85a1811..be45dd0f45 100644 --- a/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java +++ b/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java @@ -124,9 +124,8 @@ public class SimpleFilter private static String toString(List list) { StringBuilder sb = new StringBuilder(); - for (int i = 0; i < list.size(); i++) - { - sb.append(list.get(i).toString()); + for (Object element : list) { + sb.append(element.toString()); } return sb.toString(); } diff --git a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java index 0142e80756..8c05ab81cf 100644 --- a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java +++ b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java @@ -1240,12 +1240,11 @@ public class SecureAction if ((condition == null) || !result.getClass().getName().equals(condition.getName())) { // reset cache - for (int i = 0; i < fields.length; i++) - { - if (Modifier.isStatic(fields[i].getModifiers()) && - (fields[i].getType() == Hashtable.class)) + for (Field field : fields) { + if (Modifier.isStatic(field.getModifiers()) && + (field.getType() == Hashtable.class)) { - Hashtable cache = (Hashtable) fields[i].get(null); + Hashtable cache = (Hashtable) field.get(null); if (cache != null) { cache.clear(); @@ -1287,14 +1286,13 @@ public class SecureAction Field[] fields = targetClazz.getDeclaredFields(); getAccessor(targetClazz).accept(fields); // reset cache - for (int i = 0; i < fields.length; i++) - { - if (Modifier.isStatic(fields[i].getModifiers()) && - ((fields[i].getType() == Hashtable.class) || (fields[i].getType() == HashMap.class))) + for (Field field : fields) { + if (Modifier.isStatic(field.getModifiers()) && + ((field.getType() == Hashtable.class) || (field.getType() == HashMap.class))) { - if (fields[i].getType() == Hashtable.class) + if (field.getType() == Hashtable.class) { - Hashtable cache = (Hashtable) fields[i].get(null); + Hashtable cache = (Hashtable) field.get(null); if (cache != null) { cache.clear(); @@ -1302,7 +1300,7 @@ public class SecureAction } else { - HashMap cache = (HashMap) fields[i].get(null); + HashMap cache = (HashMap) field.get(null); if (cache != null) { cache.clear(); diff --git a/framework/src/main/java/org/apache/felix/framework/util/Util.java b/framework/src/main/java/org/apache/felix/framework/util/Util.java index 637417ad36..43e314e60e 100644 --- a/framework/src/main/java/org/apache/felix/framework/util/Util.java +++ b/framework/src/main/java/org/apache/felix/framework/util/Util.java @@ -453,9 +453,8 @@ public class Util // one of the class's implemented interface // class loaders. Class[] ifcs = clazz.getInterfaces(); - for (int i = 0; i < ifcs.length; i++) - { - loadedClass = loadClassUsingClass(ifcs[i], name, action); + for (Class ifc : ifcs) { + loadedClass = loadClassUsingClass(ifc, name, action); if (loadedClass != null) { return loadedClass; @@ -482,9 +481,8 @@ public class Util // one of the class's implemented interface // is the name. Class[] ifcs = clazz.getInterfaces(); - for (int i = 0; i < ifcs.length; i++) - { - if (checkImplementsWithName(ifcs[i], name)) { + for (Class ifc : ifcs) { + if (checkImplementsWithName(ifc, name)) { return true; } } diff --git a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java index 87fdaf70a3..0af12a0a72 100644 --- a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java +++ b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java @@ -1235,9 +1235,8 @@ public class ManifestParser { int index = Integer.parseInt(indexList.get(i).toString()); String[] osversions = clauseList.get(index).getOSVersions(); - for (int k = 0; k < osversions.length; k++) - { - VersionRange range = new VersionRange(osversions[k]); + for (String osversion : osversions) { + VersionRange range = new VersionRange(osversion); if ((range.getLeft()).compareTo(osVersionRangeMaxFloor) >= 0) { selection.add("" + indexList.get(i)); @@ -1298,13 +1297,11 @@ public class ManifestParser // duplicate imports. Map<String, String> map = new HashMap<String, String>(); // Add existing imports. - for (int impIdx = 0; impIdx < imports.size(); impIdx++) - { - for (int pathIdx = 0; pathIdx < imports.get(impIdx).m_paths.size(); pathIdx++) - { + for (ParsedHeaderClause import1 : imports) { + for (String element : import1.m_paths) { map.put( - imports.get(impIdx).m_paths.get(pathIdx), - imports.get(impIdx).m_paths.get(pathIdx)); + element, + element); } } // Add import requirement for each export capability. @@ -1345,13 +1342,11 @@ public class ManifestParser // necessary since R3 bundles assumed a single class space, // but R4 allows for multiple class spaces. String usesValue = ""; - for (int i = 0; i < imports.size(); i++) - { - for (int pathIdx = 0; pathIdx < imports.get(i).m_paths.size(); pathIdx++) - { + for (ParsedHeaderClause import1 : imports) { + for (String element : import1.m_paths) { usesValue = usesValue + ((usesValue.length() > 0) ? "," : "") - + imports.get(i).m_paths.get(pathIdx); + + element; } } for (int i = 0; i < exports.size(); i++) diff --git a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java index fef8ed7036..6f345a9d63 100644 --- a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java +++ b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java @@ -25,7 +25,6 @@ import java.util.Collections; import java.util.Dictionary; import java.util.HashMap; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.StringTokenizer; @@ -353,9 +352,7 @@ public class NativeLibraryClause { // Get all framework properties Dictionary dict = new Hashtable(); - for (Iterator i = configMap.keySet().iterator(); i.hasNext(); ) - { - Object key = i.next(); + for (Object key : configMap.keySet()) { dict.put(key, configMap.get(key)); } // Compute expression
