[FELIX-4942] Small improvements in mergeUses()
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1690720 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java b/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
index 55ba7ed..ce55acb 100644
--- a/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
+++ b/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
@@ -791,8 +791,8 @@
if (!req.getNamespace().equals(BundleNamespace.BUNDLE_NAMESPACE)
&& !req.getNamespace().equals(PackageNamespace.PACKAGE_NAMESPACE))
{
- List<Requirement> blameReqs = new ArrayList<Requirement>();
- blameReqs.add(req);
+ List<Requirement> blameReqs =
+ Collections.singletonList(req);
mergeUses(
session,
@@ -806,15 +806,15 @@
}
}
// Merge uses constraints from imported packages.
- for (Entry<String, List<Blame>> entry : resourcePkgs.m_importedPkgs.fast())
+ for (List<Blame> blames : resourcePkgs.m_importedPkgs.values())
{
- for (Blame blame : entry.getValue())
+ for (Blame blame : blames)
{
// Ignore resources that import from themselves.
if (!blame.m_cap.getResource().equals(resource))
{
- List<Requirement> blameReqs = new ArrayList<Requirement>();
- blameReqs.add(blame.m_reqs.get(0));
+ List<Requirement> blameReqs =
+ Collections.singletonList(blame.m_reqs.get(0));
mergeUses(
session,
@@ -829,12 +829,12 @@
}
}
// Merge uses constraints from required bundles.
- for (Entry<String, List<Blame>> entry : resourcePkgs.m_requiredPkgs.fast())
+ for (List<Blame> blames : resourcePkgs.m_requiredPkgs.values())
{
- for (Blame blame : entry.getValue())
+ for (Blame blame : blames)
{
- List<Requirement> blameReqs = new ArrayList<Requirement>();
- blameReqs.add(blame.m_reqs.get(0));
+ List<Requirement> blameReqs =
+ Collections.singletonList(blame.m_reqs.get(0));
mergeUses(
session,