Some of the objects passed to the EListAdapter API aren't adapters

diverse-project · Nov 30, 2015 · 4fb3b19 · 4fb3b19
1 parent c45dc9b
commit 4fb3b19
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...verse.melange.adapters/src/main/java/fr/inria/diverse/melange/adapters/EListAdapter.xtend b/...verse.melange.adapters/src/main/java/fr/inria/diverse/melange/adapters/EListAdapter.xtend
@@ -129,7 +129,10 @@ class EListAdapter<E extends EObject, F extends EObject> implements GenericAdapt
 	}
 
 	def F decapsulate(Object e) {
-		return (e as GenericAdapter<F>).adaptee
+		if (e instanceof GenericAdapter<?>)
+			return (e as GenericAdapter<F>).adaptee
+		else
+			return e as F
 	}
 
 	override move(int newPosition, E object) {