Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2017-02-09 17:41:03 +0000
committerThomas Watson2017-02-09 17:41:03 +0000
commit71394a2cbca386ea5b4a2acc3d807be51336baca (patch)
tree7398d2e734fd35b011b0784787852bd5b22535af /bundles/org.eclipse.osgi/container
parent1bc36f585d4c1e6e329b0d584c9a649f0330416a (diff)
downloadrt.equinox.framework-71394a2cbca386ea5b4a2acc3d807be51336baca.tar.gz
rt.equinox.framework-71394a2cbca386ea5b4a2acc3d807be51336baca.tar.xz
rt.equinox.framework-71394a2cbca386ea5b4a2acc3d807be51336baca.zip
Change solution to avoid introducing new API on ModuleWiring. Change-Id: I1de1dd5ce55c05b04f9eaa699606ce70ba22ec89 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/container')
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java5
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java20
2 files changed, 7 insertions, 18 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
index fb3920413..6e1f16f5c 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
@@ -1518,6 +1518,11 @@ final class ModuleResolver {
throw new ResolutionTimeout();
}
}
+
+ @Override
+ public Collection<Wire> getSubstitutionWires(Wiring wiring) {
+ return ((ModuleWiring) wiring).getSubstitutionWires();
+ }
}
protected boolean threadResolving() {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java
index dd8a8dd62..ce85e5074 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java
@@ -14,7 +14,6 @@ import java.net.URL;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.felix.resolver.FelixWiring;
import org.eclipse.osgi.container.ModuleRevisionBuilder.GenericInfo;
import org.eclipse.osgi.internal.container.AtomicLazyInitializer;
import org.eclipse.osgi.internal.container.InternalUtils;
@@ -29,7 +28,7 @@ import org.osgi.resource.*;
* An implementation of {@link BundleWiring}.
* @since 3.10
*/
-public final class ModuleWiring implements BundleWiring, FelixWiring {
+public final class ModuleWiring implements BundleWiring {
class LoaderInitializer implements Callable<ModuleLoader> {
@Override
public ModuleLoader call() throws Exception {
@@ -460,22 +459,7 @@ public final class ModuleWiring implements BundleWiring, FelixWiring {
return revision.toString();
}
- /**
- * Returns the subset of {@link Wiring#getRequiredResourceWires(String) require wires}
- * that provide wires to {@link Capability capabilities} which substitute capabilities
- * of this wiring. For example, when a {@link PackageNamespace package} name is both
- * provided and required by the same resource. If the package requirement is resolved
- * to a capability hosted by a different wiring then the package capability is
- * considered to be substituted.
- *
- * @see #getSubstitutedNames()
- * @return A collection containing a snapshot of the substitution {@link Wire}s
- * for the {@link Requirement requirements} of this wiring, or an empty list
- * if this wiring has no substitution wires.
- * @since 3.12
- */
- @Override
- public Collection<Wire> getSubstitutionWires() {
+ Collection<Wire> getSubstitutionWires() {
if (substitutedPkgNames.isEmpty()) {
return Collections.emptyList();
}

Back to the top