Add support for .eContents (#7)

epsilonlabs · Oct 9, 2022 · d4a53f2 · d4a53f2
1 parent 9101397
commit d4a53f2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/...agicdraw.remote/src/org/eclipse/epsilon/emc/magicdraw/remote/MagicDrawPropertyGetter.java b/...agicdraw.remote/src/org/eclipse/epsilon/emc/magicdraw/remote/MagicDrawPropertyGetter.java
@@ -10,7 +10,11 @@
  *******************************************************************************/
 package org.eclipse.epsilon.emc.magicdraw.remote;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.epsilon.emc.magicdraw.modelapi.GetFeatureValueRequest;
+import org.eclipse.epsilon.emc.magicdraw.modelapi.ModelElement;
 import org.eclipse.epsilon.emc.magicdraw.modelapi.Value;
 import org.eclipse.epsilon.emc.magicdraw.modelapi.Value.ValueCase;
 import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
@@ -64,10 +68,18 @@ protected Object decodeValue(Value response) {
 		case SHORTVALUES:
 		case BYTEVALUES:
 		case STRINGVALUES:
-		case REFERENCEVALUES:
 		case ENUMERATIONVALUES:
 			throw new IllegalArgumentException("Server should only send proxy lists for many-valued features");
 
+		case REFERENCEVALUES: {
+			// NOTE: should be used solely for .eContents and read-only lists - modifiable many-valued features should use proxy lists
+			List<MDModelElement> elems = new ArrayList<>(response.getReferenceValues().getValuesCount());
+			for (ModelElement e : response.getReferenceValues().getValuesList()) {
+				elems.add(new MDModelElement(model, e));
+			}
+			return elems;
+		}
+
 		case PROXYLIST: return new MDProxyList(model, response.getProxyList());
 
 		case NOTDEFINED:

diff --git a/...ugin.remote/src/org/eclipse/epsilon/emc/magicdraw/mdplugin/remote/ModelAccessService.java b/...ugin.remote/src/org/eclipse/epsilon/emc/magicdraw/mdplugin/remote/ModelAccessService.java
@@ -174,6 +174,14 @@ public void getFeatureValue(GetFeatureValueRequest request, StreamObserver<Value
 							}
 							break;
 						}
+						case "eContents": {
+							ModelElementCollection.Builder coll = ModelElementCollection.newBuilder();
+							for (EObject child : mdObject.eContents()) {
+								coll.addValues(encoder.encode(child));
+							}
+							vBuilder.setReferenceValues(coll);
+							break;
+						}
 						default:
 							vBuilder.setNotDefined(true);
 							break;

diff --git a/...emc.magicdraw.remote.tests/src/org/eclipse/epsilon/emc/magicdraw/remote/ZooModelTest.java b/...emc.magicdraw.remote.tests/src/org/eclipse/epsilon/emc/magicdraw/remote/ZooModelTest.java
@@ -533,6 +533,14 @@ public void cannotSetNameOfFeature() throws Exception {
 		assertThrows(EolInternalException.class, () -> module.execute());
 	}
 
+	@Test
+	public void eContents() throws Exception {
+		EolModule module = createEOLModule();
+
+		module.parse("return Class.all.selectOne(c|c.name = 'Animal').eContents.size;");
+		assertEquals("The size of the contents of the Animal class should be 5", 5, module.execute());
+	}
+
 	private void assumeTypeExists(String typeName) {
 		try {
 			m.getAllOfKind(typeName);