Merge pull request #258 from /issues/257

With command edit API, use SetCommand on a containment feature (#257)

Author: Vincent HEMERY

bundles/org.eclipse.emfcloud.modelserver.edit/src/org/eclipse/emfcloud/modelserver/edit/command/SetCommandContribution.java

@@ -16,6 +16,7 @@
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -51,6 +52,8 @@ public static SetCommand serverCommand(final EditingDomain domain, final CComman
          EDataType dataType = ((EAttribute) feature).getEAttributeType();
          value = command.getDataValues().isEmpty() ? null
             : EcoreUtil.createFromString(dataType, command.getDataValues().get(0));
+      } else if(feature instanceof EReference && ((EReference)feature).isContainment()) {
+         value = getFirst(command.getObjectsToAdd(), null);
       } else {
          value = getFirst(command.getObjectValues(), null);
       }

tests/org.eclipse.emfcloud.modelserver.edit.tests/src/org/eclipse/emfcloud/modelserver/edit/EMFCommandCodecTest.java

@@ -24,6 +24,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EGenericType;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.emf.ecore.EcorePackage;
@@ -62,6 +63,7 @@ public class EMFCommandCodecTest {
    private static final String N_A = "n/a";
    private static final String ATTRIBUTE = "attribute";
    private static final String REFERENCE = "reference";
+   private static final String MONO_CONTAINMENT = "monovalued containment reference";
    private static final String REFERENCE_MANY = "reference (many)";
    private static final String REFERENCE_BY_INDEX = "reference (by index)";
 
@@ -107,6 +109,7 @@ public static Iterable<Object[]> parameters() {
          new Object[] { EMFCommandType.SET, ATTRIBUTE, createAttributeSetCommand(),
             createAttributeSetModel() }, //
          new Object[] { EMFCommandType.SET, REFERENCE, createReferenceSetCommand(), createReferenceSetModel() }, //
+         new Object[] { EMFCommandType.SET, MONO_CONTAINMENT, createMonoContainmentSetCommand(), createMonoContainmentSetModel() }, //
          new Object[] { EMFCommandType.ADD, ATTRIBUTE, createAttributeAddCommand(), createAttributeAddModel() }, //
          new Object[] { EMFCommandType.ADD, REFERENCE, createReferenceAddCommand(), createReferenceAddModel() }, //
          new Object[] { EMFCommandType.ADD, REFERENCE_MANY, createReferenceAddMultipleCommand(),
@@ -175,6 +178,25 @@ static CCommand createReferenceSetModel() {
       return result;
    }
 
+   static Command createMonoContainmentSetCommand() {
+      EGenericType newGenericType = EcoreFactory.eINSTANCE.createEGenericType();
+
+      return SetCommand.create(domain, ((EClass)ePackage.getEClassifiers().get(0)).getEStructuralFeatures().get(0), EcorePackage.Literals.ETYPED_ELEMENT__EGENERIC_TYPE, newGenericType);
+   }
+
+   static CCommand createMonoContainmentSetModel() {
+      EGenericType newGenericType = EcoreFactory.eINSTANCE.createEGenericType();
+
+      CCommand result = CCommandFactory.eINSTANCE.createCommand();
+      result.setType(EMFCommandType.SET);
+      result.setOwner(((EClass)ePackage.getEClassifiers().get(0)).getEStructuralFeatures().get(0));
+      result.setFeature("eGenericType");
+      result.getObjectValues().add(newGenericType);
+      result.getObjectsToAdd().add(newGenericType);
+      result.getIndices().add(NO_INDEX);
+      return result;
+   }
+
    static Command createAttributeAddCommand() {
       return AddCommand.create(domain, commandFixture, CCommandPackage.Literals.COMMAND__DATA_VALUES, "Foo", 0);
    }