bug 540221 : [SashEditor] clean code : add missing Non-NLS markers + add

missing header + others stuff

Change-Id: I215d36612ecdcbea8422994ce2085b03aa84694c
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>

41 files changed, 370 insertions, 111 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java
index 068c87a6491..8ee44380204 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java
@@ -35,7 +35,7 @@ public interface IPageModelFactory {
 	 * 
 	 * @since 2.0
 	 */
-	String DEFAULT_EDITOR = IPageManager.class.getCanonicalName() + ".Default";
+	String DEFAULT_EDITOR = IPageManager.class.getCanonicalName() + ".Default"; //$NON-NLS-1$
 
 	/**
 	 * Create the IPageModel for the pageIdentifier. The pageIdentifier is the object passed to
@@ -77,6 +77,6 @@ public interface IPageModelFactory {
 	 * @since 2.0
 	 */
 	default Map<String, String> getEditorIDsFor(Object pageIdentifier) {
-		return Collections.singletonMap(DEFAULT_EDITOR, "Default editor");
+		return Collections.singletonMap(DEFAULT_EDITOR, "Default editor"); //$NON-NLS-1$
 	}
 }
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java
index 90bdd184f5f..77dc3ffef9f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;
 
 import org.eclipse.core.commands.AbstractHandler;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java
index 29964ee280e..3ae1ca1c71e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;
 
 import org.eclipse.core.commands.AbstractHandler;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
