[472057] Externalize translatable strings from org.eclipse.sirius.ecore.extender

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

16 files changed, 122 insertions, 23 deletions

diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index fb40895415..a23bcb1abc 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -230,6 +230,9 @@
 					<li>
 						<code>org.eclipse.sirius.ext.base</code>
 					</li>
+					<li>
+						<code>org.eclipse.sirius.ecore.extender</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 5cbc18e912..904654a2aa 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -50,6 +50,7 @@ Additional non-breaking changes:
 * <span class="label label-success">Added</span> @org.eclipse.sirius.ext.base.I18N@ has been added. It provides common utility code to support internationalization. 
 * <span class="label label-success">Added</span> The translation keys (and default values) have been added to all the concerned bundles, in their @plugin.properties@ file. These (translated) messages are available at runtime as static fields of new @Messages@ classes, added to all concerned bundles (always in the same package as their plug-in/activator class). The concerned bundles are:
 ** @org.eclipse.sirius.ext.base@
+** @org.eclipse.sirius.ecore.extender@
 
 h4. Changes in @org.eclipse.sirius.ext.gef@
 
diff --git a/plugins/org.eclipse.sirius.ecore.extender/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.ecore.extender/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.ecore.extender/.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.ecore.extender/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ecore.extender/META-INF/MANIFEST.MF
index 63a311a4f8..ac0c78fdec 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ecore.extender/META-INF/MANIFEST.MF
@@ -24,4 +24,5 @@ Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Import-Package: org.eclipse.sirius.ext.emf;version="2.0.0"
+Import-Package: org.eclipse.sirius.ext.base;version="2.1.0",
+ org.eclipse.sirius.ext.emf;version="2.0.0"
diff --git a/plugins/org.eclipse.sirius.ecore.extender/plugin.properties b/plugins/org.eclipse.sirius.ecore.extender/plugin.properties
index e55f009eff..0a228ea8b8 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/plugin.properties
+++ b/plugins/org.eclipse.sirius.ecore.extender/plugin.properties
@@ -14,3 +14,15 @@ providerName = Eclipse Modeling Project
 
 extension-point.extenderProvider.name = org.eclipse.sirius.ecore.extender.ExtenderProvider
 extension-point.permissionProvider.name = org.eclipse.sirius.ecore.extender.PermissionProvider
+
+AbstractProviderDescriptor_attributeMissing=The {0} attribute is missing
+ExtenderProviderDescriptor_errorLoadingExtenderProvider=An extender provider could not be loaded
+FeatureNotFoundException_message=Feature {0} for the type {1} doesn''t exist.
+IllegalTypeForValueException_message=Value type of {0} is illegal. Actual {1}. Excepted:
+LockedInstanceException_message=An instance is locked and should not be modified among : 
+ModelAccessor_error_featureNotFound={0} on {1}
+ModelAccessorsRegistry_noResourceFound=No resource to get the ExtendedPackage
+ModelUtils_missingInputStream=Input Stream for the model to load cannot be null.
+ModelUtils_nullSerializationError=Cannot serialize null object.
+PermissionAuthorityRegistryImpl_noResourceMessage=No resource to get the ExtendedPackage
+ReferencesResolver_resolveNonContainedReferencesTask=Resolving non contained references
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessor.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessor.java
index cd7b5fb673..d97dc2ebac 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessor.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessor.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.ecore.extender.business.api.accessor;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -26,6 +27,7 @@ import org.eclipse.sirius.ecore.extender.business.api.accessor.exception.MetaCla
 import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
 import org.eclipse.sirius.ecore.extender.business.api.permission.PermissionAuthorityRegistry;
 import org.eclipse.sirius.ecore.extender.business.api.permission.exception.LockedInstanceException;
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
 import org.eclipse.sirius.ecore.extender.business.internal.permission.PermissionService;
 import org.eclipse.sirius.ext.emf.EReferencePredicate;
 
