[475580] Use an EClassifierType for EObject instead of a raw Java type

Bug: 475580
Change-Id: I38cc1b3a47941451e7ea9a4c2b2e822786a4b94b
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>

1 files changed, 3 insertions, 4 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/TypesUtil.java b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/TypesUtil.java
index db0e1eef31..8be34a221d 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/TypesUtil.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/TypesUtil.java
@@ -17,11 +17,10 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.eclipse.acceleo.query.runtime.IQueryEnvironment;
-import org.eclipse.acceleo.query.validation.type.ClassType;
 import org.eclipse.acceleo.query.validation.type.EClassifierType;
 import org.eclipse.acceleo.query.validation.type.IType;
 import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterContext;
 import org.eclipse.sirius.common.tools.api.interpreter.TypeName;
 import org.eclipse.sirius.common.tools.api.interpreter.VariableType;
@@ -60,7 +59,7 @@ public final class TypesUtil {
         }
 
         if (selfTyping.size() == 0) {
-            selfTyping.add(new ClassType(queryEnvironment, EObject.class));
+            selfTyping.add(new EClassifierType(queryEnvironment, EcorePackage.eINSTANCE.getEObject()));
         }
         variableTypes.put("self", selfTyping); //$NON-NLS-1$
 
@@ -74,7 +73,7 @@ public final class TypesUtil {
                 }
             }
             if (potentialTypes.size() == 0) {
-                potentialTypes.add(new ClassType(queryEnvironment, EObject.class));
+                potentialTypes.add(new EClassifierType(queryEnvironment, EcorePackage.eINSTANCE.getEObject()));
             }
             variableTypes.put(varDef.getKey(), potentialTypes);
         }