[472057] Externalize translatable strings from org.eclipse.sirius.common.acceleo.mtl

Bug: 472057
Change-Id: I832ba702fbd053137c886793a55063f933f82456
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>

9 files changed, 101 insertions, 21 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.common.acceleo.mtl/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/.settings/org.eclipse.jdt.core.prefs
@@ -32,7 +32,7 @@ org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.mtl/META-INF/MANIFEST.MF
index 38ab322963..659fb6cb7a 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/META-INF/MANIFEST.MF
@@ -14,12 +14,13 @@ Require-Bundle: org.eclipse.sirius.common;bundle-version="2.0.0",
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.sirius.common.acceleo.mtl;version="2.0.4",
+Export-Package: org.eclipse.sirius.common.acceleo.mtl;version="3.0.0",
  org.eclipse.sirius.common.acceleo.mtl.business.api;version="2.0.4",
  org.eclipse.sirius.common.acceleo.mtl.business.api.extension;version="2.0.4",
  org.eclipse.sirius.common.acceleo.mtl.business.internal.extension;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.common.acceleo.mtl.business.internal.interpreter;x-internal:=true;version="2.1.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.common.collect;version="2.0.0",
+ org.eclipse.sirius.ext.base;version="2.1.0",
  org.eclipse.sirius.ext.base.cache;version="2.0.0"
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties
index f98c9df2a1..7a9dc05ec3 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties
@@ -13,4 +13,8 @@ pluginName = Sirius Support for Acceleo 3 Expressions
 providerName = Eclipse Modeling Project
 
 extension-point.importHandler.name = Import Handler
