Bug 527308 - Strike obsolete part of the documentation of uninject
Change-Id: I6a8a26061592d3b41c205555a0a3b3b139757810
Signed-off-by: drgler <daniel.kruegler@gmail.com>
diff --git a/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF
index 6796dce..ffac93d 100644
--- a/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.e4.core.contexts
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.6.100.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.core.contexts/pom.xml b/bundles/org.eclipse.e4.core.contexts/pom.xml
index 3895b88..9569328 100644
--- a/bundles/org.eclipse.e4.core.contexts/pom.xml
+++ b/bundles/org.eclipse.e4.core.contexts/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.e4</groupId>
<artifactId>org.eclipse.e4.core.contexts</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.6.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java
index fa3e713..7270e97 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Daniel Kruegler <daniel.kruegler@gmail.com> - Bug 527308
*******************************************************************************/
package org.eclipse.e4.core.contexts;
@@ -133,8 +134,7 @@
}
/**
- * Un-injects the context from the object. The un-injection requires that all injected
- * values were marked as optional, or the un-injection will fail.
+ * Un-injects the context from the object.
*
* @param object The domain object previously injected with the context
* @param context The context previously injected into the object
diff --git a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IInjector.java b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IInjector.java
index 7805f6b..5133b7d 100644
--- a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IInjector.java
+++ b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/di/IInjector.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Daniel Kruegler <daniel.kruegler@gmail.com> - Bug 527308
*******************************************************************************/
package org.eclipse.e4.core.di;
@@ -65,8 +66,7 @@
public void inject(Object object, PrimaryObjectSupplier objectSupplier) throws InjectionException;
/**
- * Un-injects the supplier from the object. All un-injected values have to be optional,
- * or un-injection will fail.
+ * Un-injects the supplier from the object.
* @param object the domain object previously injected with the supplier's data
* @param objectSupplier primary object supplier for the injection
* @throws InjectionException if an exception occurred while performing this operation
