[472057] Externalize translatable strings from org.eclipse.sirius.interpreter

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

7 files changed, 63 insertions, 8 deletions

diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 1f55ab01d6..33c1d918f1 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -289,6 +289,9 @@
 					<li>
 						<code>org.eclipse.sirius.eef.adapters</code>
 					</li>
+					<li>
+						<code>org.eclipse.sirius.interpreter</code>
+					</li>
 				</ul>
 			</li>
 		</ul>
@@ -1861,4 +1864,4 @@
 			</li>
 		</ul>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 49cbb05f3b..fd72972c27 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -68,6 +68,7 @@ Additional non-breaking changes:
 ** @org.eclipse.sirius.common.acceleo.mtl@
 ** @org.eclipse.sirius.common.acceleo.mtl.ide@
 ** @org.eclipse.sirius.eef.adapters@
+** @org.eclipse.sirius.interpreter@
 
 h4. Changes in @org.eclipse.sirius.common@
 
diff --git a/plugins/org.eclipse.sirius.interpreter/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.interpreter/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.interpreter/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.interpreter/.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.interpreter/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.interpreter/META-INF/MANIFEST.MF
index 759c840293..779bcd6a67 100644
--- a/plugins/org.eclipse.sirius.interpreter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.interpreter/META-INF/MANIFEST.MF
@@ -19,5 +19,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Import-Package: com.google.common.base;version="2.0.0",
- com.google.common.collect;version="2.0.0"
-Export-Package: org.eclipse.sirius.common.acceleo.interpreter;version="2.0.4"
+ com.google.common.collect;version="2.0.0",
+ org.eclipse.sirius.ext.base;version="2.1.0"
+Export-Package: org.eclipse.sirius.common.acceleo.interpreter;version="3.0.0"
diff --git a/plugins/org.eclipse.sirius.interpreter/plugin.properties b/plugins/org.eclipse.sirius.interpreter/plugin.properties
index ae0078784d..a114b83fa1 100644
--- a/plugins/org.eclipse.sirius.interpreter/plugin.properties
+++ b/plugins/org.eclipse.sirius.interpreter/plugin.properties
@@ -13,3 +13,7 @@ pluginName = Sirius Integration for Interpreter View
 providerName = Eclipse Modeling Project
 
 siriusInterpreter.label = Sirius
+
+SiriusEvaluationTask_status_noEvaluationTarget=No target for evaluation of {0}
+SiriusEvaluationTask_status_sizedResultMessage=Result of type {0} and size {1}
+SiriusEvaluationTask_status_resultMessage=Result of type {0}
diff --git a/plugins/org.eclipse.sirius.interpreter/src/org/eclipse/sirius/common/acceleo/interpreter/Messages.java b/plugins/org.eclipse.sirius.interpreter/src/org/eclipse/sirius/common/acceleo/interpreter/Messages.java
new file mode 100644
index 0000000000..b011101184
--- /dev/null
+++ b/plugins/org.eclipse.sirius.interpreter/src/org/eclipse/sirius/common/acceleo/interpreter/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.interpreter;
+
+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, InterpreterViewPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+    @TranslatableMessage
+    public static String SiriusEvaluationTask_status_noEvaluationTarget;
+
+    @TranslatableMessage
+    public static String SiriusEvaluationTask_status_sizedResultMessage;
+
+    @TranslatableMessage
+    public static String SiriusEvaluationTask_status_resultMessage;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.interpreter/src/org/eclipse/sirius/common/acceleo/interpreter/SiriusEvaluationTask.java b/plugins/org.eclipse.sirius.interpreter/src/org/eclipse/sirius/common/acceleo/interpreter/SiriusEvaluationTask.java
index 916c9622e9..87c8ba4cea 100644
--- a/plugins/org.eclipse.sirius.interpreter/src/org/eclipse/sirius/common/acceleo/interpreter/SiriusEvaluationTask.java
+++ b/plugins/org.eclipse.sirius.interpreter/src/org/eclipse/sirius/common/acceleo/interpreter/SiriusEvaluationTask.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.acceleo.interpreter;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -42,6 +43,7 @@ import org.eclipse.sirius.viewpoint.DSemanticDecorator;
  * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
  */
 public class SiriusEvaluationTask implements Callable<EvaluationResult> {
+
     /** Context of this evaluation as passed from the interpreter. */
     private EvaluationContext context;
 
@@ -66,7 +68,7 @@ public class SiriusEvaluationTask implements Callable<EvaluationResult> {
 
         final String expression = context.getExpression();
         if (context.getTargetEObjects().isEmpty()) {
-            IStatus errorStatus = new Status(IStatus.ERROR, InterpreterViewPlugin.PLUGIN_ID, "No target for evaluation of " + expression);
+            IStatus errorStatus = new Status(IStatus.ERROR, InterpreterViewPlugin.PLUGIN_ID, MessageFormat.format(Messages.SiriusEvaluationTask_status_noEvaluationTarget, expression));
             return new EvaluationResult(errorStatus);
         }
 
@@ -235,9 +237,11 @@ public class SiriusEvaluationTask implements Callable<EvaluationResult> {
             type = ePackage.getName() + "::" + eClass.getName(); //$NON-NLS-1$
         }
 
-        String message = "Result of type " + type;
-        if (size != null) {
-            message += " and size " + size;
+        String message;
+        if (size == null) {
+            message = MessageFormat.format(Messages.SiriusEvaluationTask_status_resultMessage, type);
+        } else {
+            message = MessageFormat.format(Messages.SiriusEvaluationTask_status_sizedResultMessage, type, size);
         }
         return message;
     }