[411775] The replaceCommand should support an Object value parameter

3 files changed, 17 insertions, 2 deletions

diff --git a/features/org.eclipse.emf.edit-feature/feature.xml b/features/org.eclipse.emf.edit-feature/feature.xml
index f7cbaf5d4..14ff1fb7e 100644
--- a/features/org.eclipse.emf.edit-feature/feature.xml
+++ b/features/org.eclipse.emf.edit-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.edit"
       label="%featureName"
-      version="2.9.0.qualifier"
+      version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.7.0.qualifier">
diff --git a/plugins/org.eclipse.emf.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edit/META-INF/MANIFEST.MF
index f33e784cf..5cc71c88f 100644
--- a/plugins/org.eclipse.emf.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.edit; singleton:=true
-Bundle-Version: 2.9.0.qualifier
+Bundle-Version: 2.10.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.edit.EMFEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/provider/ItemProviderAdapter.java b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/provider/ItemProviderAdapter.java
index 93797b66a..88fac9228 100644
--- a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/provider/ItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/provider/ItemProviderAdapter.java
@@ -1165,7 +1165,22 @@ public class ItemProviderAdapter
 
   /**
    * This creates a primitive {@link org.eclipse.emf.edit.command.ReplaceCommand}.
+   * @since 2.10
    */
+  protected Command createReplaceCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value, Collection<?> collection) 
+  {
+    if (value instanceof EObject)
+    {
+      return createReplaceCommand(domain, owner, feature, (EObject)value, collection);
+    }
+    return new ReplaceCommand(domain, owner, feature, value, collection);
+  }
+
+  /**
+   * This creates a primitive {@link org.eclipse.emf.edit.command.ReplaceCommand}.
+   * @deprecated As of EMF 2.10, replaced by {@link #createReplaceCommand(EditingDomain, EObject, EStructuralFeature, Object, Collection)}.
+   */
+  @Deprecated
   protected Command createReplaceCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, EObject value, Collection<?> collection) 
   {
     if (feature instanceof EReference)