Bug 463613: Annotations in org.eclipse.e4.core.di.extensions should be moved to an extra bundle
diff --git a/bundles/org.eclipse.e4.core.di.extensions/.settings/.api_filters b/bundles/org.eclipse.e4.core.di.extensions/.settings/.api_filters
index 582e459..6ef02fc 100644
--- a/bundles/org.eclipse.e4.core.di.extensions/.settings/.api_filters
+++ b/bundles/org.eclipse.e4.core.di.extensions/.settings/.api_filters
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.e4.core.di.extensions" version="2">
<resource path="META-INF/MANIFEST.MF">
- <filter comment="Splitted annotations and supplier and added @Service" id="926941240">
+ <filter comment="Bug 463613: Splitted annotations and supplier and added @Service" id="926941240">
<message_arguments>
<message_argument value="0.15.0"/>
<message_argument value="0.14.0"/>
diff --git a/bundles/org.eclipse.e4.core.di.extensions/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.di.extensions/META-INF/MANIFEST.MF
index 601d9f0..2223aae 100644
--- a/bundles/org.eclipse.e4.core.di.extensions/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.di.extensions/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@
Bundle-Version: 0.15.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.inject;version="1.0.0"
+Import-Package: javax.inject;version="1.0.0",
+ org.osgi.framework;version="1.8.0"
Export-Package: org.eclipse.e4.core.di.extensions;version="0.15.0";x-friends:="org.eclipse.e4.core.di.extensions.supplier"
Bundle-Localization: fragment
diff --git a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/OSGiBundle.java b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/OSGiBundle.java
index 9fe97ad..92e05c8 100644
--- a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/OSGiBundle.java
+++ b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/OSGiBundle.java
@@ -18,35 +18,34 @@
/**
* A method or field of type {@link org.osgi.framework.BundleContext} and
- * annotated with {@link OSGiBundle} will be injected with the from the bundle
- * containing the class if the annotated type is a
- * {@link org.osgi.framework.BundleContext} and the bundle's state is
+ * annotated with {@link OSGiBundle} will be injected with the BundleContext
+ * from the bundle containing the class if the bundle's state is
* {@link org.osgi.framework.Bundle#ACTIVE}.
* <p>
- * If the method or field type is of {@link Bundle}, the bundle containing the
- * class will be injected even for bundles in the
+ * If the method or field type is of {@link org.osgi.framework.Bundle}, the
+ * bundle containing the class will be injected even for bundles in the
* {@link org.osgi.framework.Bundle#RESOLVED} state.
* </p>
* <p>
* The {@link org.osgi.framework.Bundle} injected will be the
* {@link org.osgi.framework.Bundle} that supplied the class of the object
* instance. For example, in:
- *
+ *
* <pre>
* class A {
* @Inject
* @OSGiBundle
* BundleContext context;
* }
- *
+ *
* class B extends A {
* }
* </pre>
- *
+ *
* <code>ContextInjectionFactory.make(B.class)</code> will inject the
* {@link org.osgi.framework.BundleContext} for the bundle that supplies class
* B, not class A.
- *
+ *
* </p>
*/
@Qualifier
