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

Bug: 472057
Change-Id: I10eeb768904453db35fbf96d438595c46e70bb5e
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

7 files changed, 56 insertions, 8 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.common.acceleo.aql/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/.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.aql/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.aql/META-INF/MANIFEST.MF
index b33d0369dc..7242100df9 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.sirius.common;bundle-version="2.0.0",
  com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.ecore.extender;bundle-version="2.0.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.sirius.ext.base;bundle-version="3.0.0"
+ org.eclipse.sirius.ext.base;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.sirius.common.acceleo.aql.business;version="3.0.0",
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.aql/plugin.properties
index ffc532596e..2d7ba512c0 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/plugin.properties
@@ -11,3 +11,6 @@
 
 pluginName = Sirius Support for AQL Expressions
 providerName = Eclipse Modeling Project
+
+AQLInterpreter_errorLoadingJavaClass = Error loading Java extension class {0}: {1}
+AQLInterpreter_javaClassNotFound = Could not find Java extension class {0}
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/Messages.java b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/Messages.java
new file mode 100644
index 0000000000..26d998400f
--- /dev/null
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/Messages.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * 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.aql.business;
+
+import org.eclipse.sirius.ext.base.I18N;
+import org.eclipse.sirius.ext.base.I18N.TranslatableMessage;
+
+/**
+ * Helper class to obtains translated strings.
+ * 
+ * @author pcdavid
+ */
+public final class Messages {
+
+    static {
+        I18N.initializeMessages(Messages.class, AQLSiriusPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+    @TranslatableMessage
+    public static String AQLInterpreter_errorLoadingJavaClass;
+
+    @TranslatableMessage
+    public static String AQLInterpreter_javaClassNotFound;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
index a084fc8e8d..d9ba11cd99 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.acceleo.aql.business.internal;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -45,6 +46,7 @@ import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
 import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
 import org.eclipse.sirius.common.acceleo.aql.business.AQLSiriusPlugin;
+import org.eclipse.sirius.common.acceleo.aql.business.Messages;
 import org.eclipse.sirius.common.acceleo.aql.business.api.AQLConstants;
 import org.eclipse.sirius.common.acceleo.aql.business.api.ExpressionTrimmer;
 import org.eclipse.sirius.common.acceleo.aql.business.api.TypesUtil;
@@ -88,7 +90,7 @@ public class AQLSiriusInterpreter extends AcceleoAbstractInterpreter {
                 return siriusXref.getInverseReferences(self);
 
             } else {
-                return Collections.EMPTY_SET;
+                return Collections.emptySet();
             }
         }
     };
@@ -100,15 +102,15 @@ public class AQLSiriusInterpreter extends AcceleoAbstractInterpreter {
             try {
                 queryEnvironment.registerServicePackage(clazz);
             } catch (InvalidAcceleoPackageException e) {
-                AQLSiriusPlugin.INSTANCE.log(new Status(IStatus.WARNING, AQLSiriusPlugin.INSTANCE.getSymbolicName(), "Error loading Java extension class " + qualifiedName + " :" + e.getMessage(), e));
+                AQLSiriusPlugin.INSTANCE.log(new Status(IStatus.WARNING, AQLSiriusPlugin.INSTANCE.getSymbolicName(), MessageFormat.format(Messages.AQLInterpreter_errorLoadingJavaClass, qualifiedName,
+                        e.getMessage()), e));
             }
 
         }
 
         @Override
         public void notFound(String qualifiedName) {
-            AQLSiriusPlugin.INSTANCE.log(new Status(IStatus.WARNING, AQLSiriusPlugin.INSTANCE.getSymbolicName(), "Could not find Java extension class " + qualifiedName));
-
+            AQLSiriusPlugin.INSTANCE.log(new Status(IStatus.WARNING, AQLSiriusPlugin.INSTANCE.getSymbolicName(), MessageFormat.format(Messages.AQLInterpreter_javaClassNotFound, qualifiedName)));
         }
 
         @Override
@@ -223,7 +225,7 @@ public class AQLSiriusInterpreter extends AcceleoAbstractInterpreter {
     @Override
     public ValidationResult analyzeExpression(IInterpreterContext context, String fullExpression) {
         this.javaExtensions.reloadIfNeeded();
-        
+
         String trimmedExpression = new ExpressionTrimmer(fullExpression).getExpression();
         ValidationResult result = new ValidationResult();
 
@@ -294,7 +296,7 @@ public class AQLSiriusInterpreter extends AcceleoAbstractInterpreter {
          * and imports.
          */
         this.javaExtensions.reloadIfNeeded();
-        
+
         return this.queryEnvironment;
     }
 }
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index bf38750ba3..ca7f3412d9 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -236,6 +236,9 @@
 					<li>
 						<code>org.eclipse.sirius.synchronizer</code>
 					</li>
+					<li>
+						<code>org.eclipse.sirius.common.acceleo.aql</code>
+					</li>
 				</ul>
 			</li>
 		</ul>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 6ba4814776..32aa77ced4 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -52,6 +52,7 @@ Additional non-breaking changes:
 ** @org.eclipse.sirius.ext.base@
 ** @org.eclipse.sirius.ecore.extender@
 ** @org.eclipse.sirius.synchronizer@
+** @org.eclipse.sirius.common.acceleo.aql@
 
 h4. Changes in @org.eclipse.sirius.ext.gef@