[472057] Externalize translatable strings from org.eclipse.sirius.eef.adapters

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

8 files changed, 53 insertions, 5 deletions

diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index ca4a67d6be..db211b982f 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -242,6 +242,9 @@
 					<li>
 						<code>org.eclipse.sirius.common.acceleo.aql.ide</code>
 					</li>
+					<li>
+						<code>org.eclipse.sirius.eef.adapters</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 30c866382c..20f23afdaf 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.synchronizer@
 ** @org.eclipse.sirius.common.acceleo.aql@
 ** @org.eclipse.sirius.common.acceleo.aql.ide@
+** @org.eclipse.sirius.eef.adapters@
 
 h4. Changes in @org.eclipse.sirius.ext.gef@
 
diff --git a/plugins/org.eclipse.sirius.eef.adapters/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.eef.adapters/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.eef.adapters/.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.eef.adapters/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.eef.adapters/META-INF/MANIFEST.MF
index 9da0bf504f..d23aeaafce 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.eef.adapters/META-INF/MANIFEST.MF
@@ -23,3 +23,4 @@ Export-Package: org.eclipse.sirius.eef.actions;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.eef.section;version="2.0.4",
  org.eclipse.sirius.eef.util;version="2.0.4"
 Bundle-Localization: plugin
+Import-Package: org.eclipse.sirius.ext.base;version="2.1.0"
diff --git a/plugins/org.eclipse.sirius.eef.adapters/plugin.properties b/plugins/org.eclipse.sirius.eef.adapters/plugin.properties
index d186929101..f102c3fee2 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/plugin.properties
+++ b/plugins/org.eclipse.sirius.eef.adapters/plugin.properties
@@ -12,4 +12,7 @@
 pluginName = Sirius Integration for EEF
 providerName = Eclipse Modeling Project
 
-extension-point.sectionFilters.name = sectionfilters
\ No newline at end of file
+extension-point.sectionFilters.name = sectionfilters
+
+OpenPropertiesWizardAction_errorOpeningWizard=Error while trying to open properties wizard.
+SiriusFilteringSectionDescriptor_missingContributorIdInSectionFilter=The section filter must be associated to a property contributor id
diff --git a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/actions/OpenPropertiesWizardAction.java b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/actions/OpenPropertiesWizardAction.java
index 2471c34793..7ca1e38152 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/actions/OpenPropertiesWizardAction.java
+++ b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/actions/OpenPropertiesWizardAction.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.eef.runtime.impl.operation.WizardEditingOperation;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.sirius.business.api.action.AbstractExternalJavaAction;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.eef.adapters.Messages;
 import org.eclipse.sirius.eef.util.VPDecoratorHelper;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 
@@ -51,9 +52,8 @@ public class OpenPropertiesWizardAction extends AbstractExternalJavaAction {
                     propertiesEditionContext.dispose();
                 }
             } catch (ExecutionException e) {
-                SiriusPlugin.getDefault().error("Error while trying to open properties wizard.", e);
+                SiriusPlugin.getDefault().error(Messages.OpenPropertiesWizardAction_errorOpeningWizard, e);
             }
         }
     }
-
 }
diff --git a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/adapters/Messages.java b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/adapters/Messages.java
new file mode 100644
index 0000000000..34f7568fcb
--- /dev/null
+++ b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/adapters/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.eef.adapters;
+
+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, EEFAdapterPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+    @TranslatableMessage
+    public static String OpenPropertiesWizardAction_errorOpeningWizard;
+
+    @TranslatableMessage
+    public static String SiriusFilteringSectionDescriptor_missingContributorIdInSectionFilter;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/section/SiriusFilteringSectionDescriptor.java b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/section/SiriusFilteringSectionDescriptor.java
index 044559fb56..439967e2ed 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/section/SiriusFilteringSectionDescriptor.java
+++ b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/section/SiriusFilteringSectionDescriptor.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.IFilter;
 import org.eclipse.sirius.eef.adapters.EEFAdapterPlugin;
+import org.eclipse.sirius.eef.adapters.Messages;
 import org.eclipse.ui.views.properties.tabbed.AbstractSectionDescriptor;
 import org.eclipse.ui.views.properties.tabbed.ISection;
 import org.eclipse.ui.views.properties.tabbed.ISectionDescriptor;
@@ -62,7 +63,7 @@ public class SiriusFilteringSectionDescriptor implements ISectionDescriptorProvi
     public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
         propertyContributorId = config.getAttribute(SiriusFilteringSectionDescriptor.CONTRIBUTOR_ID);
         if (propertyContributorId == null) {
-            EEFAdapterPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, EEFAdapterPlugin.PLUGIN_ID, "The section filter must be associated to a property contributor id"));
+            EEFAdapterPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, EEFAdapterPlugin.PLUGIN_ID, Messages.SiriusFilteringSectionDescriptor_missingContributorIdInSectionFilter));
         } else {
             // Filters loading
             IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.sirius.eef.adapters.sectionFilters"); //$NON-NLS-1$