[472057] Externalize translatable strings from oes.diagram.layoutdata

Bug: 472057
Change-Id: I63056966e13065ecce3d5da0a564fbacaca1c4ae
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>

10 files changed, 96 insertions, 18 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.diagram.layoutdata/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/.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.diagram.layoutdata/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram.layoutdata/META-INF/MANIFEST.MF
index ad75c45888..f5d50c4291 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Export-Package: org.eclipse.sirius.diagram.layoutdata;
   uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util";version="2.0.4",
  org.eclipse.sirius.diagram.layoutdata.impl;
   uses:="org.eclipse.emf.ecore, org.eclipse.emf.common.util, org.eclipse.sirius.diagram.layoutdata, org.eclipse.emf.ecore.impl, org.eclipse.emf.common.notify";version="2.0.4",
+    org.eclipse.sirius.diagram.layoutdata.tools;version="3.1.0",
  org.eclipse.sirius.diagram.layoutdata.tools.api.util;
   uses:="org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration,org.eclipse.sirius.diagram.layoutdata";version="2.0.4",
  org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration;version="2.0.4",
@@ -23,3 +24,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.sirius.common;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.sirius.diagram.layoutdata.LayoutDataPlugin$Implementation
+Import-Package: org.eclipse.sirius.ext.base;version="2.1.0"
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/plugin.properties b/plugins/org.eclipse.sirius.diagram.layoutdata/plugin.properties
index 5b8914d43e..a3b07374c9 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/plugin.properties
@@ -23,3 +23,8 @@
 
 pluginName = Sirius Layoutdata Model
 providerName = Eclipse Modeling Project
