Bug 528895 - [Quality] Field modifier should follow convention order

 - use correct order for field modifier
 - add missing header
 - replace C<>line by Celine

Change-Id: I2608484da46215dbd65a1e85d47d0aa7706feb58
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

18 files changed, 57 insertions, 57 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java
index 11c7140f831..ead6a262757 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;
 public class PasteRequest extends Request {
 
 	/** The Constant REQ_PAPYRUS_PASTE. */
-	public final static String REQ_PAPYRUS_PASTE = "Papyrus_PASTE"; //$NON-NLS-1$
+	public static final String REQ_PAPYRUS_PASTE = "Papyrus_PASTE"; //$NON-NLS-1$
 
 	/** The element to paste. */
 	protected Collection elementToPaste;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
index 9810d54c940..949b9ab93f3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - support pluggable edit-part conflict detection (CDO)
- *  C�line Janssens (ALL4TEC) - Override getDragTracker with the PapyrusRubberbandDragTracker
+ *  Celine Janssens (ALL4TEC) - Override getDragTracker with the PapyrusRubberbandDragTracker
  *  Christian W. Damus - bugs 451230, 461629, 501946
  *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - add refresh of SVGPostProcessor - Bug 467569
  *
@@ -53,7 +53,7 @@ public class PapyrusDiagramEditPart extends DiagramEditPart {
 	/**
 	 * Id of the right clic button
 	 */
-	public final static int RIGHT_MOUSE_BUTTON = 3;
+	public static final int RIGHT_MOUSE_BUTTON = 3;
 
 	public PapyrusDiagramEditPart(View diagramView) {
 		super(diagramView);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java
index 212591c2766..2e79ca9f456 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java
@@ -49,7 +49,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.utils.NamedStyleProperties;
 public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPart {
 
 	/** Title of this compartment */
-	public final static String COMPARTMENT_NAME = "symbol"; // $NON-NLS-1$
+	public static final String COMPARTMENT_NAME = "symbol"; // $NON-NLS-1$
 
 	/**
 	 * Creates a new ShapeDisplayCompartmentEditPart
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java
index 306b014a6c4..c2b3853d5d6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java
@@ -59,7 +59,7 @@ public class BorderDisplayEditPolicy extends GraphicalEditPolicyEx implements IC
 	private static final int DEFAULT_LENGTH_VALUE = -1;
 
 	/** key for this edit policy. */
-	public final static String BORDER_DISPLAY_EDITPOLICY = "BORDER_DISPLAY_EDITPOLICY";//$NON-NLS-1$
+	public static final String BORDER_DISPLAY_EDITPOLICY = "BORDER_DISPLAY_EDITPOLICY";//$NON-NLS-1$
 
 	/** The style observable. */
 	protected IObservableValue styleObservable;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java
index d70f8854345..2bc5a459fd5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java
@@ -33,7 +33,7 @@ public class FollowSVGSymbolEditPolicy extends GraphicalEditPolicy implements IC
 	public static final String FOLLOW_SVG_SYMBOL = "followSVGSymbol";
 
 	/** key for this edit policy */
-	public final static String FOLLOW_SVG_SYMBOL_EDITPOLICY = "followSVGSymbolEditPolicy";
+	public static final String FOLLOW_SVG_SYMBOL_EDITPOLICY = "followSVGSymbolEditPolicy";
 
 	protected IObservableValue styleObservable;
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/MaintainSymbolRatioEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/MaintainSymbolRatioEditPolicy.java
index 247a2ad4ca9..4eef2a8a02a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/MaintainSymbolRatioEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/MaintainSymbolRatioEditPolicy.java
@@ -32,7 +32,7 @@ public class MaintainSymbolRatioEditPolicy extends GraphicalEditPolicy implement
 	public static final String MAINTAIN_SYMBOL_RATIO = "maintainSymbolRatio";
 
 	/** key for this edit policy */
-	public final static String MAINTAIN_SYMBOL_RATIO_EDITPOLICY = "MAINTAIN_SYMBOL_RATIO_EDITPOLICY";
+	public static final String MAINTAIN_SYMBOL_RATIO_EDITPOLICY = "MAINTAIN_SYMBOL_RATIO_EDITPOLICY";
 
 	protected IObservableValue styleObservable;
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NameDisplayEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NameDisplayEditPolicy.java
index 838887258b4..a0946e77b4b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NameDisplayEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NameDisplayEditPolicy.java
@@ -32,7 +32,7 @@ public class NameDisplayEditPolicy extends GraphicalEditPolicy implements IChang
 	public static final String DISPLAY_NAME = "displayName";
 
 	/** key for this edit policy */
-	public final static String NAME_DISPLAY_EDITPOLICY = "NAME_DISPLAY_EDITPOLICY";
+	public static final String NAME_DISPLAY_EDITPOLICY = "NAME_DISPLAY_EDITPOLICY";
 
 	protected IObservableValue styleObservable;
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/RefreshTextAlignmentEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/RefreshTextAlignmentEditPolicy.java
index d4692227a36..8714c152249 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/RefreshTextAlignmentEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/RefreshTextAlignmentEditPolicy.java
@@ -33,7 +33,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 public class RefreshTextAlignmentEditPolicy extends GraphicalEditPolicyEx implements IChangeListener {
 
 	/** key for this edit policy. */
-	public final static String REFRESH_TEXT_ALIGNMENT_EDITPOLICY = "Refresh text alignment edit policy";//$NON-NLS-N$
+	public static final String REFRESH_TEXT_ALIGNMENT_EDITPOLICY = "Refresh text alignment edit policy";//$NON-NLS-N$
 
 	/** The style observable. */
 	protected IObservableValue styleObservable;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java
index c02146228d2..6f42cbac05b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java
@@ -41,7 +41,7 @@ import org.eclipse.swt.widgets.Display;
 public class ShapeCompartmentEditPolicy extends GraphicalEditPolicy implements AutomaticNotationEditPolicy, NotificationListener, IPapyrusListener {
 
 	/** constant for this edit policy role */
-	public final static String SHAPE_COMPARTMENT_EDIT_POLICY = "ShapeCompartmentEditPolicy"; //$NON-NLS-1$
+	public static final String SHAPE_COMPARTMENT_EDIT_POLICY = "ShapeCompartmentEditPolicy"; //$NON-NLS-1$
 
 	/** manager for notifications: should the compartment react to the notification? */
 	protected NotificationManager notificationManager;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java
index 7d87a3a031d..0b61105bbcc 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java
@@ -9,7 +9,7 @@
  *
  * Contributors:
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *  C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154
+ *  Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.helper;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PastePreferencesPage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PastePreferencesPage.java
index 983611fbe95..b4e34a553da 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PastePreferencesPage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PastePreferencesPage.java
@@ -32,7 +32,7 @@ public class PastePreferencesPage extends FieldEditorPreferencePage implements I
 	/**
 	 * Keep the references
 	 */
-	public final static String KEEP_EXTERNAL_REFERENCES = "KEEP_EXTERNAL_REFERENCES"; //$NON-NLS-1$
+	public static final String KEEP_EXTERNAL_REFERENCES = "KEEP_EXTERNAL_REFERENCES"; //$NON-NLS-1$
 
 	/**
 	 * Editor for managing paste strategies
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java
index 65390b83014..7c561530905 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java
@@ -51,17 +51,17 @@ public class PreferencesConstantsHelper {
 	/**
 	 * Prefix for preference for Papyrus Level editor
 	 */
-	public final static String PAPYRUS_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_EDITOR"; //$NON-NLS-1$
+	public static final String PAPYRUS_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_EDITOR"; //$NON-NLS-1$
 
 	/**
 	 * Prefix for preference for Diagram Level
 	 */
-	public final static String DIAGRAM_PREFERENCE_PREFIX = "DIAGRAM_"; //$NON-NLS-1$
+	public static final String DIAGRAM_PREFERENCE_PREFIX = "DIAGRAM_"; //$NON-NLS-1$
 
 	/**
 	 * Prefix for preference for element Level
 	 */
-	public final static String DIAGRAM_ELEMENT = "ELEMENT_"; //$NON-NLS-1$
+	public static final String DIAGRAM_ELEMENT = "ELEMENT_"; //$NON-NLS-1$
 
 	private final static String COLOR = "color."; //$NON-NLS-1$
 
@@ -121,113 +121,113 @@ public class PreferencesConstantsHelper {
 
 	private final static String LOCATION_Y_CONSTANT = "location_y"; //$NON-NLS-1$
 
-	public final static String VIEW_RULERS_CONSTANT = WorkspaceViewerProperties.VIEWRULERS;
+	public static final String VIEW_RULERS_CONSTANT = WorkspaceViewerProperties.VIEWRULERS;
 
-	public final static String VIEW_GRID_CONSTANT = WorkspaceViewerProperties.VIEWGRID;
+	public static final String VIEW_GRID_CONSTANT = WorkspaceViewerProperties.VIEWGRID;
 
-	public final static String RULER_UNITS_CONSTANT = WorkspaceViewerProperties.RULERUNIT;
+	public static final String RULER_UNITS_CONSTANT = WorkspaceViewerProperties.RULERUNIT;
 
-	public final static String SNAP_TO_GRID_CONSTANT = WorkspaceViewerProperties.SNAPTOGRID;
+	public static final String SNAP_TO_GRID_CONSTANT = WorkspaceViewerProperties.SNAPTOGRID;
 
-	public final static String SNAP_TO_GEOMETRY_CONSTANT = WorkspaceViewerProperties.SNAPTOGEOMETRY;
+	public static final String SNAP_TO_GEOMETRY_CONSTANT = WorkspaceViewerProperties.SNAPTOGEOMETRY;
 
-	public final static String GRID_LINE_COLOR_CONSTANT = WorkspaceViewerProperties.GRIDLINECOLOR;
+	public static final String GRID_LINE_COLOR_CONSTANT = WorkspaceViewerProperties.GRIDLINECOLOR;
 
-	public final static String GRID_SPACING_CONSTANT = WorkspaceViewerProperties.GRIDSPACING;
+	public static final String GRID_SPACING_CONSTANT = WorkspaceViewerProperties.GRIDSPACING;
 
-	public final static String GRID_ORDER_CONSTANT = WorkspaceViewerProperties.GRIDORDER;
+	public static final String GRID_ORDER_CONSTANT = WorkspaceViewerProperties.GRIDORDER;
 
-	public final static String GRID_LINE_STYLE_CONSTANT = WorkspaceViewerProperties.GRIDLINESTYLE;
+	public static final String GRID_LINE_STYLE_CONSTANT = WorkspaceViewerProperties.GRIDLINESTYLE;
 
-	public final static String VIEW_PAGE_BREAK_CONSTANT = WorkspaceViewerProperties.VIEWPAGEBREAKS;
+	public static final String VIEW_PAGE_BREAK_CONSTANT = WorkspaceViewerProperties.VIEWPAGEBREAKS;
 
-	public final static String DRAW_CONNECTION_POINT_CONSTANT = "drawConnectionPoint"; //$NON-NLS-1$
+	public static final String DRAW_CONNECTION_POINT_CONSTANT = "drawConnectionPoint"; //$NON-NLS-1$
 
-	public final static String INVERT_BINDING_FOR_DEFAULT_RESIZE_AND_CONSTRAINED_RESIZE_CONSTANT = "invertBindingForDefaultResizeAndConstrainedResize"; //$NON-NLS-1$
+	public static final String INVERT_BINDING_FOR_DEFAULT_RESIZE_AND_CONSTRAINED_RESIZE_CONSTANT = "invertBindingForDefaultResizeAndConstrainedResize"; //$NON-NLS-1$
 
-	public final static String RESTORE_LINK_ELEMENT_CONSTANT = "restoreLinkElement"; //$NON-NLS-1$
+	public static final String RESTORE_LINK_ELEMENT_CONSTANT = "restoreLinkElement"; //$NON-NLS-1$
 
-	public final static String EXTERNAL_REFERENCE_STRATEGY_CONSTANT = "externalReferenceStrategy"; //$NON-NLS-1$
+	public static final String EXTERNAL_REFERENCE_STRATEGY_CONSTANT = "externalReferenceStrategy"; //$NON-NLS-1$
 	
 	/**
 	 * A preference of type COLOR FILL
 	 */
-	public final static int COLOR_FILL = 0;
+	public static final int COLOR_FILL = 0;
 
 	/**
 	 * A preference of type FONT
 	 */
-	public final static int FONT = COLOR_FILL + 1;
+	public static final int FONT = COLOR_FILL + 1;
 
 	/**
 	 * A preference of type COLOR FONT
 	 */
-	public final static int COLOR_FONT = FONT + 1;
+	public static final int COLOR_FONT = FONT + 1;
 
 	/**
 	 * A preference of type COLOR LINE
 	 */
-	public final static int COLOR_LINE = COLOR_FONT + 1;
+	public static final int COLOR_LINE = COLOR_FONT + 1;
 
 	/**
 	 * A preference of type COLOR GRADIENT
 	 */
-	public final static int COLOR_GRADIENT = COLOR_LINE + 1;
+	public static final int COLOR_GRADIENT = COLOR_LINE + 1;
 
 	/**
 	 * A preference of type GRADIENT POLICY
 	 */
-	public final static int GRADIENT_POLICY = COLOR_GRADIENT + 1;
+	public static final int GRADIENT_POLICY = COLOR_GRADIENT + 1;
 
 	/**
 	 * A preference of type JUMPLINK STATUS
 	 */
-	public final static int JUMPLINK_STATUS = GRADIENT_POLICY + 1;
+	public static final int JUMPLINK_STATUS = GRADIENT_POLICY + 1;
 
 	/**
 	 * A preference of type JUMPLINK REVERSE
 	 */
-	public final static int JUMPLINK_REVERSE = JUMPLINK_STATUS + 1;
+	public static final int JUMPLINK_REVERSE = JUMPLINK_STATUS + 1;
 
 	/**
 	 * A preference of type JUMPLINK TYPE
 	 */
-	public final static int JUMPLINK_TYPE = JUMPLINK_REVERSE + 1;
+	public static final int JUMPLINK_TYPE = JUMPLINK_REVERSE + 1;
 
 	/**
 	 * A preference of type ROUTING POLICY DISTANCE
 	 */
-	public final static int ROUTING_POLICY_DISTANCE = JUMPLINK_TYPE + 1;
+	public static final int ROUTING_POLICY_DISTANCE = JUMPLINK_TYPE + 1;
 
 	/**
 	 * A preference of type ROUTING POLICY OBSTRUCTION
 	 */
-	public final static int ROUTING_POLICY_OBSTRUCTION = ROUTING_POLICY_DISTANCE + 1;
+	public static final int ROUTING_POLICY_OBSTRUCTION = ROUTING_POLICY_DISTANCE + 1;
 
 	/**
 	 * A preference of type ROUTING STYLE
 	 */
-	public final static int ROUTING_STYLE = ROUTING_POLICY_OBSTRUCTION + 1;
+	public static final int ROUTING_STYLE = ROUTING_POLICY_OBSTRUCTION + 1;
 
 	/**
 	 * A preference of type SMOOTHNESS
 	 */
-	public final static int SMOOTHNESS = ROUTING_STYLE + 1;
+	public static final int SMOOTHNESS = ROUTING_STYLE + 1;
 
 	/**
 	 * A preference of type Shadow
 	 */
-	public final static int SHADOW = SMOOTHNESS + 1;
+	public static final int SHADOW = SMOOTHNESS + 1;
 
 	/**
 	 * A preference of type elementIcon
 	 */
-	public final static int ELEMENTICON = SHADOW + 1;
+	public static final int ELEMENTICON = SHADOW + 1;
 
 	/**
 	 * A preference of type QualifiedName
 	 */
-	public final static int QUALIFIEDNAME = ELEMENTICON + 1;
+	public static final int QUALIFIEDNAME = ELEMENTICON + 1;
 
 	/**
 	 * A preference of type height
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java
index 72c067aff0c..38063e40d72 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java
@@ -28,7 +28,7 @@ public class DiagramReconcilersReader extends RegistryReader {
 	 */
 	private Map<String, Collection<DiagramReconciler>> myReconcilersRO;
 
-	public final static DiagramReconcilersReader getInstance() {
+	public static final DiagramReconcilersReader getInstance() {
 		if (ourInstance == null) {
 			synchronized (DiagramReconcilersReader.class) {
 				if (ourInstance == null) {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java
index 646f61df06a..d6da2d91b39 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
+ *  Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.selection;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java
index 563793f59ea..1b48c57beb8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *
- *    Céline Janssens - inspired by IBM class RubberbandSelectionTool : modify the calculateNewSelection method and add constructors
+ *    Celine Janssens - inspired by IBM class RubberbandSelectionTool : modify the calculateNewSelection method and add constructors
  *
  ****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.selection;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java
index a4feb816431..9452d0dcf5c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *
- *    Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - initial API and implementation
+ *    Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - initial API and implementation
  *
  ****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.selection;
@@ -30,7 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
  * By default they are all part of the selection.
  * This factory creates 8 tools combining those criteria.<br/>
  *
- * @author Céline JANSSENS
+ * @author Celine JANSSENS
  *
  */
 public class SelectionToolPaletteFactory extends PaletteFactory.Adapter {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java
index f42a5607efe..209b55f8b5c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java
@@ -728,13 +728,13 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro
 	private static PapyrusPaletteService instance;
 
 	/** the standard group id */
-	public final static String GROUP_STANDARD = "standardGroup"; //$NON-NLS-1$
+	public static final String GROUP_STANDARD = "standardGroup"; //$NON-NLS-1$
 
 	/** the standard separator id */
-	public final static String SEPARATOR_STANDARD = "standardSeparator"; //$NON-NLS-1$
+	public static final String SEPARATOR_STANDARD = "standardSeparator"; //$NON-NLS-1$
 
 	/** the standard separator id */
-	public final static String TOOL_SELECTION = "selectionTool"; //$NON-NLS-1$
+	public static final String TOOL_SELECTION = "selectionTool"; //$NON-NLS-1$
 
 	/**
 	 * Creates a new instance of the Palette Service
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java
index c6ed9ac2761..f9f4eb9fb0f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java
@@ -201,13 +201,13 @@ public class LayoutUtils {
 
 	private final static int[] westArray = { PositionConstants.WEST, PositionConstants.NORTH_WEST, PositionConstants.SOUTH_WEST };
 
-	public final static List<Integer> northPositions = fillList(northArray);
+	public static final List<Integer> northPositions = fillList(northArray);
 
-	public final static List<Integer> southPositions = fillList(southArray);
+	public static final List<Integer> southPositions = fillList(southArray);
 
-	public final static List<Integer> eastPositions = fillList(eastArray);
+	public static final List<Integer> eastPositions = fillList(eastArray);
 
-	public final static List<Integer> westPositions = fillList(westArray);
+	public static final List<Integer> westPositions = fillList(westArray);
 
 	private static List<Integer> fillList(int[] array) {
 		List<Integer> list = new ArrayList<Integer>();