Bug 540879: [Properties] Clean code of Observable and neighbours classes

  - oep.infra.emf.appearance plugin now use java 1.8
  - fix some pom.xml files
  - add some non-nls marker
  - remove some possible NPE

Change-Id: I68ad6b1384871438979c101dcc85b3f79994f9fd
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>

20 files changed, 66 insertions, 34 deletions

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath
index 64c5e31b7a2..eca7bdba8f0 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs
index 15d5f917b9c..74c6d08d7e4 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,16 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF
index 6497ee897ce..44a023391c1 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.infra.emf.appearance.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.appearance;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.papyrus.infra.emf.appearance
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
index 0ba1a6c3e23..720b0a25eca 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
 		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetLayoutKindCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetLayoutKindCommand.java
index eda486e1d4f..476259dd57d 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetLayoutKindCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetLayoutKindCommand.java
@@ -41,7 +41,7 @@ public class SetLayoutKindCommand extends CreateEAnnotationCommand {
 	 */
 	public SetLayoutKindCommand(TransactionalEditingDomain domain, EModelElement object, String layoutKind) {
 		super(domain, object, VisualInformationPapyrusConstants.LAYOUTFIGURE);
-		this.layoutKind = "" + layoutKind;
+		this.layoutKind = layoutKind;
 	}
 
 	/**
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetNameLabelIconCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetNameLabelIconCommand.java
index 1c8f1bbd11f..c3e59552fec 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetNameLabelIconCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetNameLabelIconCommand.java
@@ -41,7 +41,7 @@ public class SetNameLabelIconCommand extends CreateEAnnotationCommand {
 	 */
 	public SetNameLabelIconCommand(TransactionalEditingDomain domain, EModelElement object, boolean displayIcon) {
 		super(domain, object, VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON);
-		this.displayIcon = "" + displayIcon;
+		this.displayIcon = String.valueOf(displayIcon);
 	}
 
 	/**
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetQualifiedNameDepthCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetQualifiedNameDepthCommand.java
index 12f8759bee8..53e75c0f19b 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetQualifiedNameDepthCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetQualifiedNameDepthCommand.java
@@ -41,7 +41,7 @@ public class SetQualifiedNameDepthCommand extends CreateEAnnotationCommand {
 	 */
 	public SetQualifiedNameDepthCommand(TransactionalEditingDomain domain, EModelElement object, int depth) {
 		super(domain, object, VisualInformationPapyrusConstants.QUALIFIED_NAME);
-		this.qualifiedNamedepth = "" + depth;
+		this.qualifiedNamedepth = String.valueOf(depth);
 	}
 
 	/**
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetShadowFigureCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetShadowFigureCommand.java
index 71d43d53582..d5d20875b17 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetShadowFigureCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetShadowFigureCommand.java
@@ -41,7 +41,7 @@ public class SetShadowFigureCommand extends CreateEAnnotationCommand {
 	 */
 	public SetShadowFigureCommand(TransactionalEditingDomain domain, EModelElement object, boolean shadow) {
 		super(domain, object, VisualInformationPapyrusConstants.SHADOWFIGURE);
-		this.shadowFigure = "" + shadow;
+		this.shadowFigure = String.valueOf(shadow);
 	}
 
 	/**
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/AppearanceHelper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/AppearanceHelper.java
index fcbc804109e..1a408fa9b84 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/AppearanceHelper.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/AppearanceHelper.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.infra.emf.appearance.style.AppearanceStyleProvider;
 
 public class AppearanceHelper {
 
-	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".styleProvider";
+	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".styleProvider"; //$NON-NLS-1$
 
 	private static AppearanceStyleProvider styleProvider = findStyleProvider();
 
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/VisualInformationPapyrusConstants.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/VisualInformationPapyrusConstants.java
index 9c846a59707..6c88acc6c75 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/VisualInformationPapyrusConstants.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/VisualInformationPapyrusConstants.java
@@ -17,22 +17,22 @@ package org.eclipse.papyrus.infra.emf.appearance.helper;
 public interface VisualInformationPapyrusConstants {
 
 	/** The qualified name. */
-	public static String QUALIFIED_NAME = "QualifiedName";
+	public static String QUALIFIED_NAME = "QualifiedName"; //$NON-NLS-1$
 
 	/** The qualified name depth. */
-	public static String QUALIFIED_NAME_DEPTH = "QualifiedNameDepth";
+	public static String QUALIFIED_NAME_DEPTH = "QualifiedNameDepth"; //$NON-NLS-1$
 
-	public static String SHADOWFIGURE = "ShadowFigure";
+	public static String SHADOWFIGURE = "ShadowFigure"; //$NON-NLS-1$
 
-	public static String SHADOWFIGURE_VALUE = "ShadowFigure_Value";
+	public static String SHADOWFIGURE_VALUE = "ShadowFigure_Value"; //$NON-NLS-1$
 
-	public static String DISPLAY_NAMELABELICON = "displayNameLabelIcon";
+	public static String DISPLAY_NAMELABELICON = "displayNameLabelIcon"; //$NON-NLS-1$
 
-	public static String DISPLAY_NAMELABELICON_VALUE = "displayNameLabelIcon_value";
+	public static String DISPLAY_NAMELABELICON_VALUE = "displayNameLabelIcon_value"; //$NON-NLS-1$
 
-	public static String LAYOUTFIGURE = "layoutFigure";
+	public static String LAYOUTFIGURE = "layoutFigure"; //$NON-NLS-1$
 
-	public static String LAYOUTFIGURE_VALUE = "layoutFigure_value";
+	public static String LAYOUTFIGURE_VALUE = "layoutFigure_value"; //$NON-NLS-1$
 
 	/**
 	 * key for the appearance of properties or other specific display
@@ -40,21 +40,21 @@ public interface VisualInformationPapyrusConstants {
 	 * @deprecated Use a StringListValueStyle instead. See {{@link #CUSTOM_MASK_LABEL}
 	 */
 	@Deprecated
-	public static final String CUSTOM_APPEARENCE_ANNOTATION = "CustomAppearance_Annotation";
+	public static final String CUSTOM_APPEARENCE_ANNOTATION = "CustomAppearance_Annotation"; //$NON-NLS-1$
 
 	/**
 	 * The name of the StringListValueStyle used for storing MaskLabels
 	 *
 	 * Replaces the former int-based EAnnotation ({@link #CUSTOM_APPEARENCE_ANNOTATION}, {@link #CUSTOM_APPEARANCE_MASK_VALUE})
 	 */
-	public static final String CUSTOM_MASK_LABEL = "maskLabel";
+	public static final String CUSTOM_MASK_LABEL = "maskLabel"; //$NON-NLS-1$
 
 	/**
 	 * this is a key of eAnnnotation that contains hypertext link or referenced document
 	 **/
-	public static final String HYPERLINK_DIAGRAM = "PapyrusHyperLink_Diagram";
+	public static final String HYPERLINK_DIAGRAM = "PapyrusHyperLink_Diagram"; //$NON-NLS-1$
 
-	public static final String HYPERLINK_DIAGRAM_NAME = "diagram_name";
+	public static final String HYPERLINK_DIAGRAM_NAME = "diagram_name"; //$NON-NLS-1$
 
 	/**
 	 * key for the appearance of properties or other specific display
@@ -62,5 +62,5 @@ public interface VisualInformationPapyrusConstants {
 	 * @deprecated Use a StringListValueStyle instead. See {{@link #CUSTOM_MASK_LABEL}
 	 */
 	@Deprecated
-	public static final String CUSTOM_APPEARANCE_MASK_VALUE = "CustomAppearance_MaskValue";
+	public static final String CUSTOM_APPEARANCE_MASK_VALUE = "CustomAppearance_MaskValue"; //$NON-NLS-1$
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
index f060d90a431..3a1e20307a3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
 	    <groupId>org.eclipse.papyrus</groupId>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableValue.java
index 53880fc4533..0b7ee484319 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableValue.java
@@ -46,6 +46,6 @@ public class CustomBooleanStyleObservableValue extends AbstractCustomStyleObserv
 		if (value instanceof Boolean) {
 			return super.getCommand(value);
 		}
-		throw new IllegalArgumentException("The value " + value + " is not a valid Boolean Value");
+		throw new IllegalArgumentException(String.format("The value %s is not a valid Boolean Value", value == null ? "null" : value.toString())); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleObservableValue.java
index 1b98ea31d09..f8d84bcfd1f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleObservableValue.java
@@ -10,7 +10,7 @@
  *
  * Contributors:
  * 	Fanch BONNABESSE (ALL4TEC) fanch.bonnabesse@all4tec.net - Initial API and implementation
- *  
+ *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;
 
@@ -25,6 +25,7 @@ import org.eclipse.gmf.runtime.notation.View;
 /**
  *
  * Implementation for an ObservableValue associated to a GMF custom style (DoubleValueStyle).
+ *
  * @since 3.0
  *
  */
@@ -36,7 +37,7 @@ public class CustomDoubleStyleObservableValue extends AbstractCustomStyleObserva
 	private final static double DEFAULT_VALUE = 0.0;
 
 	/**
-	 * 
+	 *
 	 * Constructor.
 	 *
 	 * @param source
@@ -85,6 +86,6 @@ public class CustomDoubleStyleObservableValue extends AbstractCustomStyleObserva
 			BigDecimal number = new BigDecimal((Float) value);
 			return super.getCommand(number.doubleValue());
 		}
-		throw new IllegalArgumentException("The value " + value + " is not a valid Double Value"); //$NON-NLS-1$ //$NON-NLS-2$
+		throw new IllegalArgumentException(String.format("The value %s is not a valid Double Value", value == null ? "null" : value.toString())); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableValue.java
index 034102a9969..79bfc374a20 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableValue.java
@@ -47,6 +47,6 @@ public class CustomEObjectStyleObservableValue extends AbstractCustomStyleObserv
 		if (value instanceof EObject) {
 			return super.getCommand(value);
 		}
-		throw new IllegalArgumentException("The value " + value + " is not a valid EObject Value");
+		throw new IllegalArgumentException(String.format("The value %s is not a valid EObject Value", value == null ? "null" : value.toString())); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableValue.java
index d7019348dd3..1435025c9c0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableValue.java
@@ -46,6 +46,6 @@ public class CustomIntStyleObservableValue extends AbstractCustomStyleObservable
 		if (value instanceof Integer) {
 			return super.getCommand(value);
 		}
-		throw new IllegalArgumentException("The value " + value + " is not a valid Integer Value");
+		throw new IllegalArgumentException(String.format("The value %s is not a valid Integer Value", value == null ? "null" : value.toString())); //$NON-NLS-1$ //$NON-NLS-2$ s
 	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableValue.java
index 1df00e27f3c..8ec8ded06dc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableValue.java
@@ -46,6 +46,6 @@ public class CustomStringStyleObservableValue extends AbstractCustomStyleObserva
 		if (value instanceof String) {
 			return super.getCommand(value);
 		}
-		throw new IllegalArgumentException("The value " + value + " is not a valid String Value");
+		throw new IllegalArgumentException(String.format("The value %s is not a valid String Value", value == null ? "null" : value.toString())); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java
index 651dfb4d955..1bc4de65bb4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java
@@ -1,3 +1,17 @@
+/*****************************************************************************
+ * Copyright (c) 2013 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
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;
 
 import org.eclipse.core.databinding.observable.value.ValueDiff;
@@ -33,6 +47,7 @@ public class DoubleDiagramViewObservaleValue extends AbstractDiagramPreferencesO
 	 *
 	 * @return
 	 */
+	@Override
 	public final Object getValueType() {
 		return EcorePackage.eINSTANCE.getEFloat();
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java
index 4bf1cec5f3a..980ce299b06 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java
@@ -1,3 +1,17 @@
+/*****************************************************************************
+ * Copyright (c) 2013 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
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;
 
 import java.text.NumberFormat;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableList.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableList.java
index f809145b6c9..e7365290ac3 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableList.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableList.java
@@ -87,7 +87,7 @@ public class PapyrusObservableList extends EMFObservableList {
 			return commandWrapper.apply(provider.getEditCommand(requests.iterator().next()));
 		}
 
-		CompositeCommand cc = new CompositeCommand("Edit list");
+		CompositeCommand cc = new CompositeCommand("Edit list"); //$NON-NLS-1$
 
 		for (IEditCommandRequest request : requests) {
 			ICommand cmd = provider.getEditCommand(request);
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java
index 77cd487defa..520d856a4a2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java
@@ -117,7 +117,7 @@ public class PapyrusObservableValue extends EMFObservableValue implements Aggreg
 			IElementEditService provider = ElementEditServiceUtils.getCommandProvider((EObject)getObserved());
 
 			if (provider != null) {
-				CompositeCommand cc = new CompositeCommand("Edit value");
+				CompositeCommand cc = new CompositeCommand("Edit value"); //$NON-NLS-1$
 
 				if (oldValue instanceof EObject && eStructuralFeature instanceof EReference && ((EReference) eStructuralFeature).isContainment()) {
 					cc.add(provider.getEditCommand(new DestroyElementRequest((TransactionalEditingDomain) domain, (EObject) oldValue, false)));