+
+EdgeConfigurationImpl_toString = distanceAroundPointsOfEdgeBendpointsList: {0}
+ConfigurationImpl_toString = Node configuration: {0}\nEdge configuration: {1}
+LayoutHelperImpl_layoutDifferenceMessage = Configuration: [\n{0}\n]\nDifference between left element [[\n\t{1}\n]] and right element [[\n\t{2}\n]]
+NodeConfigurationImpl_distanceAroundPoint = distanceAroundPoint: {0}
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/Messages.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/Messages.java
new file mode 100644
index 0000000000..1315461cfb
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/Messages.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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.diagram.layoutdata.tools;
+
+import org.eclipse.sirius.diagram.layoutdata.LayoutDataPlugin;
+import org.eclipse.sirius.ext.base.I18N;
+import org.eclipse.sirius.ext.base.I18N.TranslatableMessage;
+
+/**
+ * Helper class to obtains translated strings.
+ * 
+ * @author <a href="mailto:laurent.fasani@obeo.fr">Laurent Fasani</a>
+ */
+public final class Messages {
+
+    static {
+        I18N.initializeMessages(Messages.class, LayoutDataPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+
+    @TranslatableMessage
+    public static String EdgeConfigurationImpl_toString;
+
+    @TranslatableMessage
+    public static String ConfigurationImpl_toString;
+
+    @TranslatableMessage
+    public static String LayoutHelperImpl_layoutDifferenceMessage;
+
+    @TranslatableMessage
+    public static String NodeConfigurationImpl_distanceAroundPoint;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/LayoutHelperImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/LayoutHelperImpl.java
index f8938ca088..31022b942e 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/LayoutHelperImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/LayoutHelperImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 THALES GLOBAL SERVICES.
+ * Copyright (c) 2009, 2015 THALES GLOBAL SERVICES.
  * 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.layoutdata.tools.internal.util;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -17,12 +18,12 @@ import java.util.List;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.diagram.layoutdata.AbstractLayoutData;
 import org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData;
 import org.eclipse.sirius.diagram.layoutdata.NodeLayoutData;
 import org.eclipse.sirius.diagram.layoutdata.Point;
+import org.eclipse.sirius.diagram.layoutdata.tools.Messages;
 import org.eclipse.sirius.diagram.layoutdata.tools.api.util.LayoutHelper;
 import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.Configuration;
 import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.EdgeConfiguration;
@@ -57,9 +58,9 @@ public class LayoutHelperImpl implements LayoutHelper {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String getMessage() {
-            return "Configuration: [\n" + configuration + "\n]\nDifference between left element [[\n\t" + elementToString(leftElement) + "\n]] and right element [[\n\t"
-                    + elementToString(rightElement) + "\n]]";
+            return MessageFormat.format(Messages.LayoutHelperImpl_layoutDifferenceMessage, configuration, elementToString(leftElement), elementToString(rightElement));
         }
 
         private String elementToString(T element) {
@@ -75,6 +76,7 @@ public class LayoutHelperImpl implements LayoutHelper {
         /**
          * {@inheritDoc}
          */
+        @Override
         public T getLeftElement() {
             return leftElement;
         }
@@ -82,6 +84,7 @@ public class LayoutHelperImpl implements LayoutHelper {
         /**
          * {@inheritDoc}
          */
+        @Override
         public T getRightElement() {
             return rightElement;
         }
@@ -98,6 +101,7 @@ public class LayoutHelperImpl implements LayoutHelper {
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean haveSameLayout(final NodeLayoutData nodeLayout1, final NodeLayoutData nodeLayout2, final Configuration configuration) {
         return doHaveSameLayout(nodeLayout1, nodeLayout2, configuration) == null;
     }
@@ -192,6 +196,7 @@ public class LayoutHelperImpl implements LayoutHelper {
     /**
      * {@inheritDoc}
      */
+    @Override
     public LayoutDifference<?> computeFirstLayoutDifference(final Collection<? extends EObject> col1, final Collection<? extends EObject> col2, final Configuration configuration) {
 
         LayoutDifference<?> result = null;
@@ -230,6 +235,7 @@ public class LayoutHelperImpl implements LayoutHelper {
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean haveSameLayout(final Collection<? extends EObject> col1, final Collection<? extends EObject> col2, final Configuration configuration) {
         return computeFirstLayoutDifference(col1, col2, configuration) == null;
     }
@@ -237,6 +243,7 @@ public class LayoutHelperImpl implements LayoutHelper {
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean haveSameLayout(final EdgeLayoutData edgeLayout1, final EdgeLayoutData edgeLayout2, Configuration configuration) {
         return doHaveSameLayout(edgeLayout1, edgeLayout2, configuration) == null;
     }
@@ -283,7 +290,7 @@ public class LayoutHelperImpl implements LayoutHelper {
     }
 
     private static String toString(EObject eobject) {
-        return LayoutHelperImpl.toString("\n", eobject);
+        return LayoutHelperImpl.toString("\n", eobject); //$NON-NLS-1$
     }
 
     private static String toString(String prefix, EObject eobject) {
@@ -298,21 +305,21 @@ public class LayoutHelperImpl implements LayoutHelper {
             if (!feature.isDerived()) {
                 sb.append(prefix);
                 sb.append(feature.getName());
-                sb.append(" : ");
+                sb.append(" : "); //$NON-NLS-1$
                 Object obj = eobject.eGet(feature);
                 if (obj == null) {
-                    sb.append("null");
+                    sb.append("null"); //$NON-NLS-1$
                 } else if (obj instanceof EObject) {
-                    sb.append(LayoutHelperImpl.toString("\n     ", (EObject) obj));
+                    sb.append(LayoutHelperImpl.toString("\n     ", (EObject) obj)); //$NON-NLS-1$
                 } else if (obj instanceof List<?>) {
                     List<?> list = (List<?>) obj;
                     if (!list.isEmpty()) {
                         sb.append('\n');
-                        sb.append("     ");
+                        sb.append("     "); //$NON-NLS-1$
                     }
                     for (Object object : list) {
                         sb.append('\n');
-                        sb.append("     ");
+                        sb.append("     "); //$NON-NLS-1$
                         if (object instanceof EObject) {
                             sb.append(LayoutHelperImpl.toString((EObject) object));
                         } else {
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/ConfigurationImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/ConfigurationImpl.java
index 5d64af7e92..23bcf0fd15 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/ConfigurationImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/ConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
  * 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.layoutdata.tools.internal.util.configuration;
 
+import org.eclipse.sirius.diagram.layoutdata.tools.Messages;
 import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.Configuration;
 import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.EdgeConfiguration;
 import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.NodeConfiguration;
@@ -40,6 +41,7 @@ public class ConfigurationImpl implements Configuration {
     /**
      * {@inheritDoc}
      */
+    @Override
     public EdgeConfiguration getEdgeConfiguration() {
         return edgeConfiguration;
     }
@@ -47,6 +49,7 @@ public class ConfigurationImpl implements Configuration {
     /**
      * {@inheritDoc}
      */
+    @Override
     public NodeConfiguration getNodeConfiguration() {
         return nodeConfiguration;
     }
@@ -54,6 +57,7 @@ public class ConfigurationImpl implements Configuration {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setRecursively(boolean recursively) {
         this.recursively = recursively;
     }
@@ -61,6 +65,7 @@ public class ConfigurationImpl implements Configuration {
     /**
      * {@inheritDoc}
      */
+    @Override
     public final boolean isRecursive() {
         return recursively;
     }
@@ -70,7 +75,7 @@ public class ConfigurationImpl implements Configuration {
      */
     @Override
     public String toString() {
-        return "Node configuration: " + nodeConfiguration + "\nEdge configuration: " + edgeConfiguration;
+        return Messages.ConfigurationImpl_toString;
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/EdgeConfigurationImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/EdgeConfigurationImpl.java
index b7a66b0292..607506f4cc 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/EdgeConfigurationImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/EdgeConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
  * 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.layoutdata.tools.internal.util.configuration;
 
+import org.eclipse.sirius.diagram.layoutdata.tools.Messages;
 import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.EdgeConfiguration;
 
 /**
@@ -28,6 +29,7 @@ public class EdgeConfigurationImpl implements EdgeConfiguration {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDistanceAroundPointsOfEdgeBendpointsList(double pDistance) {
         this.distance = pDistance;
     }
@@ -35,6 +37,7 @@ public class EdgeConfigurationImpl implements EdgeConfiguration {
     /**
      * {@inheritDoc}
      */
+    @Override
     public final double getDistanceAroundPointsOfEdgeBendpointsList() {
         return distance;
     }
@@ -44,7 +47,7 @@ public class EdgeConfigurationImpl implements EdgeConfiguration {
      */
     @Override
     public String toString() {
-        return "distanceAroundPointsOfEdgeBendpointsList: " + getDistanceAroundPointsOfEdgeBendpointsList();
+        return Messages.EdgeConfigurationImpl_toString;
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/NodeConfigurationImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/NodeConfigurationImpl.java
index 3cef45df9e..7e907a9582 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/NodeConfigurationImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/NodeConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
  * 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
@@ -10,6 +10,9 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.layoutdata.tools.internal.util.configuration;
 
+import java.text.MessageFormat;
+
+import org.eclipse.sirius.diagram.layoutdata.tools.Messages;
 import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.NodeConfiguration;
 
 /**
@@ -26,6 +29,7 @@ public class NodeConfigurationImpl implements NodeConfiguration {
     /**
      * {@inheritDoc}
      */
+    @Override
     public final double getDistanceAroundPoint() {
         return distanceAroundPoint;
     }
@@ -33,6 +37,7 @@ public class NodeConfigurationImpl implements NodeConfiguration {
     /**
      * {@inheritDoc}
      */
+    @Override
     public final void setDistanceAroundPoint(double distanceAroundPoint) {
         this.distanceAroundPoint = distanceAroundPoint;
     }
@@ -42,7 +47,7 @@ public class NodeConfigurationImpl implements NodeConfiguration {
      */
     @Override
     public String toString() {
-        return "distanceAroundPoint: " + getDistanceAroundPoint();
+        return MessageFormat.format(Messages.NodeConfigurationImpl_distanceAroundPoint, getDistanceAroundPoint());
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 1b1007d180..4994006108 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -293,6 +293,9 @@
 						<code>org.eclipse.sirius.common.ui</code>
 					</li>
 					<li>
+						<code>org.eclipse.sirius.diagram.layoutdata</code>
+					</li>
+					<li>
 						<code>org.eclipse.sirius.diagram.sequence</code>
 					</li>
 					<li>
@@ -1918,4 +1921,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 9c8228573c..0eeeb3b7e3 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -69,6 +69,7 @@ Additional non-breaking changes:
 ** @org.eclipse.sirius.common.acceleo.mtl@
 ** @org.eclipse.sirius.common.acceleo.mtl.ide@
 ** @org.eclipse.sirius.common.ui@
+** @org.eclipse.sirius.diagram.layoutdata@
 ** @org.eclipse.sirius.diagram.sequence@
 ** @org.eclipse.sirius.diagram.sequence.ui@
 ** @org.eclipse.sirius.diagram@