Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBJ Hargrave2011-08-18 22:17:11 +0000
committerBJ Hargrave2011-08-26 20:55:58 +0000
commit333d47af764554c89d87271dcd789df6e5545c79 (patch)
tree89c07bf83667a974da019dc67a9bf48e35c282f1 /bundles/org.eclipse.osgi/resolver
parent68303d7f1db96374cbf7a62932e4885b85f7d89e (diff)
downloadrt.equinox.framework-333d47af764554c89d87271dcd789df6e5545c79.tar.gz
rt.equinox.framework-333d47af764554c89d87271dcd789df6e5545c79.tar.xz
rt.equinox.framework-333d47af764554c89d87271dcd789df6e5545c79.zip
OSGi refactored new resource types into new
org.osgi.framework.resource package. The framework is updated for this new package and the type refactoring.
Diffstat (limited to 'bundles/org.eclipse.osgi/resolver')
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java3
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java2
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java3
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java3
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java3
5 files changed, 12 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java
index 41c0faf96..abb88e838 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java
@@ -10,13 +10,14 @@
*******************************************************************************/
package org.eclipse.osgi.internal.module;
+import org.osgi.framework.resource.ResourceConstants;
+
import java.util.*;
import java.util.Map.Entry;
import org.eclipse.osgi.internal.resolver.ExportPackageDescriptionImpl;
import org.eclipse.osgi.internal.resolver.GenericDescriptionImpl;
import org.eclipse.osgi.service.resolver.*;
import org.osgi.framework.Constants;
-import org.osgi.framework.wiring.ResourceConstants;
/*
* A companion to BundleDescription from the state used while resolving.
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java
index ebd92db6e..f750efb63 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java
@@ -11,6 +11,8 @@
******************************************************************************/
package org.eclipse.osgi.internal.module;
+import org.osgi.framework.resource.ResourceConstants;
+
import java.security.AccessController;
import java.util.*;
import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor;
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java
index a83425a06..22c38d221 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java
@@ -12,6 +12,9 @@
*******************************************************************************/
package org.eclipse.osgi.internal.resolver;
+import org.osgi.framework.resource.Capability;
+import org.osgi.framework.resource.Requirement;
+
import java.io.IOException;
import java.net.URL;
import java.util.*;
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
index bca93d05a..114b86c65 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.osgi.internal.resolver;
+import org.osgi.framework.resource.ResourceConstants;
+
import java.lang.reflect.Constructor;
import java.util.*;
import org.eclipse.osgi.framework.internal.core.*;
@@ -19,7 +21,6 @@ import org.eclipse.osgi.service.resolver.*;
import org.eclipse.osgi.util.ManifestElement;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.*;
-import org.osgi.framework.wiring.ResourceConstants;
/**
* This class builds bundle description objects from manifests
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 716d86c79..a88af773a 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
@@ -12,6 +12,9 @@
*******************************************************************************/
package org.eclipse.osgi.internal.resolver;
+import org.osgi.framework.resource.Capability;
+import org.osgi.framework.resource.ResourceConstants;
+
import java.util.Collections;
import java.util.Map;
import org.eclipse.osgi.framework.internal.core.Constants;

Back to the top