@@ -314,7 +316,7 @@ public class ModelAccessor {
         if (result != null) {
             return result.booleanValue();
         }
-        throw new FeatureNotFoundException(featureName + " on " + instance);
+        throw new FeatureNotFoundException(MessageFormat.format(Messages.ModelAccessor_error_featureNotFound, featureName, instance));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessorsRegistry.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessorsRegistry.java
index f1ee2821e5..e293cf2898 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessorsRegistry.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessorsRegistry.java
@@ -18,6 +18,7 @@ import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
 
 /**
  * Registry keeping track of the model accessors.
@@ -79,7 +80,7 @@ public class ModelAccessorsRegistry {
                 result = root2ExPackage.values().iterator().next();
             } else {
                 // here we really can't manage something
-                throw new RuntimeException("No resource to get the ExtendedPackage");
+                throw new RuntimeException(Messages.ModelAccessorsRegistry_noResourceFound);
             }
         } else {
             result = getModelAccessor(modelElementResource.getResourceSet());
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/exception/FeatureNotFoundException.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/exception/FeatureNotFoundException.java
index 50ba745c84..b2ef538584 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/exception/FeatureNotFoundException.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/exception/FeatureNotFoundException.java
@@ -10,6 +10,10 @@
  *******************************************************************************/
 package org.eclipse.sirius.ecore.extender.business.api.accessor.exception;
 
+import java.text.MessageFormat;
+
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
+
 /**
  * Exception launched when a feature is not found on a given
  * {@link org.eclipse.emf.ecore.EObject} instance.
@@ -81,7 +85,7 @@ public class FeatureNotFoundException extends Exception {
      *            type name.
      */
     public FeatureNotFoundException(final String featureName, final String typeName) {
-        this("feature " + featureName + " for the type " + typeName + " doesn't exist.");
+        this(MessageFormat.format(Messages.FeatureNotFoundException_message, featureName, typeName));
     }
 
     /**
@@ -95,7 +99,7 @@ public class FeatureNotFoundException extends Exception {
      *            source error.
      */
     public FeatureNotFoundException(final String featureName, final String typeName, final Throwable cause) {
-        this("feature " + featureName + " for the type " + typeName + " doesn't exist.", cause);
+        this(MessageFormat.format(Messages.FeatureNotFoundException_message, featureName, typeName), cause);
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/exception/IllegalTypeForValueException.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/exception/IllegalTypeForValueException.java
index fd7822b511..6781ee4d59 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/exception/IllegalTypeForValueException.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/exception/IllegalTypeForValueException.java
@@ -10,6 +10,10 @@
  *******************************************************************************/
 package org.eclipse.sirius.ecore.extender.business.api.accessor.exception;
 
+import java.text.MessageFormat;
+
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
+
 /**
  * Exception launched when a type is illegal as a value for a feature on a given
  * {@link org.eclipse.emf.ecore.EObject} instance.
@@ -83,7 +87,7 @@ public class IllegalTypeForValueException extends Exception {
      *            type name.
      */
     public IllegalTypeForValueException(final String featureName, final String actualTypeName, final String exceptedTypeName) {
-        this("value type of  " + featureName + " is  illegal. Actual " + actualTypeName + ". Excepted :");
+        this(MessageFormat.format(Messages.IllegalTypeForValueException_message, featureName, actualTypeName));
     }
 
     /**
@@ -99,7 +103,7 @@ public class IllegalTypeForValueException extends Exception {
      *            source error.
      */
     public IllegalTypeForValueException(final String featureName, final String actualTypeName, final String exceptedTypeName, final Throwable cause) {
-        this("value type of  " + featureName + " is  illegal. Actual " + actualTypeName + ". Excepted :", cause);
+        this(MessageFormat.format(Messages.IllegalTypeForValueException_message, featureName, actualTypeName), cause);
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/permission/exception/LockedInstanceException.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/permission/exception/LockedInstanceException.java
index 5c52167313..b9223a5888 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/permission/exception/LockedInstanceException.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/permission/exception/LockedInstanceException.java
@@ -13,6 +13,7 @@ package org.eclipse.sirius.ecore.extender.business.api.permission.exception;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
 
 /**
  * {@link Exception} thrown when an instance nobody should be able to change
@@ -23,7 +24,7 @@ import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 public class LockedInstanceException extends RuntimeException {
 
     /** The default permission issue message. */
-    public static final String PERMISSION_ISSUE_MESSAGE = "An instance is locked and should not be modified among : ";
+    public static final String PERMISSION_ISSUE_MESSAGE = Messages.LockedInstanceException_message;
 
     private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/Messages.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/Messages.java
new file mode 100644
index 0000000000..d90a1bb9fb
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/Messages.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * 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.ecore.extender.business.internal;
+
+import org.eclipse.sirius.ext.base.I18N;
+import org.eclipse.sirius.ext.base.I18N.TranslatableMessage;
+
+/**
+ * Helper class to obtain translated strings.
+ * 
+ * @author pcdavid
+ */
+public final class Messages {
+
+    static {
+        I18N.initializeMessages(Messages.class, ExtenderPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+    @TranslatableMessage
+    public static String AbstractProviderDescriptor_attributeMissing;
+
+    @TranslatableMessage
+    public static String ExtenderProviderDescriptor_errorLoadingExtenderProvider;
+
+    @TranslatableMessage
+    public static String FeatureNotFoundException_message;
+
+    @TranslatableMessage
+    public static String IllegalTypeForValueException_message;
+
+    @TranslatableMessage
+    public static String LockedInstanceException_message;
+
+    @TranslatableMessage
+    public static String ModelAccessor_error_featureNotFound;
+
+    @TranslatableMessage
+    public static String ModelAccessorsRegistry_noResourceFound;
+
+    @TranslatableMessage
+    public static String ModelUtils_missingInputStream;
+
+    @TranslatableMessage
+    public static String ModelUtils_nullSerializationError;
+
+    @TranslatableMessage
+    public static String PermissionAuthorityRegistryImpl_noResourceMessage;
+
+    @TranslatableMessage
+    public static String ReferencesResolver_resolveNonContainedReferencesTask;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/common/AbstractProviderDescriptor.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/common/AbstractProviderDescriptor.java
index ffe8396758..82e5b83c25 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/common/AbstractProviderDescriptor.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/common/AbstractProviderDescriptor.java
@@ -10,9 +10,11 @@
  *******************************************************************************/
 package org.eclipse.sirius.ecore.extender.business.internal.common;
 
-import org.eclipse.core.runtime.IConfigurationElement;
+import java.text.MessageFormat;
 
+import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ExtenderConstants;
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
 import org.eclipse.sirius.ecore.extender.business.internal.permission.PermissionService;
 
 /**
@@ -68,7 +70,7 @@ public abstract class AbstractProviderDescriptor implements Comparable<AbstractP
         if (defaultValue != null) {
             return defaultValue;
         }
-        throw new IllegalArgumentException("The " + name + " attribute is missing"); //$NON-NLS-1$
+        throw new IllegalArgumentException(MessageFormat.format(Messages.AbstractProviderDescriptor_attributeMissing, name));
     }
 
     public int getPriority() {
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/common/ExtenderProviderDescriptor.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/common/ExtenderProviderDescriptor.java
index 85fd902ae5..f71d2e7606 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/common/ExtenderProviderDescriptor.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/common/ExtenderProviderDescriptor.java
@@ -12,9 +12,9 @@ package org.eclipse.sirius.ecore.extender.business.internal.common;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
-
 import org.eclipse.sirius.ecore.extender.business.api.accessor.IExtenderProvider;
 import org.eclipse.sirius.ecore.extender.business.internal.ExtenderPlugin;
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
 
 /**
  * This Descriptor is used to keep track of the ExtenderProvider engines.
@@ -46,7 +46,7 @@ public class ExtenderProviderDescriptor extends AbstractProviderDescriptor {
                 provider = (IExtenderProvider) element.createExecutableExtension("providerClass"); //$NON-NLS-1$
             } catch (final CoreException e) {
                 /* log an error */
-                ExtenderPlugin.getPlugin().logError("An extender provider could not be loaded", e);
+                ExtenderPlugin.getPlugin().logError(Messages.ExtenderProviderDescriptor_errorLoadingExtenderProvider, e);
             }
         }
         return provider;
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionAuthorityRegistryImpl.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionAuthorityRegistryImpl.java
index 4882095b2e..aa312898b5 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionAuthorityRegistryImpl.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionAuthorityRegistryImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
 import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthorityRegistry;
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
 
 /**
  * Registry for all the permission authorities.
@@ -56,7 +57,7 @@ public class PermissionAuthorityRegistryImpl implements IPermissionAuthorityRegi
                     authority = resourceSetToAuthority.values().iterator().next();
                 } else {
                     // here we really can't manage something
-                    throw new RuntimeException("No resource to get the ExtendedPackage");
+                    throw new RuntimeException(Messages.PermissionAuthorityRegistryImpl_noResourceMessage);
                 }
             } else {
                 authority = getPermissionAuthority(modelElementResource.getResourceSet());
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/tool/api/ModelUtils.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/tool/api/ModelUtils.java
index af55919cb1..eb2bb301e2 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/tool/api/ModelUtils.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/tool/api/ModelUtils.java
@@ -43,6 +43,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl;
 import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
 import org.eclipse.sirius.ecore.extender.business.api.permission.PermissionAuthorityRegistry;
 import org.eclipse.sirius.ecore.extender.business.internal.ExtenderPlugin;
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
 import org.eclipse.sirius.ecore.extender.tool.internal.ReferencesResolver;
 import org.eclipse.sirius.ext.emf.EReferencePredicate;
 
@@ -188,7 +189,7 @@ public final class ModelUtils {
         if (extension != null) {
             fileExtension = extension;
         } else {
-            fileExtension = "";
+            fileExtension = ""; //$NON-NLS-1$
         }
 
         if (directory.exists() && directory.isDirectory() && directory.listFiles() != null) {
@@ -249,7 +250,7 @@ public final class ModelUtils {
      */
     public static EObject load(final InputStream stream, final String fileName, final ResourceSet resourceSet) throws IOException {
         if (stream == null) {
-            throw new NullPointerException("Input Stream for the model to load cannot be null.");
+            throw new NullPointerException(Messages.ModelUtils_missingInputStream);
         }
         EObject result = null;
 
@@ -387,7 +388,7 @@ public final class ModelUtils {
      */
     public static void save(final EObject root, final String path) throws IOException {
         if (root == null) {
-            throw new NullPointerException("Cannot serialize null object.");
+            throw new NullPointerException(Messages.ModelUtils_nullSerializationError);
         }
 
         final Resource newModelResource = ModelUtils.createResource(URI.createFileURI(path));
@@ -409,7 +410,7 @@ public final class ModelUtils {
      */
     public static String serialize(final EObject root) throws IOException {
         if (root == null) {
-            throw new NullPointerException("Cannot serialize null object.");
+            throw new NullPointerException(Messages.ModelUtils_nullSerializationError);
         }
 
         final XMIResourceImpl newResource = new XMIResourceImpl();
diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/tool/internal/ReferencesResolver.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/tool/internal/ReferencesResolver.java
index 0bb329c576..45c557589a 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/tool/internal/ReferencesResolver.java
+++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/tool/internal/ReferencesResolver.java
@@ -21,15 +21,15 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
+import org.eclipse.sirius.ecore.extender.business.api.permission.PermissionAuthorityRegistry;
+import org.eclipse.sirius.ecore.extender.business.internal.Messages;
+import org.eclipse.sirius.ext.emf.EReferencePredicate;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 
-import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
-import org.eclipse.sirius.ecore.extender.business.api.permission.PermissionAuthorityRegistry;
-import org.eclipse.sirius.ext.emf.EReferencePredicate;
-
 /**
  * Class responsible for resolving some references.
  * 
@@ -69,7 +69,7 @@ public class ReferencesResolver {
     public void resolve(IProgressMonitor monitor) {
         final IPermissionAuthority authority = PermissionAuthorityRegistry.getDefault().getPermissionAuthority(set);
         final List<Resource> cachedIdsResources = ReferencesResolver.prepareResolveAll(set, authority);
-        monitor.beginTask("Resolving non contained references", set.getResources().size());
+        monitor.beginTask(Messages.ReferencesResolver_resolveNonContainedReferencesTask, set.getResources().size());
         for (Resource res : Lists.newArrayList(set.getResources())) {
             doResolveAll(res);
             monitor.worked(1);