diff options
author | Thomas Watson | 2012-07-17 14:07:04 +0000 |
---|---|---|
committer | Thomas Watson | 2012-07-17 14:07:04 +0000 |
commit | f3cf0d9eaeea17d3ead3bb6c9958987316b3e82f (patch) | |
tree | 0c1a9720a06aa72dc0b08a385a6f8a66dd5eb1cd /bundles/org.eclipse.osgi/resolver | |
parent | fb81d5c501374a76f451a292f4c1fdc41fbae040 (diff) | |
download | rt.equinox.framework-f3cf0d9eaeea17d3ead3bb6c9958987316b3e82f.tar.gz rt.equinox.framework-f3cf0d9eaeea17d3ead3bb6c9958987316b3e82f.tar.xz rt.equinox.framework-f3cf0d9eaeea17d3ead3bb6c9958987316b3e82f.zip |
Remove org.eclipse.osgi.service.resolver.extras package
Diffstat (limited to 'bundles/org.eclipse.osgi/resolver')
2 files changed, 2 insertions, 12 deletions
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java index a24cf9b0b..60d3f2b30 100644 --- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java @@ -14,7 +14,6 @@ package org.eclipse.osgi.internal.resolver; import java.util.*; import java.util.Map.Entry; import org.eclipse.osgi.service.resolver.BaseDescription; -import org.eclipse.osgi.service.resolver.extras.DescriptionReference; import org.osgi.framework.Version; import org.osgi.framework.wiring.BundleCapability; import org.osgi.framework.wiring.BundleRevision; @@ -115,7 +114,7 @@ public abstract class BaseDescriptionImpl implements BaseDescription { this.userObject = userObject; } - class BaseCapability implements BundleCapability, DescriptionReference { + class BaseCapability implements BundleCapability { private final String namespace; public BaseCapability(String namespace) { @@ -171,9 +170,5 @@ public abstract class BaseDescriptionImpl implements BaseDescription { public BundleRevision getResource() { return getRevision(); } - - public BaseDescription getDescription() { - return BaseDescriptionImpl.this; - } } } diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java index 1cc7e5eeb..3f0e2f078 100644 --- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java @@ -17,7 +17,6 @@ import java.util.Map; import org.eclipse.osgi.framework.internal.core.Constants; import org.eclipse.osgi.internal.resolver.BaseDescriptionImpl.BaseCapability; import org.eclipse.osgi.service.resolver.*; -import org.eclipse.osgi.service.resolver.extras.SpecificationReference; import org.eclipse.osgi.util.ManifestElement; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; @@ -125,7 +124,7 @@ abstract class VersionConstraintImpl implements VersionConstraint { this.userObject = userObject; } - class BundleRequirementImpl implements BundleRequirement, SpecificationReference { + class BundleRequirementImpl implements BundleRequirement { private final String namespace; public BundleRequirementImpl(String namespace) { @@ -193,10 +192,6 @@ abstract class VersionConstraintImpl implements VersionConstraint { public BundleRevision getResource() { return getRevision(); } - - public VersionConstraint getSpecification() { - return VersionConstraintImpl.this; - } } static StringBuffer addFilterAttributes(StringBuffer filter, Map<String, ?> attributes) { |