refs/tags/I20140115-1300 - gerrit/platform/eclipse.platform.runtime

commit	a264facfd581f2b16f348d9247e94cb39c0b8e96	[log] [tgz]
author	Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>	Fri Dec 20 09:57:59 2013 +0100
committer	Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org>	Tue Jan 14 13:47:37 2014 -0500
tree	56a814e4392946cdb28f9c3020a0d01e72a77011
parent	e3a4a37de683c7917a8bf6cc60f6278892536d54 [diff]

Bug 423212: Allow to inject OSGi Bundle and BundleContext

- Rename @BundleContext to @OSGiBundle to prevent name clash between
parameter type and annotation.

- Support to inject org.osgi.framework.Bundle type, which is injectable
even if bundle's state is RESOLVED.

Bug-URL: https://bugs.eclipse.org/423212
Change-Id: I286010ab5f720d119b8c938409f131bfa87454d8
Signed-off-by: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>

bundles/org.eclipse.e4.core.di.extensions/META-INF/MANIFEST.MF[diff]
bundles/org.eclipse.e4.core.di.extensions/OSGI-INF/osgiBundle.xml[Renamed from bundles/org.eclipse.e4.core.di.extensions/OSGI-INF/bundleContext.xml - diff]
bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/OSGiBundle.java[Renamed from bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/BundleContext.java - diff]
bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/OSGiObjectSupplier.java[Renamed from bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/BundleContextObjectSupplier.java - diff]
tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionOSGiTest.java[Renamed from tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionBundleContextTest.java - diff]
tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/tests/CoreTestSuite.java[diff]

6 files changed

tree: 56a814e4392946cdb28f9c3020a0d01e72a77011