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

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

8 files changed, 61 insertions, 15 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.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.mtl.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/META-INF/MANIFEST.MF
index 96de4cc02b..44f1ed6a31 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/META-INF/MANIFEST.MF
@@ -20,5 +20,6 @@ Require-Bundle: org.eclipse.sirius.common.acceleo.mtl;bundle-version="2.0.0",
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.sirius.common.acceleo.mtl.ide;x-internal:=true;version="2.0.4"
+Export-Package: org.eclipse.sirius.common.acceleo.mtl.ide;x-internal:=true;version="3.0.0"
 Bundle-Localization: plugin
+Import-Package: org.eclipse.sirius.ext.base;version="2.1.0"
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
index d31f92f31e..72fe3c9d42 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
@@ -13,4 +13,6 @@ pluginName = Sirius IDE Support for Acceleo 3 Expressions
 providerName = Eclipse Modeling Project
 
 command.toggleAcceleoNature.name = Convert to Acceleo project
-wksJavaImportHandler.label = Java services from workspace
\ No newline at end of file
+wksJavaImportHandler.label = Java services from workspace
+
+AcceleoProposalProvider_MTL_newExpression="New Acceleo 3 expression."
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/AcceleoProposalProvider.java b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/AcceleoProposalProvider.java
index 23e1f25da7..5aaa828c54 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/AcceleoProposalProvider.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/AcceleoProposalProvider.java
@@ -60,9 +60,10 @@ public class AcceleoProposalProvider implements IProposalProvider {
      * 
      * @see org.eclipse.sirius.common.tools.api.contentassist.IProposalProvider#getNewEmtpyExpression()
      */
+    @Override
     public ContentProposal getNewEmtpyExpression() {
         final String emptyAcceleoExpression = ACCELEO_EXPRESSION_PREFIX + ACCELEO_EXPRESSION_SUFFIX;
-        return new ContentProposal(emptyAcceleoExpression, emptyAcceleoExpression, "New Acceleo 3 expression.", 1);
+        return new ContentProposal(emptyAcceleoExpression, emptyAcceleoExpression, Messages.AcceleoProposalProvider_MTL_newExpression, 1);
     }
 
     /**
@@ -71,6 +72,7 @@ public class AcceleoProposalProvider implements IProposalProvider {
      * @see org.eclipse.sirius.common.tools.api.contentassist.IProposalProvider#getProposals(org.eclipse.sirius.common.tools.api.interpreter.IInterpreter,
      *      org.eclipse.sirius.common.tools.api.contentassist.ContentContext)
      */
+    @Override
     public List<ContentProposal> getProposals(IInterpreter interpreter, ContentContext context) {
         final List<ContentProposal> proposals;
         if (context == null || !(interpreter instanceof AcceleoMTLInterpreter)) {
@@ -125,6 +127,7 @@ public class AcceleoProposalProvider implements IProposalProvider {
      * @see org.eclipse.sirius.common.tools.api.contentassist.IProposalProvider#getProposals(org.eclipse.sirius.common.tools.api.interpreter.IInterpreter,
      *      org.eclipse.sirius.common.tools.api.contentassist.ContentInstanceContext)
      */
+    @Override
     public List<ContentProposal> getProposals(IInterpreter interpreter, ContentInstanceContext context) {
         final List<ContentProposal> proposals;
         if (context == null || !(interpreter instanceof AcceleoMTLInterpreter) || context.getCurrentSelected() == null) {
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/Messages.java b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/Messages.java
new file mode 100644
index 0000000000..4bfaa5d0ee
--- /dev/null
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/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.mtl.ide;
+
+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, AcceleoMTLInterpreterIDEPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+    @TranslatableMessage
+    public static String AcceleoProposalProvider_MTL_newExpression;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/WorkspaceJavaImportHandler.java b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/WorkspaceJavaImportHandler.java
index c86d8ac79e..1f6bd5b4c8 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/WorkspaceJavaImportHandler.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/src/org/eclipse/sirius/common/acceleo/mtl/ide/WorkspaceJavaImportHandler.java
@@ -10,15 +10,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.acceleo.mtl.ide;
 
-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.api.extension.DynamicJavaModuleCreator;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -44,6 +35,14 @@ import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.Signature;
 import org.eclipse.jface.text.IDocumentExtension4;
+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.api.extension.DynamicJavaModuleCreator;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 
 /**
  * This import handler will try and import a dependency as a Java class
@@ -188,7 +187,7 @@ public class WorkspaceJavaImportHandler extends AbstractImportHandler {
      */
     private static String resolveSourceType(IType context, String sourceType) {
         try {
-            final String wildcard = "? extends ";
+            final String wildcard = "? extends ";  //$NON-NLS-1$
             final String[][] erasure;
             if (sourceType.contains(wildcard)) {
                 erasure = context.resolveType(sourceType.substring(sourceType.indexOf(wildcard) + wildcard.length()));
@@ -366,6 +365,7 @@ public class WorkspaceJavaImportHandler extends AbstractImportHandler {
          * 
          * @see com.google.common.base.Predicate#apply(java.lang.Object)
          */
+        @Override
         public boolean apply(IProject input) {
             return input.isAccessible() && input.isOpen() && !input.isDerived();
         }
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 6fa82a9c20..7cc90d6222 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -241,6 +241,9 @@
 						<code>org.eclipse.sirius.common.acceleo.aql</code>
 					</li>
 					<li>
+						<code>org.eclipse.sirius.common.acceleo.mtl.ide</code>
+					</li>
+					<li>
 						<code>org.eclipse.sirius.common.acceleo.aql.ide</code>
 					</li>
 					<li>
@@ -1781,4 +1784,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 d759dbd4ea..94df740d65 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -54,6 +54,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.mtl.ide@
 ** @org.eclipse.sirius.common.acceleo.aql.ide@
 ** @org.eclipse.sirius.eef.adapters@