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

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

7 files changed, 50 insertions, 15 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/.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.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/META-INF/MANIFEST.MF
index 9123001a73..309c96e357 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Export-Package: org.eclipse.sirius.common.acceleo.aql.ide;version="3.1.0",
  org.eclipse.sirius.common.acceleo.aql.ide.proposal;version="3.0.0";x-internal:=true
 Import-Package: org.eclipse.acceleo.query.runtime;version="[3.6.0,4.0.0)",
  org.eclipse.acceleo.query.validation.type;version="[3.6.0,4.0.0)",
- org.eclipse.sirius.ecore.extender.business.api.accessor;version="[3.0.0,4.0.0)"
+ org.eclipse.sirius.ecore.extender.business.api.accessor;version="[3.0.0,4.0.0)",
+ org.eclipse.sirius.ext.base;version="2.1.0"
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.sirius.common.acceleo.aql.ide.AqlIdeSupportPlugin$Implementation
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/plugin.properties
index 600c2b54e5..36e1f13e0a 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Sirius IDE Support for AQL Expressions
 providerName = Eclipse Modeling Project
+
+AQL_newExpression = New acceleo query language expression.
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/Messages.java b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/Messages.java
new file mode 100644
index 0000000000..4586f3dc8b
--- /dev/null
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/Messages.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * 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.ide;
+
+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, AqlIdeSupportPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+    @TranslatableMessage
+    public static String AQL_newExpression;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/proposal/AQLProposalProvider.java b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/proposal/AQLProposalProvider.java
index 5ccb924dbe..cbacfcb350 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/proposal/AQLProposalProvider.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/proposal/AQLProposalProvider.java
@@ -32,6 +32,7 @@ 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;
 import org.eclipse.sirius.common.acceleo.aql.business.internal.AQLSiriusInterpreter;
+import org.eclipse.sirius.common.acceleo.aql.ide.Messages;
 import org.eclipse.sirius.common.tools.api.contentassist.ContentContext;
 import org.eclipse.sirius.common.tools.api.contentassist.ContentInstanceContext;
 import org.eclipse.sirius.common.tools.api.contentassist.ContentProposal;
@@ -52,18 +53,12 @@ import com.google.common.collect.Sets;
  */
 public class AQLProposalProvider implements IProposalProvider {
 
-    /**
-     * {@inheritDoc}
-     * 
-     */
+    @Override
     public ContentProposal getNewEmtpyExpression() {
-        return new ContentProposal(AQLConstants.AQL_PREFIX, AQLConstants.AQL_PREFIX, "New acceleo query language expression.", AQLConstants.AQL_PREFIX.length());
+        return new ContentProposal(AQLConstants.AQL_PREFIX, AQLConstants.AQL_PREFIX, Messages.AQL_newExpression, AQLConstants.AQL_PREFIX.length());
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     */
+    @Override
     public List<ContentProposal> getProposals(IInterpreter interpreter, ContentContext context) {
         if (interpreter instanceof AQLSiriusInterpreter) {
             /*
@@ -116,10 +111,7 @@ public class AQLProposalProvider implements IProposalProvider {
         return proposals;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     */
+    @Override
     public List<ContentProposal> getProposals(IInterpreter interpreter, ContentInstanceContext context) {
         if (interpreter instanceof AQLSiriusInterpreter) {
             IQueryEnvironment queryEnvironment = ((AQLSiriusInterpreter) interpreter).getQueryEnvironment();
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index ca7f3412d9..ca4a67d6be 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -239,6 +239,9 @@
 					<li>
 						<code>org.eclipse.sirius.common.acceleo.aql</code>
 					</li>
+					<li>
+						<code>org.eclipse.sirius.common.acceleo.aql.ide</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 32aa77ced4..30c866382c 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -53,6 +53,7 @@ Additional non-breaking changes:
 ** @org.eclipse.sirius.ecore.extender@
 ** @org.eclipse.sirius.synchronizer@
 ** @org.eclipse.sirius.common.acceleo.aql@
+** @org.eclipse.sirius.common.acceleo.aql.ide@
 
 h4. Changes in @org.eclipse.sirius.ext.gef@