You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2015/07/13 17:16:42 UTC
svn commit: r1690701 - in
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver:
ResolverImpl.java Util.java
Author: gnodet
Date: Mon Jul 13 15:16:41 2015
New Revision: 1690701
URL: http://svn.apache.org/r1690701
Log:
[FELIX-4942] Introduce a Util.isReExport() method
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java?rev=1690701&r1=1690700&r2=1690701&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java Mon Jul 13 15:16:41 2015
@@ -925,11 +925,7 @@ public class ResolverImpl implements Res
if (w.getRequirement().getNamespace()
.equals(BundleNamespace.BUNDLE_NAMESPACE))
{
- String value = w.getRequirement()
- .getDirectives()
- .get(BundleNamespace.REQUIREMENT_VISIBILITY_DIRECTIVE);
- if ((value != null)
- && value.equals(BundleNamespace.VISIBILITY_REEXPORT))
+ if (Util.isReexport(w.getRequirement()))
{
mergeCandidatePackages(
rc,
@@ -949,11 +945,7 @@ public class ResolverImpl implements Res
{
if (req.getNamespace().equals(BundleNamespace.BUNDLE_NAMESPACE))
{
- String value =
- req.getDirectives()
- .get(BundleNamespace.REQUIREMENT_VISIBILITY_DIRECTIVE);
- if ((value != null)
- && value.equals(BundleNamespace.VISIBILITY_REEXPORT))
+ if (Util.isReexport(req))
{
Capability cap = allCandidates.getFirstCandidate(req);
if (cap != null) {
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java?rev=1690701&r1=1690700&r2=1690701&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java Mon Jul 13 15:16:41 2015
@@ -21,6 +21,7 @@ package org.apache.felix.resolver;
import java.util.ArrayList;
import java.util.List;
import org.osgi.framework.Version;
+import org.osgi.framework.namespace.BundleNamespace;
import org.osgi.framework.namespace.IdentityNamespace;
import org.osgi.framework.namespace.PackageNamespace;
import org.osgi.resource.Capability;
@@ -90,6 +91,12 @@ public class Util
.get(Namespace.REQUIREMENT_RESOLUTION_DIRECTIVE));
}
+ public static boolean isReexport(Requirement req)
+ {
+ return BundleNamespace.VISIBILITY_REEXPORT.equals(req.getDirectives()
+ .get(BundleNamespace.REQUIREMENT_VISIBILITY_DIRECTIVE));
+ }
+
public static List<Requirement> getDynamicRequirements(List<Requirement> reqs)
{
List<Requirement> result = new ArrayList<Requirement>();