diff options
author | Vincent Lorenzo | 2018-11-05 14:53:19 +0000 |
---|---|---|
committer | Patrick Tessier | 2018-11-27 09:37:56 +0000 |
commit | 67608342c715324e60e646f6ed9b62c3f4ffd8d8 (patch) | |
tree | 8c1e932a4122fb243260f5402e06de1eaed0ed18 /plugins/infra/emf | |
parent | df37716b50a1de5ce5123801ce6e584ad10a26f0 (diff) | |
download | org.eclipse.papyrus-67608342c715324e60e646f6ed9b62c3f4ffd8d8.tar.gz org.eclipse.papyrus-67608342c715324e60e646f6ed9b62c3f4ffd8d8.tar.xz org.eclipse.papyrus-67608342c715324e60e646f6ed9b62c3f4ffd8d8.zip |
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>
Diffstat (limited to 'plugins/infra/emf')
10 files changed, 25 insertions, 24 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$ } |