index 6168bf3b40f..65b42b2e918 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
@@ -73,7 +73,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	public DiContentProvider(SashModel diSashModel, IPageModelFactory pageModelFactory, ContentChangedEventProvider contentChangedEventProvider) throws IllegalArgumentException {
 
 		if (pageModelFactory == null) {
-			throw new IllegalArgumentException("A IPageModelFactory should be provided.");
+			throw new IllegalArgumentException("A IPageModelFactory should be provided."); //$NON-NLS-1$
 		}
 
 		this.diSashModel = diSashModel;
@@ -152,7 +152,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	@Override
 	public void addPage(Object page, int index) {
 
-		throw new UnsupportedOperationException("Not yet implemented.");
+		throw new UnsupportedOperationException("Not yet implemented."); //$NON-NLS-1$
 	}
 
 	/**
@@ -241,7 +241,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 		} else if (root instanceof TabFolder) {
 			return new TabFolderModel((TabFolder) root, pageModelFactory);
 		} else {
-			throw new IllegalArgumentException("Can't create IPanelModel from raw model '" + root + "'.");
+			throw new IllegalArgumentException("Can't create IPanelModel from raw model '" + root + "'."); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
@@ -305,7 +305,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	 */
 	@Override
 	public void removePage(Object page) {
-		throw new UnsupportedOperationException("Not yet implemented.");
+		throw new UnsupportedOperationException("Not yet implemented."); //$NON-NLS-1$
 
 	}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ICurrentFolderAndPageMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ICurrentFolderAndPageMngr.java
index 29fa88574fe..d9c460f6e2e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ICurrentFolderAndPageMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ICurrentFolderAndPageMngr.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
 
 import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java
index aa9e4943251..f3e4ff9ff39 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java
@@ -72,7 +72,7 @@ public class SashPanelModel implements IAbstractPanelModel, ISashPanelModel {
 		} else if (child instanceof TabFolder) {
 			return new TabFolderModel((TabFolder) child, pageModelFactory);
 		} else {
-			throw new IllegalArgumentException("Can't create IPanelModel from raw model '" + child + "'.");
+			throw new IllegalArgumentException("Can't create IPanelModel from raw model '" + child + "'."); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml
index 5e1cf35bef5..87a59d6f571 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java
index e00cfba87a9..7e143be9f15 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java
@@ -25,7 +25,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	/** Plugin ID */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core.sasheditor";
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core.sasheditor"; //$NON-NLS-1$
 
 	/** shared instance of the plugin */
 	private static Activator plugin;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
index 77dbf80de26..599ca142069 100755
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
@@ -132,7 +132,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 */
 	@Override
 	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {
-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()");
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()"); //$NON-NLS-1$
 		((TabFolderModel) folderModel).moveTab(oldIndex, newIndex);
 
 	}
@@ -144,7 +144,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	@Override
 	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {
 		// This implementation use (TabFolderModel), so we can cast safely
-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()");
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()"); //$NON-NLS-1$
 		if (sourceIndex == -1) {
 			moveAllPages(srcFolderModel, targetFolderModel);
 			return;
@@ -192,7 +192,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 */
 	@Override
 	public void createFolder(ITabFolderModel sourceFolder, int tabIndex, ITabFolderModel referenceFolder, int side) {
-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()"); //$NON-NLS-1$
 
 		doCreateFolder((TabFolderModel) sourceFolder, tabIndex, (TabFolderModel) referenceFolder, side);
 		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, sourceFolder));
@@ -211,7 +211,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 *            The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.
 	 */
 	public ITabFolderModel createFolder(ITabFolderModel referenceFolder, int side) {
-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()"); //$NON-NLS-1$
 
 		ITabFolderModel newFolder = doCreateFolder((TabFolderModel) referenceFolder, side);
 		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, referenceFolder));
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java
index 89134be4822..0e1a61797b1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java
@@ -217,7 +217,7 @@ public class TabFolderModel extends AbstractPanelModel implements ITabFolderMode
 	 */
 	@Override
 	public void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild) {
-		throw new UnsupportedOperationException("This method should not be called on this class.");
+		throw new UnsupportedOperationException("This method should not be called on this class."); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java
index 6d4328c67d6..d51ac421034 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.editor;
 
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java
index 7f76a8c202d..157e108c9fd 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.editor;
 
 import org.eclipse.ui.IEditorPart;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java
index 085ee27f3fe..f336a696209 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.editor;
 
 import org.eclipse.papyrus.infra.core.sasheditor.api.IPapyrusEditor;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java
index 5f8aff079ea..6dfad9c420a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.editor;
 
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener.java
index f19ca181669..9a330a40ab1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.editor;
 
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java
index 37df96140db..646f739bae1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.editor;
 
 import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainer.java
index 94e96cf856f..ecbf731d49c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainer.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.editor;
 
 import java.util.List;
@@ -39,14 +54,14 @@ public interface ISashWindowsContainer {
 	 * @return
 	 */
 	public List<IPage> getVisiblePages();
-	
+
 	/**
 	 * Get the next IPage in the tabs list.
 	 *
 	 * @return
 	 */
 	public IPage getNextPage();
-	
+
 	/**
 	 * Get the next IPage in the tabs list.
 	 *
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java
index a3b90ab71f9..2fa2b3d8ec3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.editor;
 
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsEventsProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsEventsProvider.java
index 0afc4007aac..8de41a9e092 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsEventsProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsEventsProvider.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.editor;
 
 import java.util.ArrayList;
@@ -126,7 +138,7 @@ public class SashWindowsEventsProvider {
 	 */
 	private void init(IWorkbenchPage page) {
 		if (page == null) {
-			throw new IllegalArgumentException("page should not be null.");
+			throw new IllegalArgumentException("page should not be null."); //$NON-NLS-1$
 		}
 
 		workbenchPage = page;
@@ -224,7 +236,7 @@ public class SashWindowsEventsProvider {
 		// Compute new container.
 		ISashWindowsContainer newContainer = null;
 		if (newEditor != null) {
-			newContainer = (ISashWindowsContainer) newEditor.getAdapter(ISashWindowsContainer.class);
+			newContainer = newEditor.getAdapter(ISashWindowsContainer.class);
 		}
 
 		// Throw event if necessary
@@ -337,7 +349,7 @@ public class SashWindowsEventsProvider {
 		public void addListener(Listener listener) {
 			// Lazy creation
 			if (listeners == null) {
-				listeners = new ArrayList<Listener>();
+				listeners = new ArrayList<>();
 			}
 
 			// do not add if already present.
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/TabMouseEventListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/TabMouseEventListener.java
index c736b4b6677..e53d262d3bc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/TabMouseEventListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/TabMouseEventListener.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.handlers.IHandlerService;
  */
 public class TabMouseEventListener implements ITabMouseEventsListener {
 
-	private static final String RENAME_COMMAND_ID = "org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick";
+	private static final String RENAME_COMMAND_ID = "org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick"; //$NON-NLS-1$
 
 	/**
 	 * Site of the editor.
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
index 876d824c1a0..6d357ad3e88 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
@@ -82,7 +82,7 @@ public class ComposedActionBarContributor extends MultiPageEditorActionBarContri
 		}
 
 		if (Activator.log.isDebugEnabled()) {
-			Activator.log.debug("setActivePage(" + activeEditor + " " + ")");
+			Activator.log.debug("setActivePage(" + activeEditor + " " + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
 
 		activeNestedEditor = activeEditor;
@@ -112,7 +112,7 @@ public class ComposedActionBarContributor extends MultiPageEditorActionBarContri
 	@Override
 	public void setActiveEditor(IEditorPart part) {
 		if (Activator.log.isDebugEnabled()) {
-			Activator.log.debug("setActiveEditor(" + part + " " + ")");
+			Activator.log.debug("setActiveEditor(" + part + " " + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
 
 		// Switch the editor and activeContributor.
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageHistoryTracker.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageHistoryTracker.java
index b109087b88b..ee4f5335e94 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageHistoryTracker.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageHistoryTracker.java
@@ -38,7 +38,7 @@ public class ActivePageHistoryTracker implements IPageLifeCycleEventsListener {
 	 */
 	@Override
 	public void pageChanged(IPage newPage) {
-		System.out.println("pageChanged - " + newPage.getPageTitle());
+		System.out.println("pageChanged - " + newPage.getPageTitle()); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java
index ca3b4ad0710..5ec27b81b32 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java
@@ -160,7 +160,7 @@ public class ComponentPart extends PagePart implements IComponentPage {
 
 		// Not found !!
 		// The tile contains the position, but the type is not found.
-		throw new UnsupportedOperationException("Tile match the expected position '" + toFind + "' but there is no Tile of requested type '" + expectedTileType.getClass().getName() + "'");
+		throw new UnsupportedOperationException("Tile match the expected position '" + toFind + "' but there is no Tile of requested type '" + expectedTileType.getClass().getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
 
 	/**
@@ -296,7 +296,7 @@ public class ComponentPart extends PagePart implements IComponentPage {
 	 * Show item status.
 	 */
 	protected void showStatus() {
-		System.out.printf("ComponentPart: disposed=%-5b, visible=%-5b, garbState=%-10s, %s, %s\n", editorControl.isDisposed(), (editorControl.isDisposed() ? false : editorControl.isVisible()), garbageState, getPageTitle(), this);
+		System.out.printf("ComponentPart: disposed=%-5b, visible=%-5b, garbState=%-10s, %s, %s\n", editorControl.isDisposed(), (editorControl.isDisposed() ? false : editorControl.isVisible()), garbageState, getPageTitle(), this); //$NON-NLS-1$
 	}
 
 	/**
@@ -308,7 +308,7 @@ public class ComponentPart extends PagePart implements IComponentPage {
 			return partModel.getTabTitle();
 		} catch (Exception ex) {
 			Activator.log.error(ex);
-			return "Error";
+			return "Error"; //$NON-NLS-1$
 		}
 	}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
index edec6975652..26363b3e95f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
@@ -500,7 +500,7 @@ public class EditorPart extends PagePart implements IEditorPage {
 
 		// Not found !!
 		// The tile contains the position, but the type is not found.
-		throw new UnsupportedOperationException("Tile match the expected position '" + toFind + "' but there is no Tile of requested type '" + expectedTileType.getClass().getName() + "'");
+		throw new UnsupportedOperationException("Tile match the expected position '" + toFind + "' but there is no Tile of requested type '" + expectedTileType.getClass().getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
 
 	/**
@@ -599,7 +599,7 @@ public class EditorPart extends PagePart implements IEditorPage {
 		} else {
 			// Bad state, this is an internal error
 			// TODO : log a warning ?
-			throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to REPARENTED. This is forbidden.");
+			throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to REPARENTED. This is forbidden."); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
 	}
@@ -679,8 +679,8 @@ public class EditorPart extends PagePart implements IEditorPage {
 	 * Show item status.
 	 */
 	protected void showStatus() {
-		String title = (editorPart != null ? editorPart.getTitle() : "no editorPart");
-		System.out.printf("EditorTile: disposed=%-5b, visible=%-5b, garbState=%-10s, %s, %s\n", editorControl.isDisposed(), (editorControl.isDisposed() ? false : editorControl.isVisible()), garbageState, title, this);
+		String title = (editorPart != null ? editorPart.getTitle() : "no editorPart"); //$NON-NLS-1$
+		System.out.printf("EditorTile: disposed=%-5b, visible=%-5b, garbState=%-10s, %s, %s\n", editorControl.isDisposed(), (editorControl.isDisposed() ? false : editorControl.isVisible()), garbageState, title, this); //$NON-NLS-1$
 
 	}
 
@@ -693,7 +693,7 @@ public class EditorPart extends PagePart implements IEditorPage {
 			return editorModel.getTabTitle();
 		} catch (Exception ex) {
 			Activator.log.error(ex);
-			return "Error";
+			return "Error"; //$NON-NLS-1$
 		}
 	}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ErrorComponentPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ErrorComponentPart.java
index 6b3bc5163f0..f55743bd70e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ErrorComponentPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ErrorComponentPart.java
@@ -16,6 +16,7 @@
 package org.eclipse.papyrus.infra.core.sasheditor.internal;
 
 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;
+import org.eclipse.papyrus.infra.core.sasheditor.messages.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
@@ -50,7 +51,7 @@ public class ErrorComponentPart extends ComponentPart {
 
 			@Override
 			public String getTabTitle() {
-				return "Invalid tab";
+				return Messages.ErrorComponentPart_InvalidTab;
 			}
 
 			@Override
@@ -81,7 +82,7 @@ public class ErrorComponentPart extends ComponentPart {
 
 				Label label = new Label(tabComposite, SWT.NONE);
 				label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-				label.setText("Invalid tab");
+				label.setText(Messages.ErrorComponentPart_InvalidTab);
 
 				return tabComposite;
 			}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java
index 10082e04333..e3a8d7550c2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java
@@ -217,7 +217,7 @@ public class ImageToolTipManager {
 			x = mousePos.x;
 			y = relatedControlBounds.y + (relatedControlBounds.height + offsetY);
 		} else {
-			throw new UnsupportedOperationException("Not yet implemented for this alignement.");
+			throw new UnsupportedOperationException("Not yet implemented for this alignement."); //$NON-NLS-1$
 		}
 		return new Point(x, y);
 	}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java
index b2b70e036f6..1fe3e61b67f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java
@@ -105,9 +105,9 @@ public class RootPart extends AbstractPart implements IPanelParent {
 			createdPart = new SashPanelPart(this, (ISashPanelModel) model, rawModel);
 		} else {
 			// error
-			throw new IllegalArgumentException("Can't create child part for model of type '"
+			throw new IllegalArgumentException("Can't create child part for model of type '" //$NON-NLS-1$
 					+ model.getClass().getName()
-					+ "'");
+					+ "'"); //$NON-NLS-1$
 			// TODO: Return an error Part showing the exception instead of throwing it ?
 		}
 
@@ -307,10 +307,10 @@ public class RootPart extends AbstractPart implements IPanelParent {
 	 * Show tile status.
 	 */
 	protected void showStatus() {
-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("rootPart (1)"
-				+ ", disposed=" + container.isDisposed()
-				+ ", visible=" + container.isVisible()
-				+ ", " + this);
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("rootPart (1)" //$NON-NLS-1$
+				+ ", disposed=" + container.isDisposed() //$NON-NLS-1$
+				+ ", visible=" + container.isVisible() //$NON-NLS-1$
+				+ ", " + this); //$NON-NLS-1$
 	}
 
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java
index 97ee808cd92..1869e81117d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java
@@ -136,9 +136,9 @@ public class SashPanelPart extends AbstractPanelPart implements IPanelParent {
 			createdPart = new SashPanelPart(this, (ISashPanelModel) model, rawModel);
 		} else {
 			// error
-			throw new IllegalArgumentException("Can't create child part for model of type '"
+			throw new IllegalArgumentException("Can't create child part for model of type '" //$NON-NLS-1$
 					+ model.getClass().getName()
-					+ "'");
+					+ "'"); //$NON-NLS-1$
 			// TODO: Return an error Part showing the exception instead of throwing it ?
 		}
 
@@ -266,7 +266,7 @@ public class SashPanelPart extends AbstractPanelPart implements IPanelParent {
 			return currentChildParts[1].findPart(toFind);
 		}
 
-		throw new NotFoundException("Can't find a part at '" + toFind + "'");
+		throw new NotFoundException("Can't find a part at '" + toFind + "'"); //$NON-NLS-1$ //$NON-NLS-2$
 
 
 	}
@@ -495,11 +495,11 @@ public class SashPanelPart extends AbstractPanelPart implements IPanelParent {
 	 * Used for debug purpose
 	 */
 	protected void showStatus() {
-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("sash[" + currentChildParts.length + "]:"
-				+ ", disposed=" + container.isDisposed()
-				+ ", visible=" + container.isVisible()
-				+ ", garbState=" + garbageState
-				+ ", " + this);
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("sash[" + currentChildParts.length + "]:" //$NON-NLS-1$ //$NON-NLS-2$
+				+ ", disposed=" + container.isDisposed() //$NON-NLS-1$
+				+ ", visible=" + container.isVisible() //$NON-NLS-1$
+				+ ", garbState=" + garbageState //$NON-NLS-1$
+				+ ", " + this); //$NON-NLS-1$
 	}
 
 }
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
index c6deb38061c..1906658f47e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
@@ -208,7 +208,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 		assert (contentProvider != null);
 		// Double check for development
 		if (contentProvider == null) {
-			throw new IllegalStateException("ContentProvider should be set before calling any method requiring it.");
+			throw new IllegalStateException("ContentProvider should be set before calling any method requiring it."); //$NON-NLS-1$
 		}
 
 		return contentProvider;
@@ -510,7 +510,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 		if (partModel instanceof IEditorModel) {
 			// Check if we can use IEditorModel
 			if (multiEditorManager == null) {
-				throw new IllegalArgumentException("Container can't accept IEditorModel as no IMultiEditorManager is set. Please set a IMultiEditorManager.");
+				throw new IllegalArgumentException("Container can't accept IEditorModel as no IMultiEditorManager is set. Please set a IMultiEditorManager."); //$NON-NLS-1$
 			}
 
 			return new EditorPart(parent, (IEditorModel) partModel, rawModel, multiEditorManager);
@@ -521,7 +521,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 		}
 
 		// TODO return a default part showing an error instead.
-		throw new IllegalArgumentException("No Part found for the model '" + rawModel + "'");
+		throw new IllegalArgumentException("No Part found for the model '" + rawModel + "'"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
@@ -711,7 +711,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 				isRefreshing.set(false);
 			}
 		} else {
-			log.warn("refresh inside refresh !");
+			log.warn("refresh inside refresh !"); //$NON-NLS-1$
 		}
 
 	}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java
index b2f899c0d74..9b719e83c8a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java
@@ -52,10 +52,10 @@ public class ShowPartStatusVisitor extends PartVisitor {
 		}
 
 		for (int i = 0; i < level - 1; i++) {
-			System.out.print("|   ");
+			System.out.print("|   "); //$NON-NLS-1$
 		}
 		// last segment
-		System.out.print("+ ");
+		System.out.print("+ "); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderPart.java
index 309dd045c85..3fd2e273ec1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderPart.java
@@ -1109,7 +1109,7 @@ public class TabFolderPart extends AbstractTabFolderPart implements IFolder {
 	 */
 	private PagePart createErrorPage() {
 		// Handle invalid tab case. Improve robustness.
-		Activator.log.warn("Error: the SashWindowContainer returned an invalid tab");
+		Activator.log.warn("Error: the SashWindowContainer returned an invalid tab"); //$NON-NLS-1$
 		return new ErrorComponentPart(this);
 	}
 
@@ -1120,33 +1120,33 @@ public class TabFolderPart extends AbstractTabFolderPart implements IFolder {
 	 * @param msg
 	 */
 	private void showTabs(String msg) {
-		System.out.println("------- " + msg);
+		System.out.println("------- " + msg); //$NON-NLS-1$
 		// Show items
 		CTabFolder folder = getTabFolder();
 		CTabItem items[] = folder.getItems();
-		System.out.printf("sel.index %2d :\n", folder.getSelectionIndex());
-		System.out.printf("items %2d :", folder.getItemCount());
+		System.out.printf("sel.index %2d :\n", folder.getSelectionIndex()); //$NON-NLS-1$
+		System.out.printf("items %2d :", folder.getItemCount()); //$NON-NLS-1$
 		for (CTabItem item : items) {
-			System.out.printf("%10s |", item.getControl());
+			System.out.printf("%10s |", item.getControl()); //$NON-NLS-1$
 		}
 		System.out.println();
 
-		System.out.printf("it.dispose:");
+		System.out.printf("it.dispose:"); //$NON-NLS-1$
 		for (CTabItem item : items) {
-			System.out.printf("%10b |", item.getControl().isDisposed());
+			System.out.printf("%10b |", item.getControl().isDisposed()); //$NON-NLS-1$
 		}
 		System.out.println();
 
-		System.out.printf("it.ctrl.vis:");
+		System.out.printf("it.ctrl.vis:"); //$NON-NLS-1$
 		for (CTabItem item : items) {
-			System.out.printf("%10s |", item.getControl().isVisible());
+			System.out.printf("%10s |", item.getControl().isVisible()); //$NON-NLS-1$
 		}
 		System.out.println();
 
 		//
-		System.out.printf("it.ctrl   :");
+		System.out.printf("it.ctrl   :"); //$NON-NLS-1$
 		for (CTabItem item : items) {
-			System.out.printf("%10s |", item.getControl());
+			System.out.printf("%10s |", item.getControl()); //$NON-NLS-1$
 		}
 		System.out.println();
 
@@ -1167,9 +1167,9 @@ public class TabFolderPart extends AbstractTabFolderPart implements IFolder {
 		// System.out.println();
 
 		//
-		System.out.printf("tabs %2d :", currentTabItems.size());
+		System.out.printf("tabs %2d :", currentTabItems.size()); //$NON-NLS-1$
 		for (TabItemPart tab : currentTabItems) {
-			System.out.printf("%10s |", tab);
+			System.out.printf("%10s |", tab); //$NON-NLS-1$
 		}
 		System.out.println();
 
@@ -1186,7 +1186,7 @@ public class TabFolderPart extends AbstractTabFolderPart implements IFolder {
 		// + ", " + this);
 
 		CTabFolder ctrl = getTabFolder();
-		System.out.printf("tabfolder[%2d]: disposed=%-5b, visible=%-5b, garbState=%-10s, %s\n", currentTabItems.size(), ctrl.isDisposed(), (ctrl.isDisposed() ? false : getTabFolder().isVisible()), garbageState, this);
+		System.out.printf("tabfolder[%2d]: disposed=%-5b, visible=%-5b, garbState=%-10s, %s\n", currentTabItems.size(), ctrl.isDisposed(), (ctrl.isDisposed() ? false : getTabFolder().isVisible()), garbageState, this); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java
index 607760b3a39..7a90417d890 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java
@@ -224,7 +224,7 @@ public class TabItemPart {
 	 */
 	private void setTabText(String title) {
 		if (title == null) {
-			title = "";
+			title = ""; //$NON-NLS-1$
 		}
 		control.setText(title);
 		control.setToolTipText(title);
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java
index fc7be828ce8..a0fccb51663 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;
 
 
@@ -7,10 +22,10 @@ public interface ITabTooltipPreferences {
 	/**
 	 * Constant used in Eclipse preferences
 	 */
-	public String isTooltipEnable = "isTooltipEnable";
-	public String isTooltipForCurrentTabShown = "isTooltipForCurrentTabShown";
-	public String scaledFactor = "scaledFactor";
-	public String tooltipAutoCloseDelay = "tooltipAutoCloseDelay";
+	public String isTooltipEnable = "isTooltipEnable"; //$NON-NLS-1$
+	public String isTooltipForCurrentTabShown = "isTooltipForCurrentTabShown"; //$NON-NLS-1$
+	public String scaledFactor = "scaledFactor"; //$NON-NLS-1$
+	public String tooltipAutoCloseDelay = "tooltipAutoCloseDelay"; //$NON-NLS-1$
 
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java
index 91e374c866d..2c8341a2bd2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;
 
 import org.eclipse.core.commands.AbstractHandler;
@@ -39,11 +51,11 @@ public class ShowPreferencesHandler extends AbstractHandler implements IHandler
 
 	private void showPreferences(ITabTooltipPreferences settings) {
 
-		System.out.println(ITabTooltipPreferences.isTooltipEnable + "=" + settings.isTooltipEnable());
-		System.out.println(ITabTooltipPreferences.isTooltipForCurrentTabShown + "=" + settings.isTooltipForCurrentTabShown());
-		System.out.println(ITabTooltipPreferences.scaledFactor + "=" + settings.getScaledFactor());
-		System.out.println(ITabTooltipPreferences.scaledFactor + "(int)=" + settings.getIntScaledFactor());
-		System.out.println(ITabTooltipPreferences.tooltipAutoCloseDelay + "=" + settings.getTooltipAutoCloseDelay());
+		System.out.println(ITabTooltipPreferences.isTooltipEnable + "=" + settings.isTooltipEnable()); //$NON-NLS-1$
+		System.out.println(ITabTooltipPreferences.isTooltipForCurrentTabShown + "=" + settings.isTooltipForCurrentTabShown()); //$NON-NLS-1$
+		System.out.println(ITabTooltipPreferences.scaledFactor + "=" + settings.getScaledFactor()); //$NON-NLS-1$
+		System.out.println(ITabTooltipPreferences.scaledFactor + "(int)=" + settings.getIntScaledFactor()); //$NON-NLS-1$
+		System.out.println(ITabTooltipPreferences.tooltipAutoCloseDelay + "=" + settings.getTooltipAutoCloseDelay()); //$NON-NLS-1$
 
 	}
 
@@ -54,7 +66,7 @@ public class ShowPreferencesHandler extends AbstractHandler implements IHandler
 	 * @return The command name to show.
 	 */
 	public String getCommandName() {
-		return "Read Preferences";
+		return "Read Preferences"; //$NON-NLS-1$
 	}
 
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferencePage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferencePage.java
index 06e0e34ae60..c296c1ee401 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferencePage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferencePage.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;
 
 import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -7,6 +22,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.jface.preference.ScaleFieldEditor;
 import org.eclipse.papyrus.infra.core.sasheditor.Activator;
+import org.eclipse.papyrus.infra.core.sasheditor.messages.Messages;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
@@ -30,7 +46,7 @@ public class TabTooltipPreferencePage extends FieldEditorPreferencePage implemen
 		// IPreferenceStore store = new ScopedPreferenceStore(new InstanceScope(), Activator.getDefault().getBundle().getSymbolicName());
 		IPreferenceStore store = createPreferenceStore();
 		setPreferenceStore(store);
-		setDescription("SashWindows Tabs Tooltip Preferences");
+		setDescription(Messages.TabTooltipPreferencePage_SashWindowsTabsTooltipPreferencePageName);
 
 	}
 
@@ -54,13 +70,13 @@ public class TabTooltipPreferencePage extends FieldEditorPreferencePage implemen
 	 */
 	@Override
 	public void createFieldEditors() {
-		addField(new BooleanFieldEditor(ITabTooltipPreferences.isTooltipEnable, "Is Tooltip &Enable", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(ITabTooltipPreferences.isTooltipEnable, Messages.TabTooltipPreferencePage_IsTooltipEnable, getFieldEditorParent()));
 
-		addField(new BooleanFieldEditor(ITabTooltipPreferences.isTooltipForCurrentTabShown, "Is Tooltip For &Current Tab Shown", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(ITabTooltipPreferences.isTooltipForCurrentTabShown, Messages.TabTooltipPreferencePage_IsTooltipForCurrentTabShown, getFieldEditorParent()));
 
-		addField(new IntegerFieldEditor(ITabTooltipPreferences.tooltipAutoCloseDelay, "Auto Close &Delay (in ms)", getFieldEditorParent(), 10));
+		addField(new IntegerFieldEditor(ITabTooltipPreferences.tooltipAutoCloseDelay, Messages.TabTooltipPreferencePage_AutoCloseAndDelay, getFieldEditorParent(), 10));
 
-		addField(new ScaleFieldEditor(ITabTooltipPreferences.scaledFactor, "Tooltip &Scale", getFieldEditorParent(), 0, 100, 1, 10));
+		addField(new ScaleFieldEditor(ITabTooltipPreferences.scaledFactor, Messages.TabTooltipPreferencePage_TooltipScale, getFieldEditorParent(), 0, 100, 1, 10));
 
 	}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java
index c206a0c7467..15c7436d7f7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java
@@ -1,6 +1,18 @@
-/**
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST, LIFL.
  *
- */
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;
 
 import org.eclipse.core.runtime.preferences.InstanceScope;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/messages/Messages.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/messages/Messages.java
new file mode 100755
index 00000000000..762bca8d442
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/messages/Messages.java
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (c) 2018 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author VL222926
+ *
+ */
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.core.sasheditor.messages.messages"; //$NON-NLS-1$
+	public static String ErrorComponentPart_InvalidTab;
+	public static String TabTooltipPreferencePage_AutoCloseAndDelay;
+	public static String TabTooltipPreferencePage_IsTooltipEnable;
+	public static String TabTooltipPreferencePage_IsTooltipForCurrentTabShown;
+	public static String TabTooltipPreferencePage_SashWindowsTabsTooltipPreferencePageName;
+	public static String TabTooltipPreferencePage_TooltipScale;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/messages/messages.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/messages/messages.properties
new file mode 100755
index 00000000000..0d262c43e98
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/messages/messages.properties
@@ -0,0 +1,6 @@
+ErrorComponentPart_InvalidTab=Invalid tab
+TabTooltipPreferencePage_AutoCloseAndDelay=Auto Close &Delay (in ms)
+TabTooltipPreferencePage_IsTooltipEnable=Is Tooltip &Enable
+TabTooltipPreferencePage_IsTooltipForCurrentTabShown=Is Tooltip For &Current Tab Shown
+TabTooltipPreferencePage_SashWindowsTabsTooltipPreferencePageName=SashWindows Tabs Tooltip Preferences
+TabTooltipPreferencePage_TooltipScale=Tooltip &Scale
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java
index 5cf339c79e2..b3e969ed45c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java
@@ -186,7 +186,7 @@ public abstract class MultiPageEditor extends MultiPageEditorPart {
 		} catch (PartInitException e) {
 			ErrorDialog.openError(
 					getSite().getShell(),
-					"Error creating nested text editor",
+					"Error creating nested text editor", //$NON-NLS-1$
 					null,
 					e.getStatus());
 			return -1;
@@ -373,7 +373,7 @@ public abstract class MultiPageEditor extends MultiPageEditorPart {
 		// Check if an editor already exists
 		if (tabExistsFor(tabItem)) {
 			if (Activator.log.isDebugEnabled()) {
-				Activator.log.debug("Editor already exists for '" + tabItem + "'");
+				Activator.log.debug("Editor already exists for '" + tabItem + "'"); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			return;
 		}
@@ -384,7 +384,7 @@ public abstract class MultiPageEditor extends MultiPageEditorPart {
 		} else if (tabItem instanceof IComponentModel) {
 			editorIndex = addPage((IComponentModel) tabItem);
 		} else {
-			System.err.println("Can't create page for model '" + tabItem + "'. Skipp it.");
+			System.err.println("Can't create page for model '" + tabItem + "'. Skipp it."); //$NON-NLS-1$ //$NON-NLS-2$
 			return;
 		}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml
index ff5ffe26ffd..b4516846e27 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java
index f2123330cbd..423e622417d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java
@@ -197,18 +197,18 @@ public class DiUtils {
 
 		// Check parameters
 		if (pageRef == null || pageRef.getPageIdentifier() == null) {
-			throw new SashEditorException("Unable to add the page to the tab folder: parameters are null");
+			throw new SashEditorException("Unable to add the page to the tab folder: parameters are null"); //$NON-NLS-1$
 		}
 
 		SashModel sashModel = windowsMngr.getSashModel();
 		if (sashModel == null) {
-			throw new SashEditorException("Unable to add the page to the tab folder: can't find SashModel");
+			throw new SashEditorException("Unable to add the page to the tab folder: can't find SashModel"); //$NON-NLS-1$
 		}
 
 		// Get the currently active folder in order to add the page.
 		TabFolder tabFolder = sashModel.getCurrentSelection();
 		if (tabFolder == null) {
-			throw new SashEditorException("Unable to add the page to the tab folder: No active folder");
+			throw new SashEditorException("Unable to add the page to the tab folder: No active folder"); //$NON-NLS-1$
 		}
 
 		tabFolder.addPage(pageRef.getPageIdentifier());