-javaImportHandler.label = Java services from classpath
\ No newline at end of file
+javaImportHandler.label = Java services from classpath
+
+AcceleoMTLInterpreter_acceleoModelPluginNotFound=Coudln't retrieve location of plugin 'org.eclipse.acceleo.model'.
+AcceleoMTLInterpreter_domainClassNotFound=Cannot find Domain Class for {0} - Expression cannot be validated.
+DynamicAcceleoModule_compilationError=Compilation error for expression {0} : {1}
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/Messages.java b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/Messages.java
new file mode 100644
index 0000000000..152c8d24a6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/Messages.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.common.acceleo.mtl;
+
+import org.eclipse.sirius.ext.base.I18N;
+import org.eclipse.sirius.ext.base.I18N.TranslatableMessage;
+
+/**
+ * Helper class to obtains translated strings.
+ * 
+ * @author mporhel
+ */
+public final class Messages {
+
+    static {
+        I18N.initializeMessages(Messages.class, AcceleoMTLInterpreterPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+    @TranslatableMessage
+    public static String AcceleoMTLInterpreter_domainClassNotFound;
+    
+    @TranslatableMessage
+    public static String AcceleoMTLInterpreter_acceleoModelPluginNotFound;
+    
+    @TranslatableMessage
+    public static String DynamicAcceleoModule_compilationError;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/api/extension/JavaImportHandler.java b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/api/extension/JavaImportHandler.java
index 42106eb066..b493398c97 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/api/extension/JavaImportHandler.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/api/extension/JavaImportHandler.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.acceleo.mtl.business.api.extension;
 
-import com.google.common.collect.Lists;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.List;
@@ -23,6 +21,8 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.util.URI;
 import org.osgi.framework.Bundle;
 
+import com.google.common.collect.Lists;
+
 /**
  * This import handler will try and import a dependency as a Java class
  * accessible from the classpath.
@@ -30,6 +30,7 @@ import org.osgi.framework.Bundle;
  * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
  */
 public class JavaImportHandler extends AbstractImportHandler {
+    
     /**
      * This will be used to "remember" the last bundle in which we found the
      * import sought by a call to {@link #canImport(Set, Set, String)} so that
@@ -84,9 +85,9 @@ public class JavaImportHandler extends AbstractImportHandler {
         // - add arrays to signature
         if (type.isArray()) {
             Class enclosingContainer = type.getComponentType();
-            String arrays = "[]";
+            String arrays = "[]"; //$NON-NLS-1$
             while (enclosingContainer.isArray()) {
-                arrays += "[]";
+                arrays += "[]"; //$NON-NLS-1$
                 enclosingContainer = enclosingContainer.getComponentType();
             }
             typeName = getTypeName(enclosingContainer) + arrays;
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/AcceleoMTLInterpreter.java b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/AcceleoMTLInterpreter.java
index b4c3d73836..b5ecec77ab 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/AcceleoMTLInterpreter.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/AcceleoMTLInterpreter.java
@@ -13,6 +13,7 @@ package org.eclipse.sirius.common.acceleo.mtl.business.internal.interpreter;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.CodeSource;
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -61,6 +62,7 @@ import org.eclipse.ocl.ecore.EcoreEnvironmentFactory;
 import org.eclipse.ocl.expressions.ExpressionsPackage;
 import org.eclipse.ocl.util.Bag;
 import org.eclipse.sirius.common.acceleo.mtl.AcceleoMTLInterpreterPlugin;
+import org.eclipse.sirius.common.acceleo.mtl.Messages;
 import org.eclipse.sirius.common.acceleo.mtl.business.api.ResourceFinder;
 import org.eclipse.sirius.common.acceleo.mtl.business.api.extension.AbstractImportHandler;
 import org.eclipse.sirius.common.acceleo.mtl.business.internal.extension.ImportHandlerRegistry;
@@ -410,6 +412,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#activateMetamodels(java.util.Collection)
      */
+    @Override
     public void activateMetamodels(Collection<MetamodelDescriptor> metamodels) {
         Set<EPackage> additionalEPackages = Sets.newLinkedHashSet();
         for (MetamodelDescriptor descriptor : metamodels) {
@@ -432,6 +435,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      *            the form <em>my.package.MyClass</em>.
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#addImport(java.lang.String)
      */
+    @Override
     public void addImport(String dependency) {
         if (dependency != null && dependency.length() > 0) {
             boolean added = addExtendedImport(dependency);
@@ -449,6 +453,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#addVariableStatusListener(org.eclipse.sirius.common.tools.api.interpreter.IVariableStatusListener)
      */
+    @Override
     public void addVariableStatusListener(IVariableStatusListener newListener) {
         variableStatusListeners.add(newListener);
     }
@@ -458,6 +463,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#clearImports()
      */
+    @Override
     public void clearImports() {
         mtlDependencies.clear();
         extendedDependencies.clear();
@@ -470,6 +476,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#clearVariables()
      */
+    @Override
     public void clearVariables() {
         variables.clear();
         variableNsURIs.clear();
@@ -559,6 +566,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#dispose()
      */
+    @Override
     public void dispose() {
         mtlDependencies.clear();
         extendedDependencies.clear();
@@ -582,6 +590,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#evaluate(org.eclipse.emf.ecore.EObject,
      *      java.lang.String)
      */
+    @Override
     public Object evaluate(EObject target, String expression) throws EvaluationException {
         EvaluationResult evaluationResult = internalEvaluate(target, expression);
         // Ignore potential problems for now
@@ -594,6 +603,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#evaluateBoolean(org.eclipse.emf.ecore.EObject,
      *      java.lang.String)
      */
+    @Override
     public boolean evaluateBoolean(EObject context, String expression) throws EvaluationException {
         EvaluationResult evaluationResult = internalEvaluate(context, expression);
         // Ignore potential problems for now
@@ -618,6 +628,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#evaluateCollection(org.eclipse.emf.ecore.EObject,
      *      java.lang.String)
      */
+    @Override
     public Collection<EObject> evaluateCollection(EObject context, String expression) throws EvaluationException {
         EvaluationResult evaluationResult = internalEvaluate(context, expression);
         Object result = evaluationResult.getEvaluationResult();
@@ -643,6 +654,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#evaluateEObject(org.eclipse.emf.ecore.EObject,
      *      java.lang.String)
      */
+    @Override
     public EObject evaluateEObject(EObject context, String expression) throws EvaluationException {
         EvaluationResult evaluationResult = internalEvaluate(context, expression);
         // Ignore potential problems for now
@@ -659,6 +671,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#evaluateInteger(org.eclipse.emf.ecore.EObject,
      *      java.lang.String)
      */
+    @Override
     public Integer evaluateInteger(EObject context, String expression) throws EvaluationException {
         EvaluationResult evaluationResult = internalEvaluate(context, expression);
         // Ignore potential problems for now
@@ -675,6 +688,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#evaluateString(org.eclipse.emf.ecore.EObject,
      *      java.lang.String)
      */
+    @Override
     public String evaluateString(EObject context, String expression) throws EvaluationException {
         EvaluationResult evaluationResult = internalEvaluate(context, expression);
         // Ignore potential problems for now
@@ -691,6 +705,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#getImports()
      */
+    @Override
     public Collection<String> getImports() {
         Set<String> extendedImports = Sets.newLinkedHashSet();
         for (ModuleDescriptor moduleDescriptor : extendedDependencies) {
@@ -715,6 +730,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#getPrefix()
      */
+    @Override
     public String getPrefix() {
         return ACCELEO_EXPRESSION_PREFIX;
     }
@@ -724,6 +740,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#getVariable(java.lang.String)
      */
+    @Override
     public Object getVariable(String name) {
         if (variables.containsKey(name)) {
             final List<Object> values = variables.get(name);
@@ -739,6 +756,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#getVariablePrefix()
      */
+    @Override
     public String getVariablePrefix() {
         return null;
     }
@@ -748,6 +766,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#getVariables()
      */
+    @Override
     public Map<String, ?> getVariables() {
         return variables.asMap();
     }
@@ -757,6 +776,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#provides(java.lang.String)
      */
+    @Override
     public boolean provides(String expression) {
         if (expression != null) {
             return expression.startsWith(ACCELEO_EXPRESSION_PREFIX) && expression.endsWith(ACCELEO_EXPRESSION_SUFFIX);
@@ -769,6 +789,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#removeImport(java.lang.String)
      */
+    @Override
     public void removeImport(String dependency) {
         boolean removed = false;
         if (mtlDependencies.containsKey(dependency)) {
@@ -789,6 +810,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#removeVariableStatusListener(org.eclipse.sirius.common.tools.api.interpreter.IVariableStatusListener)
      */
+    @Override
     public void removeVariableStatusListener(IVariableStatusListener listener) {
         variableStatusListeners.remove(listener);
     }
@@ -798,6 +820,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#setCrossReferencer(org.eclipse.emf.ecore.util.ECrossReferenceAdapter)
      */
+    @Override
     public void setCrossReferencer(ECrossReferenceAdapter crossReferencer) {
         if (adapterFactory == null) {
             adapterFactory = new CrossReferencerProviderAdapterFactory(crossReferencer);
@@ -810,6 +833,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#setModelAccessor(org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor)
      */
+    @Override
     public void setModelAccessor(ModelAccessor modelAccessor) {
         // Nothing to do
     }
@@ -820,6 +844,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#setProperty(java.lang.Object,
      *      java.lang.Object)
      */
+    @Override
     public void setProperty(Object key, Object value) {
         /*
          * This is called by the framework with the FILES key in order to pass
@@ -849,6 +874,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#setVariable(java.lang.String,
      *      java.lang.Object)
      */
+    @Override
     public void setVariable(String name, Object value) {
         variables.put(name, value);
         variableNsURIs.clear();
@@ -860,6 +886,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#supportsValidation()
      */
+    @Override
     public boolean supportsValidation() {
         return true;
     }
@@ -869,6 +896,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * 
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#unSetVariable(java.lang.String)
      */
+    @Override
     public void unSetVariable(String name) {
         if (variables.containsKey(name)) {
             final List<Object> values = variables.get(name);
@@ -889,6 +917,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
      * @see org.eclipse.sirius.common.tools.api.interpreter.IInterpreter#validateExpression(org.eclipse.sirius.common.tools.api.interpreter.IInterpreterContext,
      *      java.lang.String)
      */
+    @Override
     public Collection<IInterpreterStatus> validateExpression(IInterpreterContext context, String expression) {
         return analyzeExpression(context, expression).getStatuses();
     }
@@ -1170,7 +1199,7 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
                 new EcoreResourceFactoryImpl());
         registry.getContentTypeToFactoryMap().put(IAcceleoConstants.BINARY_CONTENT_TYPE, new EMtlBinaryResourceFactoryImpl());
         registry.getContentTypeToFactoryMap().put(IAcceleoConstants.XMI_CONTENT_TYPE, new EMtlResourceFactoryImpl());
-        registry.getExtensionToFactoryMap().put("emtl", new EMtlResourceFactoryImpl());
+        registry.getExtensionToFactoryMap().put(IAcceleoConstants.EMTL_FILE_EXTENSION, new EMtlResourceFactoryImpl());
     }
 
     private static EPackage getOCLStdLibPackage() {
@@ -1185,14 +1214,14 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
         CodeSource acceleoModel = MtlPackage.class.getProtectionDomain().getCodeSource();
         if (acceleoModel != null) {
             String libraryLocation = acceleoModel.getLocation().toString();
-            if (libraryLocation.endsWith(".jar")) {
-                libraryLocation = "jar:" + libraryLocation + '!';
+            if (libraryLocation.endsWith(".jar")) { //$NON-NLS-1$
+                libraryLocation = "jar:" + libraryLocation + '!'; //$NON-NLS-1$
             }
 
-            URIConverter.URI_MAP.put(URI.createURI("http://www.eclipse.org/acceleo/mtl/3.0/mtlstdlib.ecore"), URI.createURI(libraryLocation + "/model/mtlstdlib.ecore"));
-            URIConverter.URI_MAP.put(URI.createURI("http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore"), URI.createURI(libraryLocation + "/model/mtlnonstdlib.ecore"));
+            URIConverter.URI_MAP.put(URI.createURI("http://www.eclipse.org/acceleo/mtl/3.0/mtlstdlib.ecore"), URI.createURI(libraryLocation + "/model/mtlstdlib.ecore")); //$NON-NLS-1$//$NON-NLS-2$
+            URIConverter.URI_MAP.put(URI.createURI("http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore"), URI.createURI(libraryLocation + "/model/mtlnonstdlib.ecore")); //$NON-NLS-1$ //$NON-NLS-2$
         } else {
-            throw new RuntimeException("Coudln't retrieve location of plugin 'org.eclipse.acceleo.model'.");
+            throw new RuntimeException(Messages.AcceleoMTLInterpreter_acceleoModelPluginNotFound);
         }
     }
 
@@ -1228,8 +1257,8 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
 
             VariableType candidateType = context.getTargetType();
             if (!candidateType.hasDefinition()) {
-                result.addStatus(InterpreterStatusFactory.createInterpreterStatus(context.getTargetType(), context.getField(), IInterpreterStatus.WARNING, "Cannot find Domain Class for " //$NON-NLS-1$
-                        + context.getField().getName() + " - Expression cannot be validated.")); //$NON-NLS-1$
+                String message = MessageFormat.format(Messages.AcceleoMTLInterpreter_domainClassNotFound, context.getField().getName());
+                result.addStatus(InterpreterStatusFactory.createInterpreterStatus(context.getTargetType(), context.getField(), IInterpreterStatus.WARNING, message));
             } else {
                 for (TypeName candidateTargetType : candidateType.getPossibleTypes()) {
                     final String expressionType = candidateTargetType.getCompleteName(IAcceleoConstants.NAMESPACE_SEPARATOR);
@@ -1241,5 +1270,4 @@ public class AcceleoMTLInterpreter implements IInterpreter, TypedValidation {
         }
         return result;
     }
-
 }
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/DynamicAcceleoModule.java b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/DynamicAcceleoModule.java
index be49089e4f..04c4f75632 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/DynamicAcceleoModule.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/DynamicAcceleoModule.java
@@ -56,6 +56,7 @@ import org.eclipse.ocl.expressions.CollectionKind;
 import org.eclipse.ocl.types.OCLStandardLibrary;
 import org.eclipse.ocl.util.Bag;
 import org.eclipse.sirius.common.acceleo.mtl.AcceleoMTLInterpreterPlugin;
+import org.eclipse.sirius.common.acceleo.mtl.Messages;
 import org.eclipse.sirius.ext.base.cache.LRUCache;
 
 import com.google.common.base.Objects;
@@ -798,7 +799,6 @@ public class DynamicAcceleoModule {
      *            The expression which triggered a compilation error.
      */
     private static void log(CompilationResult result, String expression) {
-        final String format = "Compilation error for expression {0} : {1}";
         final String errorMessage;
         final Throwable cause;
         if (result.getStatus() instanceof MultiStatus && ((MultiStatus) result.getStatus()).getChildren().length > 0) {
@@ -811,7 +811,7 @@ public class DynamicAcceleoModule {
             cause = result.getStatus().getException();
         }
 
-        final String formattedMessage = MessageFormat.format(format, expression, errorMessage);
+        final String formattedMessage = MessageFormat.format(Messages.DynamicAcceleoModule_compilationError, expression, errorMessage);
         final IStatus logStatus = new Status(result.getStatus().getSeverity(), result.getStatus().getPlugin(), formattedMessage, cause);
         AcceleoMTLInterpreterPlugin.getDefault().getLog().log(logStatus);
     }
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 7cc90d6222..920a2a177a 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -241,10 +241,13 @@
 						<code>org.eclipse.sirius.common.acceleo.aql</code>
 					</li>
 					<li>
-						<code>org.eclipse.sirius.common.acceleo.mtl.ide</code>
+						<code>org.eclipse.sirius.common.acceleo.aql.ide</code>
 					</li>
 					<li>
-						<code>org.eclipse.sirius.common.acceleo.aql.ide</code>
+						<code>org.eclipse.sirius.common.acceleo.mtl</code>
+					</li>
+					<li>
+						<code>org.eclipse.sirius.common.acceleo.mtl.ide</code>
 					</li>
 					<li>
 						<code>org.eclipse.sirius.eef.adapters</code>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 94df740d65..494797e7c2 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -54,8 +54,9 @@ Additional non-breaking changes:
 ** @org.eclipse.sirius.ecore.extender@
 ** @org.eclipse.sirius.synchronizer@
 ** @org.eclipse.sirius.common.acceleo.aql@
-** @org.eclipse.sirius.common.acceleo.mtl.ide@
 ** @org.eclipse.sirius.common.acceleo.aql.ide@
+** @org.eclipse.sirius.common.acceleo.mtl@
+** @org.eclipse.sirius.common.acceleo.mtl.ide@
 ** @org.eclipse.sirius.eef.adapters@
 
 h4. Changes in @org.eclipse.sirius.ext.gef@