[Code style] Apply clean-up and formatter on Main plug-ins

909 files changed, 14332 insertions, 13145 deletions

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/Activator.java
index f754bc14eeb..ecb6a9f3c32 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/Activator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/Activator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,6 +45,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -65,6 +66,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
@@ -72,7 +74,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getInstance() {
@@ -81,10 +83,10 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 * 
+	 *
 	 * @generated
 	 * @param path
-	 *        the path
+	 *            the path
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getBundledImageDescriptor(String path) {
@@ -92,9 +94,9 @@ public class Activator extends AbstractUIPlugin {
 	}
 
 	/**
-	 * 
+	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 * 
+	 *
 	 * @return Shared Preference Store.
 	 */
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
index 5762d728927..610afdbd201 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
@@ -19,10 +19,11 @@ import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 
 /**
  * Represents the creation command for a SysML block definition diagram
+ * 
  * @author Laurent Wouters
  */
 public class BlockDefinitionDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java
index 1a34bb44639..4edfa8365b5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramForMultiEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramForMultiEditor.java
index 983e48017e5..103bd30d935 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramForMultiEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramForMultiEditor.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *	 CEA LIST - Initial API and implementation
  *   Christian W. Damus (CEA) - bug 392301
  *
@@ -33,7 +33,7 @@ import org.eclipse.ui.PartInitException;
 
 /**
  * An editor to be used in multitabs editor. This editor extends the original UML Diagram.
- * 
+ *
  */
 public class BlockDefinitionDiagramForMultiEditor extends BlockDefinitionDiagramEditor {
 
@@ -49,16 +49,16 @@ public class BlockDefinitionDiagramForMultiEditor extends BlockDefinitionDiagram
 
 	/** The editor splitter. */
 	private Composite splitter;
-	
+
 	private Image titleImage;
 
 	/**
 	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
 	 * ServiceRegistry.
-	 * 
+	 *
 	 * @throws BackboneException
 	 * @throws ServiceException
-	 * 
+	 *
 	 */
 	public BlockDefinitionDiagramForMultiEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws BackboneException, ServiceException {
 		super(servicesRegistry, diagram);
@@ -77,11 +77,11 @@ public class BlockDefinitionDiagramForMultiEditor extends BlockDefinitionDiagram
 
 	@Override
 	public void dispose() {
-		if(titleImage != null) {
+		if (titleImage != null) {
 			titleImage.dispose();
 			titleImage = null;
 		}
-		
+
 		super.dispose();
 	}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java
index 972350f2b0e..8ce5bb757b3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -32,6 +32,7 @@ public class BlockDefinitionDiagramEditPart extends DiagramEditPart {
 		super(view);
 	}
 
+	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DiagramSemanticEditPolicy());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/BlockDefinitionDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/BlockDefinitionDiagramDragDropEditPolicy.java
index 8a306693918..bb535623956 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/BlockDefinitionDiagramDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/BlockDefinitionDiagramDragDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -19,8 +19,9 @@ import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.GraphicalTypeRegistry;
 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
 
-/** 
+/**
  * Customization of the DND edit policy for the BlockDefinition Diagram
+ * 
  * @deprecated prefer using {@link CustomDiagramDragDropEditPolicy}.
  */
 @Deprecated
@@ -35,7 +36,7 @@ public class BlockDefinitionDiagramDragDropEditPolicy extends ClassDiagramDragDr
 	@Override
 	public int getNodeVisualID(View containerView, EObject domainElement) {
 		String domainType = registry.getNodeGraphicalType(domainElement, containerView.getType());
-		if(IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
+		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
 			return -1; // undefined
 		}
 		return new Integer(domainType);
@@ -47,7 +48,7 @@ public class BlockDefinitionDiagramDragDropEditPolicy extends ClassDiagramDragDr
 	@Override
 	public int getLinkWithClassVisualID(EObject domainElement) {
 		String domainType = registry.getEdgeGraphicalType(domainElement);
-		if(IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
+		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
 			return -1; // undefined
 		}
 		return new Integer(domainType);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/DiagramSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/DiagramSemanticEditPolicy.java
index 24e26623a7f..fba7eaa018d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/DiagramSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/DiagramSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -20,7 +20,6 @@ import org.eclipse.gef.requests.ReconnectRequest;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultSemanticEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.commands.DuplicateNamedElementCommand;
 
 public class DiagramSemanticEditPolicy extends PackageSemanticEditPolicy {
@@ -56,16 +55,16 @@ public class DiagramSemanticEditPolicy extends PackageSemanticEditPolicy {
 	protected Command getReorientRefRelationshipTargetCommand(ReconnectRequest request) {
 		return UnexecutableCommand.INSTANCE;
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
 		Diagram currentDiagram = null;
-		if(getHost() instanceof IGraphicalEditPart) {
-			currentDiagram = ((IGraphicalEditPart)getHost()).getNotationView().getDiagram();
+		if (getHost() instanceof IGraphicalEditPart) {
+			currentDiagram = ((IGraphicalEditPart) getHost()).getNotationView().getDiagram();
 		}
 		return getGEFWrapper(new DuplicateAnythingCommand(editingDomain, req, currentDiagram));
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/BlockDefinitionDiagramViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/BlockDefinitionDiagramViewFactory.java
index 61e3f832f33..3f7bc5bb9f8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/BlockDefinitionDiagramViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/BlockDefinitionDiagramViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.notation.MeasurementUnit;
 
 public class BlockDefinitionDiagramViewFactory extends DiagramViewFactory {
 
+	@Override
 	protected MeasurementUnit getMeasurementUnit() {
 		return MeasurementUnit.PIXEL_LITERAL;
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java
index 9b188a1bc6b..bc15d2be9ca 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -31,81 +31,82 @@ public class DiagramPaletteFactory extends PaletteFactory.Adapter {
 	private static HashMap<String, IElementType[]> nodesToolIdTypesMap = new HashMap<String, IElementType[]>() {
 
 		{
-			put("blockdefinition.tool.actor", new IElementType[]{ UMLElementTypes.ACTOR });
-			put("blockdefinition.tool.block", new IElementType[]{ SysMLElementTypes.BLOCK });
-			put("blockdefinition.tool.constraint", new IElementType[]{ UMLElementTypes.CONSTRAINT });
-			put("blockdefinition.tool.constraintblock", new IElementType[]{ SysMLElementTypes.CONSTRAINT_BLOCK });
-			put("blockdefinition.tool.constraintproperty", new IElementType[]{ SysMLElementTypes.CONSTRAINT_PROPERTY });
-			put("blockdefinition.tool.datatype", new IElementType[]{ UMLElementTypes.DATA_TYPE });
-			put("blockdefinition.tool.dimension", new IElementType[]{ SysMLElementTypes.DIMENSION });
-			put("blockdefinition.tool.enumeration", new IElementType[]{ UMLElementTypes.ENUMERATION });
-			put("blockdefinition.tool.enumerationliteral", new IElementType[]{ UMLElementTypes.ENUMERATION_LITERAL });
-			put("blockdefinition.tool.flowport", new IElementType[]{ SysMLElementTypes.FLOW_PORT });
-			put("blockdefinition.tool.flowproperty", new IElementType[]{ SysMLElementTypes.FLOW_PROPERTY });
-			put("blockdefinition.tool.flowspecification", new IElementType[]{ SysMLElementTypes.FLOW_SPECIFICATION });
-			put("blockdefinition.tool.interface", new IElementType[]{ UMLElementTypes.INTERFACE });
-			put("blockdefinition.tool.operation", new IElementType[]{ UMLElementTypes.OPERATION });
-			put("blockdefinition.tool.part", new IElementType[]{ SysMLElementTypes.PART_PROPERTY });
-			put("blockdefinition.tool.port", new IElementType[]{ UMLElementTypes.PORT });
-			put("blockdefinition.tool.primitivetype", new IElementType[]{ UMLElementTypes.PRIMITIVE_TYPE });
-			put("blockdefinition.tool.property", new IElementType[]{ UMLElementTypes.PROPERTY });
-			put("blockdefinition.tool.reception", new IElementType[]{ UMLElementTypes.RECEPTION });
-			put("blockdefinition.tool.reference", new IElementType[]{ SysMLElementTypes.REFERENCE_PROPERTY });
-			put("blockdefinition.tool.signal", new IElementType[]{ UMLElementTypes.SIGNAL });
-			put("blockdefinition.tool.unit", new IElementType[]{ SysMLElementTypes.UNIT });
-			put("blockdefinition.tool.value", new IElementType[]{ SysMLElementTypes.VALUE_PROPERTY });
-			put("blockdefinition.tool.valuetype", new IElementType[]{ SysMLElementTypes.VALUE_TYPE });
-			//Start of user code Custom nodes
+			put("blockdefinition.tool.actor", new IElementType[] { UMLElementTypes.ACTOR });
+			put("blockdefinition.tool.block", new IElementType[] { SysMLElementTypes.BLOCK });
+			put("blockdefinition.tool.constraint", new IElementType[] { UMLElementTypes.CONSTRAINT });
+			put("blockdefinition.tool.constraintblock", new IElementType[] { SysMLElementTypes.CONSTRAINT_BLOCK });
+			put("blockdefinition.tool.constraintproperty", new IElementType[] { SysMLElementTypes.CONSTRAINT_PROPERTY });
+			put("blockdefinition.tool.datatype", new IElementType[] { UMLElementTypes.DATA_TYPE });
+			put("blockdefinition.tool.dimension", new IElementType[] { SysMLElementTypes.DIMENSION });
+			put("blockdefinition.tool.enumeration", new IElementType[] { UMLElementTypes.ENUMERATION });
+			put("blockdefinition.tool.enumerationliteral", new IElementType[] { UMLElementTypes.ENUMERATION_LITERAL });
+			put("blockdefinition.tool.flowport", new IElementType[] { SysMLElementTypes.FLOW_PORT });
+			put("blockdefinition.tool.flowproperty", new IElementType[] { SysMLElementTypes.FLOW_PROPERTY });
+			put("blockdefinition.tool.flowspecification", new IElementType[] { SysMLElementTypes.FLOW_SPECIFICATION });
+			put("blockdefinition.tool.interface", new IElementType[] { UMLElementTypes.INTERFACE });
+			put("blockdefinition.tool.operation", new IElementType[] { UMLElementTypes.OPERATION });
+			put("blockdefinition.tool.part", new IElementType[] { SysMLElementTypes.PART_PROPERTY });
+			put("blockdefinition.tool.port", new IElementType[] { UMLElementTypes.PORT });
+			put("blockdefinition.tool.primitivetype", new IElementType[] { UMLElementTypes.PRIMITIVE_TYPE });
+			put("blockdefinition.tool.property", new IElementType[] { UMLElementTypes.PROPERTY });
+			put("blockdefinition.tool.reception", new IElementType[] { UMLElementTypes.RECEPTION });
+			put("blockdefinition.tool.reference", new IElementType[] { SysMLElementTypes.REFERENCE_PROPERTY });
+			put("blockdefinition.tool.signal", new IElementType[] { UMLElementTypes.SIGNAL });
+			put("blockdefinition.tool.unit", new IElementType[] { SysMLElementTypes.UNIT });
+			put("blockdefinition.tool.value", new IElementType[] { SysMLElementTypes.VALUE_PROPERTY });
+			put("blockdefinition.tool.valuetype", new IElementType[] { SysMLElementTypes.VALUE_TYPE });
+			// Start of user code Custom nodes
 
 			// Constraint button replacement
 			remove("blockdefinition.tool.constraint");
-			put("blockdefinition.tool.constraint", new IElementType[]{ UMLElementTypes.CONSTRAINT });
+			put("blockdefinition.tool.constraint", new IElementType[] { UMLElementTypes.CONSTRAINT });
 
-			put("blockdefinition.tool.model", new IElementType[]{ UMLElementTypes.MODEL });
-			put("blockdefinition.tool.package", new IElementType[]{ UMLElementTypes.PACKAGE });
-			put("blockdefinition.tool.instancespecification", new IElementType[]{ UMLElementTypes.INSTANCE_SPECIFICATION });
-			put("blockdefinition.tool.slot", new IElementType[]{ UMLElementTypes.SLOT });
-			put("blockdefinition.tool.comment", new IElementType[]{ UMLElementTypes.COMMENT });
+			put("blockdefinition.tool.model", new IElementType[] { UMLElementTypes.MODEL });
+			put("blockdefinition.tool.package", new IElementType[] { UMLElementTypes.PACKAGE });
+			put("blockdefinition.tool.instancespecification", new IElementType[] { UMLElementTypes.INSTANCE_SPECIFICATION });
+			put("blockdefinition.tool.slot", new IElementType[] { UMLElementTypes.SLOT });
+			put("blockdefinition.tool.comment", new IElementType[] { UMLElementTypes.COMMENT });
 
-			put("blockdefinition.tool.actorpart", new IElementType[]{ SysMLElementTypes.ACTOR_PART_PROPERTY });
+			put("blockdefinition.tool.actorpart", new IElementType[] { SysMLElementTypes.ACTOR_PART_PROPERTY });
 
-			//End of user code
+			// End of user code
 		}
 	};
 
 	private static HashMap<String, IElementType[]> edgesToolIdTypesMap = new HashMap<String, IElementType[]>() {
 
 		{
-			put("blockdefinition.tool.association", new IElementType[]{ SysMLElementTypes.ASSOCIATION });
-			put("blockdefinition.tool.dependency", new IElementType[]{ UMLElementTypes.DEPENDENCY });
-			put("blockdefinition.tool.generalization", new IElementType[]{ UMLElementTypes.GENERALIZATION });
-			put("blockdefinition.tool.interfacerealization", new IElementType[]{ UMLElementTypes.INTERFACE_REALIZATION });
-			put("blockdefinition.tool.usage", new IElementType[]{ UMLElementTypes.USAGE });
-			//Start of user code Custom edges			
-			put("blockdefinition.tool.association_none", new IElementType[]{ SysMLElementTypes.ASSOCIATION_NONE });
-			put("blockdefinition.tool.association_none_directed", new IElementType[]{ SysMLElementTypes.ASSOCIATION_NONE_DIRECTED });
-			put("blockdefinition.tool.association_composite", new IElementType[]{ SysMLElementTypes.ASSOCIATION_COMPOSITE });
-			put("blockdefinition.tool.association_composite_directed", new IElementType[]{ SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED });
-			put("blockdefinition.tool.association_shared", new IElementType[]{ SysMLElementTypes.ASSOCIATION_SHARED });
-			put("blockdefinition.tool.association_shared_directed", new IElementType[]{ SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED });
-
-			put("blockdefinition.tool.comment_constraint_link", new IElementType[]{ ElementTypes.COMMENT_ANNOTATED_ELEMENT, ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT });
-
-			//End of user code
+			put("blockdefinition.tool.association", new IElementType[] { SysMLElementTypes.ASSOCIATION });
+			put("blockdefinition.tool.dependency", new IElementType[] { UMLElementTypes.DEPENDENCY });
+			put("blockdefinition.tool.generalization", new IElementType[] { UMLElementTypes.GENERALIZATION });
+			put("blockdefinition.tool.interfacerealization", new IElementType[] { UMLElementTypes.INTERFACE_REALIZATION });
+			put("blockdefinition.tool.usage", new IElementType[] { UMLElementTypes.USAGE });
+			// Start of user code Custom edges
+			put("blockdefinition.tool.association_none", new IElementType[] { SysMLElementTypes.ASSOCIATION_NONE });
+			put("blockdefinition.tool.association_none_directed", new IElementType[] { SysMLElementTypes.ASSOCIATION_NONE_DIRECTED });
+			put("blockdefinition.tool.association_composite", new IElementType[] { SysMLElementTypes.ASSOCIATION_COMPOSITE });
+			put("blockdefinition.tool.association_composite_directed", new IElementType[] { SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED });
+			put("blockdefinition.tool.association_shared", new IElementType[] { SysMLElementTypes.ASSOCIATION_SHARED });
+			put("blockdefinition.tool.association_shared_directed", new IElementType[] { SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED });
+
+			put("blockdefinition.tool.comment_constraint_link", new IElementType[] { ElementTypes.COMMENT_ANNOTATED_ELEMENT, ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT });
+
+			// End of user code
 		}
 	};
 
+	@Override
 	public Tool createTool(String toolId) {
 
 		IElementType[] types;
 
 		types = nodesToolIdTypesMap.get(toolId);
-		if(types != null) {
+		if (types != null) {
 			return new AspectUnspecifiedTypeCreationTool(Arrays.asList(types));
 		}
 
 		types = edgesToolIdTypesMap.get(toolId);
-		if(types != null) {
+		if (types != null) {
 			return new AspectUnspecifiedTypeConnectionTool(Arrays.asList(types));
 		}
 		return null;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
index cbd947a55fc..69b3f081e4f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -105,8 +105,8 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 		super(servicesRegistry, diagram);
 
 		// Fix Port locations (implementations before 0.8.1 were erroneous see https://bugs.eclipse.org/bugs/show_bug.cgi?id=354815)
-		(new FixPortsLocationOnOpening()).fix(diagram);		
-		
+		(new FixPortsLocationOnOpening()).fix(diagram);
+
 		// adds a listener to the palette service, which reacts to palette customizations
 		PapyrusPaletteService.getInstance().addProviderChangeListener(this);
 
@@ -121,9 +121,10 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
 		PaletteRoot paletteRoot;
-		if(existingPaletteRoot == null) {
+		if (existingPaletteRoot == null) {
 			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());
 		} else {
 			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());
@@ -136,6 +137,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected PreferencesHint getPreferencesHint() {
 		return Activator.DIAGRAM_PREFERENCES_HINT;
 	}
@@ -143,6 +145,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	public String getContributorId() {
 		return Activator.PLUGIN_ID;
 	}
@@ -150,6 +153,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
 		return documentProvider;
 	}
@@ -157,6 +161,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	public TransactionalEditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -164,6 +169,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected final void setDocumentProvider(IEditorInput input) {
 		// Already set in the constructor
 	}
@@ -178,6 +184,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	public boolean isSaveAsAllowed() {
 		return true;
 	}
@@ -185,6 +192,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	public void doSaveAs() {
 		performSaveAs(new NullProgressMonitor());
 	}
@@ -192,6 +200,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected void performSaveAs(IProgressMonitor progressMonitor) {
 		// Nothing
 	}
@@ -199,6 +208,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	public ShowInContext getShowInContext() {
 		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
 	}
@@ -206,12 +216,13 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected void configureGraphicalViewer() {
 		super.configureGraphicalViewer();
 
 		// Replace diagram contextual menu removing default
 		// delete from model action.
-		DiagramContextMenuProvider provider = (DiagramContextMenuProvider)getDiagramGraphicalViewer().getContextMenu();
+		DiagramContextMenuProvider provider = (DiagramContextMenuProvider) getDiagramGraphicalViewer().getContextMenu();
 		Set<String> menuExclusions = provider.getExclusionSet();
 		menuExclusions.add(ActionIds.ACTION_DELETE_FROM_MODEL);
 		provider.setExclusionSet(menuExclusions);
@@ -220,6 +231,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected TransactionalEditingDomain createEditingDomain() {
 		// Already configured
 		return editingDomain;
@@ -228,6 +240,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected void configureDiagramEditDomain() {
 		super.configureDiagramEditDomain();
 		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
@@ -241,6 +254,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	public void doSave(IProgressMonitor progressMonitor) {
 		// The saving of the resource is done by the CoreMultiDiagramEditor
 		getDirtyState().saved();
@@ -250,7 +264,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	 * @generated
 	 */
 	protected OperationHistoryDirtyState getDirtyState() {
-		if(dirtyState == null) {
+		if (dirtyState == null) {
 			dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory());
 		}
 		return dirtyState;
@@ -261,17 +275,18 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	 */
 	@Override
 	protected void setUndoContext(IUndoContext context) {
-		if(dirtyState != null) {
+		if (dirtyState != null) {
 			dirtyState.dispose();
 			dirtyState = null;
 		}
-		
+
 		super.setUndoContext(context);
 	}
-	
+
 	/**
 	 * @generated
 	 */
+	@Override
 	public boolean isDirty() {
 		return getDirtyState().isDirty();
 	}
@@ -281,7 +296,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	 */
 	public void providerChanged(ProviderChangeEvent event) {
 		// update the palette if the palette service has changed
-		if(PapyrusPaletteService.getInstance().equals(event.getSource())) {
+		if (PapyrusPaletteService.getInstance().equals(event.getSource())) {
 			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, getDefaultPaletteContent());
 		}
 	}
@@ -289,16 +304,17 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		// remove palette service listener
 		// remove preference listener
 		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
 
-		if(dirtyState != null) {
+		if (dirtyState != null) {
 			dirtyState.dispose();
 			dirtyState = null;
 		}
-		
+
 		super.dispose();
 	}
 
@@ -312,6 +328,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected PaletteViewer constructPaletteViewer() {
 		return new PapyrusPaletteViewer();
 	}
@@ -319,6 +336,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	/**
 	 * @generated
 	 */
+	@Override
 	protected PaletteViewerProvider createPaletteViewerProvider() {
 		getEditDomain().setPaletteRoot(createPaletteRoot(null));
 		return new PaletteViewerProvider(getEditDomain()) {
@@ -330,6 +348,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 			 * with a defaultTool that is the SelectToolEx that undestands how to handle the enter
 			 * key which will result in the creation of the shape also.
 			 */
+			@Override
 			protected void configurePaletteViewer(PaletteViewer viewer) {
 				super.configurePaletteViewer(viewer);
 
@@ -347,6 +366,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 				viewer.setCustomizer(createPaletteCustomizer());
 			}
 
+			@Override
 			public PaletteViewer createPaletteViewer(Composite parent) {
 				PaletteViewer pViewer = constructPaletteViewer();
 				pViewer.createControl(parent);
@@ -360,7 +380,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 			 */
 			private KeyHandler getPaletteKeyHandler() {
 
-				if(paletteKeyHandler == null) {
+				if (paletteKeyHandler == null) {
 
 					paletteKeyHandler = new KeyHandler() {
 
@@ -369,18 +389,19 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 						 * whenever a key is released, and the Tool is in the proper state. Override
 						 * to support pressing the enter key to create a shape or connection
 						 * (between two selected shapes)
-						 * 
+						 *
 						 * @param event
-						 *        the KeyEvent
+						 *            the KeyEvent
 						 * @return <code>true</code> if KeyEvent was handled in some way
 						 */
+						@Override
 						public boolean keyReleased(KeyEvent event) {
 
-							if(event.keyCode == SWT.Selection) {
+							if (event.keyCode == SWT.Selection) {
 
 								Tool tool = getPaletteViewer().getActiveTool().createTool();
 
-								if(toolSupportsAccessibility(tool)) {
+								if (toolSupportsAccessibility(tool)) {
 
 									tool.keyUp(event, getDiagramGraphicalViewer());
 
@@ -405,7 +426,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 			 */
 			private MouseListener getPaletteMouseListener() {
 
-				if(paletteMouseListener == null) {
+				if (paletteMouseListener == null) {
 
 					paletteMouseListener = new MouseListener() {
 
@@ -418,13 +439,13 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 						/**
 						 * Override to support double-clicking a palette tool entry to create a
 						 * shape or connection (between two selected shapes).
-						 * 
+						 *
 						 * @see MouseListener#mouseDoubleClick(MouseEvent)
 						 */
 						public void mouseDoubleClick(MouseEvent e) {
 							Tool tool = getPaletteViewer().getActiveTool().createTool();
 
-							if(toolSupportsAccessibility(tool)) {
+							if (toolSupportsAccessibility(tool)) {
 
 								tool.setViewer(getDiagramGraphicalViewer());
 								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());
@@ -445,7 +466,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 						public void mouseUp(MouseEvent e) {
 							// Deactivate current active tool here if a
 							// double-click was handled.
-							if(clearActiveTool) {
+							if (clearActiveTool) {
 								getPaletteViewer().setActiveTool(null);
 								clearActiveTool = false;
 							}
@@ -496,10 +517,10 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 	 */
 	@Override
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if(getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
-			IMultiDiagramEditor editor = (IMultiDiagramEditor)getSite().getPage().getActiveEditor();
+		if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
+			IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();
 			// If not the active editor, ignore selection changed.
-			if(this.equals(editor.getActiveEditor())) {
+			if (this.equals(editor.getActiveEditor())) {
 				updateActions(getSelectionActions());
 				super.selectionChanged(part, selection);
 			} else {
@@ -511,7 +532,7 @@ public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements
 		// from
 		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,
 		// ISelection)
-		if(part == this) {
+		if (part == this) {
 			rebuildStatusLine();
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java
index a7db23f1ac2..631a3102c45 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,8 +36,8 @@ public class ActorPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.FALSE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("operations", Boolean.FALSE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("properties", Boolean.FALSE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("operations", Boolean.FALSE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
@@ -65,13 +65,13 @@ public class ActorPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -82,7 +82,7 @@ public class ActorPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -92,7 +92,7 @@ public class ActorPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java
index 238a1f2f0c0..0aae340372c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java
index 2a5d3a84639..7d35d3a0577 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramLinkPreferencePage.java
index 61ad3296a59..b9fe5f2b8e8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramLinkPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramLinkPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -43,7 +43,7 @@ public class BlockDefinitionDiagramLinkPreferencePage extends AbstractPapyrusLin
 		super.createPageContents(parent);
 
 		// Add label visibility group
-		if(!labelsList.isEmpty()) {
+		if (!labelsList.isEmpty()) {
 			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
 			addAbstractGroup(compartmentGroup);
 		}
@@ -60,7 +60,7 @@ public class BlockDefinitionDiagramLinkPreferencePage extends AbstractPapyrusLin
 
 	/** Initialize the list containing names of labels. */
 	protected void initializeLabelsList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramNodePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramNodePreferencePage.java
index c3e15a68a5a..354f0e59aca 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramNodePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramNodePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -58,13 +58,13 @@ public class BlockDefinitionDiagramNodePreferencePage extends AbstractPapyrusNod
 		super.createPageContents(parent);
 
 		// Add compartments visibility group
-		if(!compartmentNamesList.isEmpty()) {
+		if (!compartmentNamesList.isEmpty()) {
 			OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());
 			addAbstractGroup(compartmentGroup);
 		}
 
 		// Add label visibility group
-		if(!labelsList.isEmpty()) {
+		if (!labelsList.isEmpty()) {
 			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
 			addAbstractGroup(compartmentGroup);
 		}
@@ -80,17 +80,17 @@ public class BlockDefinitionDiagramNodePreferencePage extends AbstractPapyrusNod
 
 	/** Initialize the list containing names of labels. */
 	protected void initializeLabelsList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/** Initialize the list containing the names of compartments. */
 	protected void initializeCompartmentNamesList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/** Initialize the list containing the names of compartment that have titles. */
 	protected void initializeCompartmentTitlesList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramPreferenceInitializer.java
index 1c86bd0d472..d1bb2962b0e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramPreferenceInitializer.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java
index e880f01b9bf..fe47fb47fc9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,14 +36,14 @@ public class BlockPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("parts", Boolean.FALSE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("references", Boolean.FALSE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("standard ports", Boolean.FALSE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("flow ports", Boolean.FALSE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("constraints", Boolean.TRUE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("values", Boolean.FALSE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("parts", Boolean.FALSE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("references", Boolean.FALSE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("standard ports", Boolean.FALSE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("flow ports", Boolean.FALSE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("constraints", Boolean.TRUE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("values", Boolean.FALSE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
@@ -77,13 +77,13 @@ public class BlockPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -94,7 +94,7 @@ public class BlockPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -104,7 +104,7 @@ public class BlockPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CommentPreferencePage.java
index 99da3e95e9d..4b30952c65e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CommentPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CommentPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -30,9 +30,9 @@ public class CommentPreferencePage extends BlockDefinitionDiagramNodePreferenceP
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java
index 6fef8a064bd..7842d605b1b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,8 +36,8 @@ public class ConstraintBlockPreferencePage extends BlockDefinitionDiagramNodePre
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("parameters", Boolean.TRUE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("constraints", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("parameters", Boolean.TRUE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("constraints", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("parameters", Boolean.TRUE); //$NON-NLS-1$
@@ -59,17 +59,17 @@ public class ConstraintBlockPreferencePage extends BlockDefinitionDiagramNodePre
 
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations		
+		// Start of user code custom default initializations
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -80,7 +80,7 @@ public class ConstraintBlockPreferencePage extends BlockDefinitionDiagramNodePre
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -90,7 +90,7 @@ public class ConstraintBlockPreferencePage extends BlockDefinitionDiagramNodePre
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPreferencePage.java
index f4820fafba2..838a10b9b15 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPropertyPreferencePage.java
index 3f667da0147..beaf4a3235e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPropertyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPropertyPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java
index 53b24f96de9..6a2b5821046 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,8 +36,8 @@ public class DataTypePreferencePage extends BlockDefinitionDiagramNodePreference
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("operations", Boolean.FALSE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("operations", Boolean.FALSE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
@@ -63,13 +63,13 @@ public class DataTypePreferencePage extends BlockDefinitionDiagramNodePreference
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -80,7 +80,7 @@ public class DataTypePreferencePage extends BlockDefinitionDiagramNodePreference
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -90,7 +90,7 @@ public class DataTypePreferencePage extends BlockDefinitionDiagramNodePreference
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java
index 3279597710f..7554972b5bc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java
index 31c646f6eb1..51d92656ad6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationLiteralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationLiteralPreferencePage.java
index 3a532ce4f26..61824b4384a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationLiteralPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationLiteralPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -30,7 +30,7 @@ public class EnumerationLiteralPreferencePage extends BlockDefinitionDiagramNode
 
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations		
+		// Start of user code custom default initializations
 		// End of user code
 	}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java
index 77904019255..7a08df59f4a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,7 +36,7 @@ public class EnumerationPreferencePage extends BlockDefinitionDiagramNodePrefere
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("literals", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("literals", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("literals", Boolean.TRUE); //$NON-NLS-1$
@@ -61,13 +61,13 @@ public class EnumerationPreferencePage extends BlockDefinitionDiagramNodePrefere
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -78,7 +78,7 @@ public class EnumerationPreferencePage extends BlockDefinitionDiagramNodePrefere
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -88,7 +88,7 @@ public class EnumerationPreferencePage extends BlockDefinitionDiagramNodePrefere
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortPreferencePage.java
index 03bcccab485..f978bcac938 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPropertyPreferencePage.java
index 5475bdac2d9..c1af80c6287 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPropertyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPropertyPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java
index b3a91452eb1..e0e3b68ef78 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,7 +36,7 @@ public class FlowSpecificationPreferencePage extends BlockDefinitionDiagramNodeP
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("flow properties", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("flow properties", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("flow properties", Boolean.TRUE); //$NON-NLS-1$
@@ -61,13 +61,13 @@ public class FlowSpecificationPreferencePage extends BlockDefinitionDiagramNodeP
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -78,7 +78,7 @@ public class FlowSpecificationPreferencePage extends BlockDefinitionDiagramNodeP
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -88,7 +88,7 @@ public class FlowSpecificationPreferencePage extends BlockDefinitionDiagramNodeP
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java
index 8614c2b1b87..ea7559fed5a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java
index b9680b35a97..e9ac4e3a8dd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -35,7 +35,7 @@ public class InstanceSpecificationPreferencePage extends BlockDefinitionDiagramN
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("SlotCompartment", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("SlotCompartment", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("SlotCompartment", Boolean.TRUE); //$NON-NLS-1$
@@ -56,9 +56,9 @@ public class InstanceSpecificationPreferencePage extends BlockDefinitionDiagramN
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
@@ -67,13 +67,13 @@ public class InstanceSpecificationPreferencePage extends BlockDefinitionDiagramN
 		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
 		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -84,7 +84,7 @@ public class InstanceSpecificationPreferencePage extends BlockDefinitionDiagramN
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -94,7 +94,7 @@ public class InstanceSpecificationPreferencePage extends BlockDefinitionDiagramN
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java
index 4e9c28b0ca3..4726710c22e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,8 +36,8 @@ public class InterfacePreferencePage extends BlockDefinitionDiagramNodePreferenc
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
@@ -63,13 +63,13 @@ public class InterfacePreferencePage extends BlockDefinitionDiagramNodePreferenc
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -80,7 +80,7 @@ public class InterfacePreferencePage extends BlockDefinitionDiagramNodePreferenc
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -90,7 +90,7 @@ public class InterfacePreferencePage extends BlockDefinitionDiagramNodePreferenc
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java
index 1203c4412ca..fe5f3f78a53 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java
index e15be09d2e1..98898e16b50 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -35,7 +35,7 @@ public class ModelPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$
@@ -56,9 +56,9 @@ public class ModelPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
@@ -67,13 +67,13 @@ public class ModelPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
 		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -84,7 +84,7 @@ public class ModelPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -94,7 +94,7 @@ public class ModelPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/OperationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/OperationPreferencePage.java
index ab9f6baa9ef..3057a24f2a0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/OperationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/OperationPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java
index 59322e80ba5..5db4fd9f515 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -35,7 +35,7 @@ public class PackagePreferencePage extends BlockDefinitionDiagramNodePreferenceP
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$
@@ -56,9 +56,9 @@ public class PackagePreferencePage extends BlockDefinitionDiagramNodePreferenceP
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
@@ -67,13 +67,13 @@ public class PackagePreferencePage extends BlockDefinitionDiagramNodePreferenceP
 		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
 		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -84,7 +84,7 @@ public class PackagePreferencePage extends BlockDefinitionDiagramNodePreferenceP
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -94,7 +94,7 @@ public class PackagePreferencePage extends BlockDefinitionDiagramNodePreferenceP
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PartPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PartPreferencePage.java
index 87c3ebed501..6bb00d0853f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PartPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PartPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortPreferencePage.java
index 3036ff16381..84028b2b406 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PrimitiveTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PrimitiveTypePreferencePage.java
index 749eedae8ac..d759b985f7e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PrimitiveTypePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PrimitiveTypePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -31,7 +31,7 @@ public class PrimitiveTypePreferencePage extends BlockDefinitionDiagramNodePrefe
 
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations		
+		// Start of user code custom default initializations
 		// End of user code
 
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java
index 0a68af9352c..53241d2ca16 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReceptionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReceptionPreferencePage.java
index 746f55d9ee3..c8a297f468f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReceptionPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReceptionPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReferencePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReferencePreferencePage.java
index 5a59f997d22..b4b6eddad77 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReferencePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReferencePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java
index 62b50121670..4be6d9e8e0d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,8 +36,8 @@ public class SignalPreferencePage extends BlockDefinitionDiagramNodePreferencePa
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.FALSE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("operations", Boolean.FALSE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("properties", Boolean.FALSE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("operations", Boolean.FALSE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
@@ -65,13 +65,13 @@ public class SignalPreferencePage extends BlockDefinitionDiagramNodePreferencePa
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -82,7 +82,7 @@ public class SignalPreferencePage extends BlockDefinitionDiagramNodePreferencePa
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -92,7 +92,7 @@ public class SignalPreferencePage extends BlockDefinitionDiagramNodePreferencePa
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SlotPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SlotPreferencePage.java
index 7d4ded90105..610f512c4ab 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SlotPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SlotPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -29,9 +29,9 @@ public class SlotPreferencePage extends BlockDefinitionDiagramNodePreferencePage
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java
index 7a75e0b36c4..e854a9fefc9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValuePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValuePreferencePage.java
index 8bcbd21ece2..0790ebd38cd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValuePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValuePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java
index ce7a0463130..565645bedae 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,8 +36,8 @@ public class ValueTypePreferencePage extends BlockDefinitionDiagramNodePreferenc
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$	
-		compartmentDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
+		compartmentDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
@@ -63,13 +63,13 @@ public class ValueTypePreferencePage extends BlockDefinitionDiagramNodePreferenc
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -80,7 +80,7 @@ public class ValueTypePreferencePage extends BlockDefinitionDiagramNodePreferenc
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -90,7 +90,7 @@ public class ValueTypePreferencePage extends BlockDefinitionDiagramNodePreferenc
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPartProvider.java
index 84f297eb6d7..e6cffd75129 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPartProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,11 +26,11 @@ public class BlockDefinitionDiagramEditPartProvider extends AbstractEditPartProv
 
 	@Override
 	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View view = ((IEditPartOperation) operation).getView();
 
 			// Ensure current diagram is BlockDefinition Diagram
-			if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+			if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
 				return true;
 			}
 		}
@@ -40,7 +40,7 @@ public class BlockDefinitionDiagramEditPartProvider extends AbstractEditPartProv
 
 	@Override
 	protected Class<?> getDiagramEditPartClass(View view) {
-		if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+		if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
 			return BlockDefinitionDiagramEditPart.class;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPolicyProvider.java
index 1ce34c7e75a..db0c7e1127b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPolicyProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPolicyProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,62 +26,62 @@ public class BlockDefinitionDiagramEditPolicyProvider extends AbstractProvider i
 
 	public boolean provides(IOperation operation) {
 
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;
-		if(!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
 			return false;
 		}
-		GraphicalEditPart gep = (GraphicalEditPart)epOperation.getEditPart();
+		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();
 		String diagramType = gep.getNotationView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartTN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartTN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {
 			return true;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramViewProvider.java
index 6a10c4856e0..f0c7462210f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramViewProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -25,7 +25,7 @@ public class BlockDefinitionDiagramViewProvider extends AbstractViewProvider {
 	@Override
 	protected boolean provides(CreateDiagramViewOperation operation) {
 
-		if(ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
+		if (ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
 			return true;
 		}
 
@@ -34,7 +34,7 @@ public class BlockDefinitionDiagramViewProvider extends AbstractViewProvider {
 
 	@Override
 	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if(ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
+		if (ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
 			return BlockDefinitionDiagramViewFactory.class;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPartProvider.java
index 2a21a639e2f..b6810464c29 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPartProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -164,19 +164,19 @@ public class CustomEditPartProvider extends CustomAbstractEditPartProvider {
 	 */
 	@Override
 	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View newView = ((IEditPartOperation)operation).getView();
-			if(newView == null) {
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View newView = ((IEditPartOperation) operation).getView();
+			if (newView == null) {
 				return false;
 			}
 
 			String graphicalType = newView.getType();
 
-			if((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
+			if ((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
 				return false;
 			}
 
-			if((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
+			if ((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
 				return false;
 			}
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomGraphicalTypeRegistry.java
index 842f91e006b..7144cc98dfc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomGraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomGraphicalTypeRegistry.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -101,17 +101,17 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 		// Start of user code getNodeGraphicalType(EObject domainElement, String containerType)
 
 		// For legacy reuse of Class Diagram Constraint in BDD (DnD especially)
-		if(UMLElementTypes.CONSTRAINT.getEClass().isInstance(domainElement)) {
+		if (UMLElementTypes.CONSTRAINT.getEClass().isInstance(domainElement)) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return super.getNodeGraphicalType(domainElement, containerType);
 			}
 
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType) || ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType) || ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return super.getNodeGraphicalType(domainElement, containerType);
 			}
 
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType) || ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType) || ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return super.getNodeGraphicalType(domainElement, containerType);
 			}
 
@@ -120,326 +120,326 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 
 		// End of user code
 
-		if(UMLElementTypes.CONSTRAINT.getEClass().isInstance(domainElement)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.CONSTRAINT.getEClass().isInstance(domainElement)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.ENUMERATION_LITERAL.getEClass().isInstance(domainElement)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.ENUMERATION_LITERAL.getEClass().isInstance(domainElement)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.OPERATION.getEClass().isInstance(domainElement)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.OPERATION.getEClass().isInstance(domainElement)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.PORT.getEClass().isInstance(domainElement)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.PORT.getEClass().isInstance(domainElement)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
 			}
-			if(UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID.equals(containerType)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.CONSTRAINT_PROPERTY).getMatcher().matches(domainElement)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_PROPERTY).getMatcher().matches(domainElement)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.FLOW_PROPERTY).getMatcher().matches(domainElement)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.FLOW_PROPERTY).getMatcher().matches(domainElement)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.ACTOR_PART_PROPERTY).getMatcher().matches(domainElement)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.ACTOR_PART_PROPERTY).getMatcher().matches(domainElement)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.PROPERTY.getEClass().isInstance(domainElement)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.PROPERTY.getEClass().isInstance(domainElement)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.RECEPTION.getEClass().isInstance(domainElement)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.RECEPTION.getEClass().isInstance(domainElement)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.ACTOR.getEClass().isInstance(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.ACTOR.getEClass().isInstance(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.ENUMERATION.getEClass().isInstance(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.ENUMERATION.getEClass().isInstance(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.PRIMITIVE_TYPE.getEClass().isInstance(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.PRIMITIVE_TYPE.getEClass().isInstance(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.VALUE_TYPE).getMatcher().matches(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.DATA_TYPE.getEClass().isInstance(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.DATA_TYPE.getEClass().isInstance(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.FLOW_SPECIFICATION).getMatcher().matches(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.FLOW_SPECIFICATION).getMatcher().matches(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.INTERFACE.getEClass().isInstance(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.INTERFACE.getEClass().isInstance(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.SIGNAL.getEClass().isInstance(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.SIGNAL.getEClass().isInstance(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.DIMENSION).getMatcher().matches(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.DIMENSION).getMatcher().matches(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.UNIT).getMatcher().matches(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.UNIT).getMatcher().matches(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
@@ -450,330 +450,331 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getNodeGraphicalType(String proposedType, String containerType) {
 		// Start of user code getNodeGraphicalType(String proposedType, String containerType)
 		// End of user code
 
-		if(UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.ENUMERATION_LITERAL.getSemanticHint().equals(proposedType)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.ENUMERATION_LITERAL.getSemanticHint().equals(proposedType)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.OPERATION.getSemanticHint().equals(proposedType)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.OPERATION.getSemanticHint().equals(proposedType)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID.equals(containerType)) {
+		if (SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.PORT.getSemanticHint().equals(proposedType)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.PORT.getSemanticHint().equals(proposedType)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
 			}
-			if(UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID.equals(containerType)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.CONSTRAINT_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
+		if (SysMLElementTypes.CONSTRAINT_PROPERTY.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.FLOW_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (SysMLElementTypes.FLOW_PROPERTY.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.ACTOR_PART_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (SysMLElementTypes.ACTOR_PART_PROPERTY.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.RECEPTION.getSemanticHint().equals(proposedType)) {
-			if(UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
+		if (UMLElementTypes.RECEPTION.getSemanticHint().equals(proposedType)) {
+			if (UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.ACTOR.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.ACTOR.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.ENUMERATION.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.ENUMERATION.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.PRIMITIVE_TYPE.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.PRIMITIVE_TYPE.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.VALUE_TYPE.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (SysMLElementTypes.VALUE_TYPE.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.DATA_TYPE.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.DATA_TYPE.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.FLOW_SPECIFICATION.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (SysMLElementTypes.FLOW_SPECIFICATION.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.INTERFACE.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.INTERFACE.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.SIGNAL.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (UMLElementTypes.SIGNAL.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.CONSTRAINT_BLOCK.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (SysMLElementTypes.CONSTRAINT_BLOCK.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.BLOCK.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (SysMLElementTypes.BLOCK.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.DIMENSION.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (SysMLElementTypes.DIMENSION.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.UNIT.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (SysMLElementTypes.UNIT.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
 			}
 			return UNDEFINED_TYPE;
@@ -790,19 +791,19 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 
 		// End of user code
 
-		if(((ISpecializationType)SysMLElementTypes.ASSOCIATION).getMatcher().matches(domainElement)) {
+		if (((ISpecializationType) SysMLElementTypes.ASSOCIATION).getMatcher().matches(domainElement)) {
 			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
 		}
-		if(UMLElementTypes.USAGE.getEClass().isInstance(domainElement)) {
+		if (UMLElementTypes.USAGE.getEClass().isInstance(domainElement)) {
 			return UMLGraphicalTypes.LINK_UML_USAGE_ID;
 		}
-		if(UMLElementTypes.INTERFACE_REALIZATION.getEClass().isInstance(domainElement)) {
+		if (UMLElementTypes.INTERFACE_REALIZATION.getEClass().isInstance(domainElement)) {
 			return UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID;
 		}
-		if(UMLElementTypes.DEPENDENCY.getEClass().isInstance(domainElement)) {
+		if (UMLElementTypes.DEPENDENCY.getEClass().isInstance(domainElement)) {
 			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
 		}
-		if(UMLElementTypes.GENERALIZATION.getEClass().isInstance(domainElement)) {
+		if (UMLElementTypes.GENERALIZATION.getEClass().isInstance(domainElement)) {
 			return UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID;
 		}
 		return super.getEdgeGraphicalType(domainElement);
@@ -811,41 +812,42 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getEdgeGraphicalType(String proposedType) {
 		// Start of user code getEdgeGraphicalType(String proposedType)
-		if(SysMLElementTypes.ASSOCIATION_NONE.getSemanticHint().equals(proposedType)) {
+		if (SysMLElementTypes.ASSOCIATION_NONE.getSemanticHint().equals(proposedType)) {
 			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
 		}
-		if(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.getSemanticHint().equals(proposedType)) {
+		if (SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.getSemanticHint().equals(proposedType)) {
 			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
 		}
-		if(SysMLElementTypes.ASSOCIATION_COMPOSITE.getSemanticHint().equals(proposedType)) {
+		if (SysMLElementTypes.ASSOCIATION_COMPOSITE.getSemanticHint().equals(proposedType)) {
 			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
 		}
-		if(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.getSemanticHint().equals(proposedType)) {
+		if (SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.getSemanticHint().equals(proposedType)) {
 			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
 		}
-		if(SysMLElementTypes.ASSOCIATION_SHARED.getSemanticHint().equals(proposedType)) {
+		if (SysMLElementTypes.ASSOCIATION_SHARED.getSemanticHint().equals(proposedType)) {
 			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
 		}
-		if(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.getSemanticHint().equals(proposedType)) {
+		if (SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.getSemanticHint().equals(proposedType)) {
 			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
 		}
 		// End of user code
 
-		if(SysMLElementTypes.ASSOCIATION.getSemanticHint().equals(proposedType)) {
+		if (SysMLElementTypes.ASSOCIATION.getSemanticHint().equals(proposedType)) {
 			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
 		}
-		if(UMLElementTypes.USAGE.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.USAGE.getSemanticHint().equals(proposedType)) {
 			return UMLGraphicalTypes.LINK_UML_USAGE_ID;
 		}
-		if(UMLElementTypes.INTERFACE_REALIZATION.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.INTERFACE_REALIZATION.getSemanticHint().equals(proposedType)) {
 			return UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID;
 		}
-		if(UMLElementTypes.DEPENDENCY.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.DEPENDENCY.getSemanticHint().equals(proposedType)) {
 			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
 		}
-		if(UMLElementTypes.GENERALIZATION.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.GENERALIZATION.getSemanticHint().equals(proposedType)) {
 			return UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID;
 		}
 		return super.getEdgeGraphicalType(proposedType);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomViewProvider.java
index 1ec45dde241..d271616454d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomViewProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java
index 979568bd130..3de817da6d2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -34,79 +34,79 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
 
 
 	/** ClassDiagram :: MODEL */
-	public static final IHintedType MODEL = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_2005"); //$NON-NLS-1$
+	public static final IHintedType MODEL = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_2005"); //$NON-NLS-1$
 
 	public static final String MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7009"; //$NON-NLS-1$
 
 	public static final String MODEL_LABEL_NAME_TN_HINT = "5020"; //$NON-NLS-1$
 
 	/** ClassDiagram :: MODEL_CN */
-	public static final IHintedType MODEL_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_3024"); //$NON-NLS-1$
+	public static final IHintedType MODEL_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_3024"); //$NON-NLS-1$
 
 	public static final String MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7030"; //$NON-NLS-1$
 
 	public static final String MODEL_CN_LABEL_NAME_HINT = "5052"; //$NON-NLS-1$
 
 	/** ClassDiagram :: PACKAGE */
-	public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
+	public static final IHintedType PACKAGE = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
 
 	public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7016"; //$NON-NLS-1$
 
 	public static final String PACKAGE_LABEL_NAME_HINT = "5026"; //$NON-NLS-1$
 
 	/** ClassDiagram :: PACKAGE_CN */
-	public static final IHintedType PACKAGE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
+	public static final IHintedType PACKAGE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
 
 	public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7010"; //$NON-NLS-1$
 
 	public static final String PACKAGE_CN_LABEL_NAME_HINT = "5017"; //$NON-NLS-1$
 
 	/** ClassDiagram :: INSTANCE_SPECIFICATION */
-	public static final IHintedType INSTANCE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"); //$NON-NLS-1$
+	public static final IHintedType INSTANCE_SPECIFICATION = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"); //$NON-NLS-1$
 
 	public static final String INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT = "7001"; //$NON-NLS-1$
 
 	public static final String INSTANCE_SPECIFICATION_LABEL_NAME_HINT = "5002"; //$NON-NLS-1$
 
 	/** ClassDiagram :: INSTANCE_SPECIFICATION_CN */
-	public static final IHintedType INSTANCE_SPECIFICATION_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020"); //$NON-NLS-1$
+	public static final IHintedType INSTANCE_SPECIFICATION_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020"); //$NON-NLS-1$
 
 	public static final String INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT = "7035"; //$NON-NLS-1$
 
 	public static final String INSTANCE_SPECIFICATION_CN_LABEL_NAME_HINT = "5040"; //$NON-NLS-1$
 
 	/** ClassDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$
 
 	public static final String CONSTRAINT_LABEL_NAME_HINT = "5037"; //$NON-NLS-1$
 
 	public static final String CONSTRAINT_LABEL_BODY_HINT = "5159"; //$NON-NLS-1$
 
 	/** ClassDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$
 
 	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "5064"; //$NON-NLS-1$
 
 	public static final String CONSTRAINT_CN_LABEL_BODY_HINT = "5160"; //$NON-NLS-1$
 
 	/** ClassDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$
+	public static final IHintedType COMMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$
 
 	public static final String COMMENT_LABEL_BODY_HINT = "5038"; //$NON-NLS-1$
 
 	/** ClassDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$
 
 	public static final String COMMENT_CN_LABEL_BODY_HINT = "5063"; //$NON-NLS-1$
 
 
 	/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
 
 	/** ClassDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$
 
 	/** ClassDiagram :: ChildLabelNodes */
-	public static final IHintedType INSTANCE_SPECIFICATION_SLOT_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"); //$NON-NLS-1$
+	public static final IHintedType INSTANCE_SPECIFICATION_SLOT_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"); //$NON-NLS-1$
 
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/GraphicalTypeRegistry.java
index 23a3d362ca9..0c4d5755417 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/GraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/GraphicalTypeRegistry.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -50,7 +50,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 		knownNodes.add(UMLElementTypes.INSTANCE_SPECIFICATION.getSemanticHint());
 		knownNodes.add(UMLElementTypes.CONSTRAINT.getSemanticHint());
 		knownNodes.add(UMLElementTypes.COMMENT.getSemanticHint());
-		
+
 		knownNodes.add(ElementTypes.MODEL.getSemanticHint());
 		knownNodes.add(ElementTypes.MODEL_CN.getSemanticHint());
 		knownNodes.add(ElementTypes.PACKAGE.getSemanticHint());
@@ -73,7 +73,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	public String getEdgeGraphicalType(EObject domainElement) {
 
 		String graphicalType = UNDEFINED_TYPE;
-		if(domainElement == null) {
+		if (domainElement == null) {
 			return UNDEFINED_TYPE;
 		}
 		return graphicalType;
@@ -83,8 +83,8 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getEdgeGraphicalType(IElementType elementType) {
-		if(elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType)elementType).getSemanticHint();
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
 			return getEdgeGraphicalType(semanticHint);
 		}
 
@@ -95,7 +95,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getEdgeGraphicalType(String proposedType) {
-		if(isKnownEdgeType(proposedType)) {
+		if (isKnownEdgeType(proposedType)) {
 			return proposedType;
 		}
 
@@ -108,111 +108,111 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	public String getNodeGraphicalType(EObject domainElement, String containerType) {
 
 		String graphicalType = UNDEFINED_TYPE;
-		if((containerType == null) || (domainElement == null)) {
+		if ((containerType == null) || (domainElement == null)) {
 			return UNDEFINED_TYPE;
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Model) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Model TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Model) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Model TopNode
 				graphicalType = ElementTypes.MODEL.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
 				graphicalType = ElementTypes.MODEL_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
 				graphicalType = ElementTypes.MODEL_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
 				graphicalType = ElementTypes.MODEL_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
 				graphicalType = ElementTypes.MODEL_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Package TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Package) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Package TopNode
 				graphicalType = ElementTypes.PACKAGE.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
 				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
 				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
 				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
 				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.InstanceSpecification) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // InstanceSpecification TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.InstanceSpecification) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // InstanceSpecification TopNode
 				graphicalType = ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
 				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
 				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
 				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
 				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Constraint) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				graphicalType = ElementTypes.CONSTRAINT.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Comment) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
 				graphicalType = ElementTypes.COMMENT.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Slot) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Slot) {
 
-			if(ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Slot ChildLabelNode
+			if (ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Slot ChildLabelNode
 				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint();
 			}
-			if(ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Slot ChildLabelNode
+			if (ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Slot ChildLabelNode
 				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint();
 			}
 		}
@@ -224,8 +224,8 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getNodeGraphicalType(IElementType elementType, String containerType) {
-		if(elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType)elementType).getSemanticHint();
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
 			return getNodeGraphicalType(semanticHint, containerType);
 		}
 
@@ -241,124 +241,124 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 		// A better implementation should be provided, this one is not subtle but should have minimal side effect
 		// (see bug #348550)
 
-		if(UMLElementTypes.MODEL.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.MODEL.getSemanticHint().equals(proposedType)) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				return ElementTypes.MODEL.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.MODEL_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.MODEL_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.MODEL_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.MODEL_CN.getSemanticHint();
 			}
 
 			return UNDEFINED_TYPE;
 		}
-		
-		if(UMLElementTypes.PACKAGE.getSemanticHint().equals(proposedType)) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+		if (UMLElementTypes.PACKAGE.getSemanticHint().equals(proposedType)) {
+
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				return ElementTypes.PACKAGE.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
 
 			return UNDEFINED_TYPE;
 		}
-		
-		if((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+		if ((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
+
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				return ElementTypes.COMMENT.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.COMMENT_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.COMMENT_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.COMMENT_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.COMMENT_CN.getSemanticHint();
 			}
 
 			return UNDEFINED_TYPE;
 		}
 
-		if(UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				return ElementTypes.CONSTRAINT.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
 
 			return UNDEFINED_TYPE;
 		}
 
-		if(UMLElementTypes.INSTANCE_SPECIFICATION.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.INSTANCE_SPECIFICATION.getSemanticHint().equals(proposedType)) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				return ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
 			}
 
 			return UNDEFINED_TYPE;
 		}
-		
-		if(UMLElementTypes.SLOT.getSemanticHint().equals(proposedType)) {
 
-			if(ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Constraint ChildNode
+		if (UMLElementTypes.SLOT.getSemanticHint().equals(proposedType)) {
+
+			if (ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint();
 			}
-			if(ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Constraint ChildNode
 				return ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint();
 			}
 
 			return UNDEFINED_TYPE;
 		}
 		// Initial implementation (to be improved - see : getNodeGraphicalType(EObject domainElement, String containerType))
-		if(isKnownNodeType(proposedType)) {
+		if (isKnownNodeType(proposedType)) {
 			return proposedType;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramEditPartProvider.java
index 2cfb264dae4..c48b5404d86 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramEditPartProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,11 +26,11 @@ public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider {
 
 	@Override
 	public synchronized boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View view = ((IEditPartOperation) operation).getView();
 
 			// Ensure current diagram is a BlockDefinition Diagram
-			if(!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
+			if (!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
 				return false;
 			}
 
@@ -38,22 +38,22 @@ public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider {
 			EObject eobject = view.getElement();
 
 			/** Nodes (and ChildLabelNodes) *********** */
-			if(eobject instanceof org.eclipse.uml2.uml.Model) {
+			if (eobject instanceof org.eclipse.uml2.uml.Model) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Package) {
+			if (eobject instanceof org.eclipse.uml2.uml.Package) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.InstanceSpecification) {
+			if (eobject instanceof org.eclipse.uml2.uml.InstanceSpecification) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Constraint) {
+			if (eobject instanceof org.eclipse.uml2.uml.Constraint) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Comment) {
+			if (eobject instanceof org.eclipse.uml2.uml.Comment) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Slot) {
+			if (eobject instanceof org.eclipse.uml2.uml.Slot) {
 				return true;
 			}
 
@@ -65,11 +65,11 @@ public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider {
 			String hint = view.getType();
 
 			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
+			if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
 				return true;
 			}
 			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
+			if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
 				return true;
 			}
 
@@ -83,8 +83,9 @@ public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider {
 	 * EditPart replacement for ChildLabelNodes from inherited diagram.
 	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=351433
 	 */
+	@Override
 	protected IGraphicalEditPart createEditPart(View view) {
-		if(ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint().equals(view.getType())) {
+		if (ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint().equals(view.getType())) {
 			return new SlotChildLabelEditPart(view);
 		}
 		return super.createEditPart(view);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
index 0faa6b9d8c6..6c7d453aa17 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -41,27 +41,27 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 	@Override
 	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
 		Edge createdEdge = null;
-		IElementType elementType = (IElementType)semanticAdapter.getAdapter(IElementType.class);
-		if(elementType != null) {
+		IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
+		if (elementType != null) {
 			createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
 		} else {
-			EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
+			EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
 			String domainElementGraphicalType = semanticHint;
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
 				// Cannot use createEdge from super class as it never take the graphical type (semanticHint) into account.
 				// createdEdge = super.createEdge(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
-				if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createCommentAnnotatedElement_4013(containerView, index, persisted, preferencesHint);
 				}
-				if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createConstraintConstrainedElement_4014(containerView, index, persisted, preferencesHint);
 				}
 			}
 		}
-		if(createdEdge == null) {
+		if (createdEdge == null) {
 			log.error(new Exception("Could not create Edge."));
 		}
 		return createdEdge;
@@ -71,7 +71,7 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 	protected boolean provides(CreateViewForKindOperation op) {
 		// Never use this method (often incorrectly implemented due to GMF Tooling choices).
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 		throw new UnsupportedOperationException("Should never be called by the " + diagramType + " diagram.");
@@ -80,44 +80,44 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 	@Override
 	protected boolean provides(CreateEdgeViewOperation op) {
 		// Must have a container
-		if(op.getContainerView() == null) {
+		if (op.getContainerView() == null) {
 			return false;
 		}
 		// This provider is registered for BlockDefinition Diagram only
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if(elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
+		if (elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
 			return true;
 		}
-		if(elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
+		if (elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
 			return true;
 		}
 		// /////////////////////////////////////////////////////////////////////
 		// Test possibility to provide a view based on the semantic nature and its expected container.
 		// /////////////////////////////////////////////////////////////////////
 		// IElementType may be an extended type. Check for a view based on this element type
-		if(elementType instanceof IExtendedHintedElementType) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		if (elementType instanceof IExtendedHintedElementType) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
 		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.	
-		if(elementType == null) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		// In such a case, test the semantic EObject instead.
+		if (elementType == null) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
@@ -127,115 +127,115 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 	@Override
 	protected boolean provides(CreateNodeViewOperation op) {
 		// Must have a container
-		if(op.getContainerView() == null) {
+		if (op.getContainerView() == null) {
 			return false;
 		}
 		// Get the type of the container
 		String containerGraphicalType = op.getContainerView().getType();
 		// This provider is registered for BlockDefinition Diagram only
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 		// /////////////////////////////////////////////////////////////////////
 		// Test possibility to provide a view based on the ElementType and its expected container.
 		// /////////////////////////////////////////////////////////////////////
-		IElementType elementType = (IElementType)op.getSemanticAdapter().getAdapter(IElementType.class);
-		if(elementType == UMLElementTypes.MODEL) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		IElementType elementType = (IElementType) op.getSemanticAdapter().getAdapter(IElementType.class);
+		if (elementType == UMLElementTypes.MODEL) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 			return false;
 		}
-		if(elementType == UMLElementTypes.PACKAGE) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == UMLElementTypes.PACKAGE) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 			return false;
 		}
-		if(elementType == UMLElementTypes.INSTANCE_SPECIFICATION) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == UMLElementTypes.INSTANCE_SPECIFICATION) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 			return false;
 		}
-		if(elementType == UMLElementTypes.CONSTRAINT) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == UMLElementTypes.CONSTRAINT) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 			return false;
 		}
-		if(elementType == UMLElementTypes.COMMENT) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == UMLElementTypes.COMMENT) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 			return false;
 		}
-		if(elementType == UMLElementTypes.SLOT) {
-			if(ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT.equals(containerGraphicalType)) {
+		if (elementType == UMLElementTypes.SLOT) {
+			if (ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 			return false;
@@ -244,30 +244,30 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 		// Test possibility to provide a view based on the semantic nature and its expected container.
 		// /////////////////////////////////////////////////////////////////////
 		// IElementType may be an extended type. Check for a view based on this element type
-		if(elementType instanceof IExtendedHintedElementType) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		if (elementType instanceof IExtendedHintedElementType) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 			} else {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
-		
+
 		// IElementType may be null (especially when drop from ModelExplorer).
 		// In such a case, test the semantic EObject instead.
-		if(elementType == null) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		if (elementType == null) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 			} else {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
@@ -280,25 +280,25 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 		// Get the type of the container
 		String containerGraphicalType = containerView.getType();
 		// Get the type of the domain element
-		EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
-		if(semanticHint != null) {
+		EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (semanticHint != null) {
 			// Look for a possible graphicalType replacement
 			String graphicalType = registry.getNodeGraphicalType(semanticHint, containerGraphicalType);
 			return super.createNode(new SemanticAdapter(domainElement, null), containerView, graphicalType, index, persisted, preferencesHint);
 		}
 		String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-		//		if(semanticHint != null) {
-		//			return super.createNode(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-		//		}
+		// if(semanticHint != null) {
+		// return super.createNode(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
+		// }
 		//
-		//		// Use the GraphicalTypeRegistry to find the expected type for a domain element
-		//		// Get the type of the container
-		//		String containerGraphicalType = containerView.getType();
-		//		// Get the type of the domain element
-		//		EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
-		//		String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
+		// // Use the GraphicalTypeRegistry to find the expected type for a domain element
+		// // Get the type of the container
+		// String containerGraphicalType = containerView.getType();
+		// // Get the type of the domain element
+		// EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
+		// String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 		// Create the expected node
-		if(!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
+		if (!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
 			return super.createNode(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
 		}
 		log.error(new Exception("Could not create Node."));
@@ -307,7 +307,7 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 
 	@Override
 	protected void stampShortcut(View containerView, Node target) {
-		if(!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
+		if (!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
 			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
 			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
 			shortcutAnnotation.getDetails().put("modelID", ElementTypes.DIAGRAM_ID); //$NON-NLS-1$
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
index e428045b47d..e43a05ef838 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application

  *

@@ -25,6 +25,7 @@ public class BlockDefinitionDiagramCondition extends PerspectiveContextDependenc
 	/**

 	 * {@inheritDoc}

 	 */

+	@Override

 	public boolean create(EObject selectedElement) {

 		return false;

 	}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/command/CustomDeleteCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/command/CustomDeleteCommand.java
index f064719248a..cd9fcf923d6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/command/CustomDeleteCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/command/CustomDeleteCommand.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -25,30 +25,32 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

 

 /**

- * 

- * <UL>The purpose of this command is to delete view by taking following situation:

- * <LI> if the view is placed direclty on the diagram, do nothing

- * <LI> if the view is placed into another container, the semantic of the container must be the parent of the semantic view 

- *</UL>

+ *

+ * <UL>

+ * The purpose of this command is to delete view by taking following situation:

+ * <LI>if the view is placed direclty on the diagram, do nothing

+ * <LI>if the view is placed into another container, the semantic of the container must be the parent of the semantic view

+ * </UL>

  */

-public class CustomDeleteCommand extends DeleteCommand{

+public class CustomDeleteCommand extends DeleteCommand {

 

 	public CustomDeleteCommand(TransactionalEditingDomain editingDomain, View view) {

 		super(editingDomain, view);

 	}

+

 	@Override

 	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		String containerType = ViewUtil.getViewContainer(getView()) != null ? ViewUtil.getViewContainer(getView()).getType() : null;		

-		if((containerType != null) && !ElementTypes.DIAGRAM_ID.equals(containerType)) {

-			//if the associated element is different of null

-			if(getView().getElement()!=null){

-				//if the container is different of null

-				if( ViewUtil.getContainerView(getView())!=null&& ViewUtil.getContainerView(getView()).getElement()!=null){

-					//if the parent of the current element is different of the semantic element of the parent view we have to destroy

-					if(!getView().getElement().eContainer().equals(ViewUtil.getContainerView(getView()).getElement()) ){

+		String containerType = ViewUtil.getViewContainer(getView()) != null ? ViewUtil.getViewContainer(getView()).getType() : null;

+		if ((containerType != null) && !ElementTypes.DIAGRAM_ID.equals(containerType)) {

+			// if the associated element is different of null

+			if (getView().getElement() != null) {

+				// if the container is different of null

+				if (ViewUtil.getContainerView(getView()) != null && ViewUtil.getContainerView(getView()).getElement() != null) {

+					// if the parent of the current element is different of the semantic element of the parent view we have to destroy

+					if (!getView().getElement().eContainer().equals(ViewUtil.getContainerView(getView()).getElement())) {

 						return super.doExecute(monitor, info);

 					}

-					

+

 				}

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/dnd/helper/CustomLinkMappingHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/dnd/helper/CustomLinkMappingHelper.java
index a3544ab1b5b..ccbc55f8058 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/dnd/helper/CustomLinkMappingHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/dnd/helper/CustomLinkMappingHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -38,41 +38,43 @@ public class CustomLinkMappingHelper implements ILinkMappingHelper {
 	public Collection<?> getSource(Element link) {

 		CommonSourceUMLSwitch umlSwitch = new CommonSourceUMLSwitch() {

 

+			@Override

 			public java.util.Collection<?> caseAssociation(org.eclipse.uml2.uml.Association object) {

 

 				java.util.Collection<?> ends = Collections.emptySet();

-				

+

 				// Binary associations only in this diagram.

 				// Other expectation:

 				// - property ends are typed by Classifiers

 				// - property ends are type is not null

-				

-				if(object.getMemberEnds().size() == 2) {

-					

+

+				if (object.getMemberEnds().size() == 2) {

+

 					Property semanticTarget = object.getMemberEnds().get(1);

-					

+

 					// The proposed graphical target is a representation of the type of

 					// the semantic source.

 					Type sourceType = semanticTarget.getType();

 					if ((sourceType != null) && (sourceType instanceof Classifier)) {

-						ends = Arrays.asList(new EObject[]{sourceType});

+						ends = Arrays.asList(new EObject[] { sourceType });

 					}

-					

+

 				} else {

 					// TODO: log warning here - can only drop binary associations in this diagram...

 				}

-				

+

 				return ends;

 			};

 

-			//			public java.util.Collection<?> caseAssociationClass(org.eclipse.uml2.uml.AssociationClass object) {

-			//				return object.getEndTypes();

-			//			};

+			// public java.util.Collection<?> caseAssociationClass(org.eclipse.uml2.uml.AssociationClass object) {

+			// return object.getEndTypes();

+			// };

 

-			//			public java.util.Collection<?> caseGeneralizationSet(org.eclipse.uml2.uml.GeneralizationSet object) {

-			//				return object.getGeneralizations();

-			//			};

+			// public java.util.Collection<?> caseGeneralizationSet(org.eclipse.uml2.uml.GeneralizationSet object) {

+			// return object.getGeneralizations();

+			// };

 

+			@Override

 			public java.util.Collection<?> caseInterfaceRealization(org.eclipse.uml2.uml.InterfaceRealization object) {

 				ArrayList<EObject> result = new ArrayList<EObject>();

 				result.add(object.getImplementingClassifier());

@@ -89,41 +91,43 @@ public class CustomLinkMappingHelper implements ILinkMappingHelper {
 	public Collection<?> getTarget(Element link) {

 		CommonTargetUMLSwitch umlSwitch = new CommonTargetUMLSwitch() {

 

+			@Override

 			public java.util.Collection<?> caseAssociation(org.eclipse.uml2.uml.Association object) {

-				

+

 				java.util.Collection<?> ends = Collections.emptySet();

-				

+

 				// Binary associations only in this diagram.

 				// Other expectation:

 				// - property ends are typed by Classifiers

 				// - property ends are type is not null

-				

-				if(object.getMemberEnds().size() == 2) {

-					

+

+				if (object.getMemberEnds().size() == 2) {

+

 					Property semanticSource = object.getMemberEnds().get(0);

-					

+

 					// The proposed graphical target is a representation of the type of

 					// the semantic source.

 					Type sourceType = semanticSource.getType();

 					if ((sourceType != null) && (sourceType instanceof Classifier)) {

-						ends = Arrays.asList(new EObject[]{sourceType});

+						ends = Arrays.asList(new EObject[] { sourceType });

 					}

-										

+

 				} else {

 					// TODO: log warning here - can only drop binary associations in this diagram...

 				}

-				

+

 				return ends;

 			};

 

-			//			public java.util.Collection<?> caseAssociationClass(org.eclipse.uml2.uml.AssociationClass object) {

-			//				return object.getEndTypes();

-			//			};

+			// public java.util.Collection<?> caseAssociationClass(org.eclipse.uml2.uml.AssociationClass object) {

+			// return object.getEndTypes();

+			// };

 

-			//			public java.util.Collection<?> caseGeneralizationSet(org.eclipse.uml2.uml.GeneralizationSet object) {

-			//				return object.getGeneralizations();

-			//			};

+			// public java.util.Collection<?> caseGeneralizationSet(org.eclipse.uml2.uml.GeneralizationSet object) {

+			// return object.getGeneralizations();

+			// };

 

+			@Override

 			public java.util.Collection<?> caseInterfaceRealization(org.eclipse.uml2.uml.InterfaceRealization object) {

 				ArrayList<EObject> result = new ArrayList<EObject>();

 				result.add(object.getContract());

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
index ca3002c4d0b..4a4c15ae5d8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -21,26 +21,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.dnd.helper.CustomLinkMappingHelper;

 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomGraphicalTypeRegistry;

 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.GraphicalTypeRegistry;

 import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemanticEditPolicy;

 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLCreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

 import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

  * <pre>

  * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference 

+ * in order to manage Class Diagram specific elements (reference

  * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

  * </pre>

  */

@@ -48,45 +45,46 @@ public class CustomBlockCompositeSemanticEditPolicy extends BlockCompositeSemant
 

 	/** Local graphical type registry for graphical elements */

 	private IGraphicalTypeRegistry registry = new CustomGraphicalTypeRegistry();

-	

+

 	/** Local graphical type registry for inherited graphical elements */

 	private IGraphicalTypeRegistry inheritedRegistry = new GraphicalTypeRegistry();

-	

+

 	private CreateOrShowExistingElementHelper existingElementHelper = new SysMLCreateOrShowExistingElementHelper();

+

 	/**

 	 * {@inheritDoc}

 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

 

-		if(inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

-		if(!registry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 		final Command defaultCommand = super.getCreateRelationshipCommand(req);

 		final IElementType elementType = req.getElementType();

 		final EClass eClass = elementType.getEClass();

-		if(defaultCommand.canExecute()) {

-			if(elementType.getEClass() == UMLPackage.eINSTANCE.getAssociation()) {

+		if (defaultCommand.canExecute()) {

+			if (elementType.getEClass() == UMLPackage.eINSTANCE.getAssociation()) {

 				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if(eClass == UMLPackage.eINSTANCE.getDependency()) {

+			} else if (eClass == UMLPackage.eINSTANCE.getDependency()) {

 				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if(eClass == UMLPackage.eINSTANCE.getGeneralization()) {

+			} else if (eClass == UMLPackage.eINSTANCE.getGeneralization()) {

 				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if(eClass == UMLPackage.eINSTANCE.getUsage()) {

+			} else if (eClass == UMLPackage.eINSTANCE.getUsage()) {

 				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

 			}

 		}

@@ -99,14 +97,14 @@ public class CustomBlockCompositeSemanticEditPolicy extends BlockCompositeSemant
 	@Override

 	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

 

-		View reconnectedView = (View)req.getParameter(RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : IGraphicalTypeRegistry.UNDEFINED_TYPE;

+		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

+		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDefaultSemanticEditPolicy.java
index 3b2d9cb846b..e1cb3586a93 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDefaultSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDefaultSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -37,7 +37,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**

  * <pre>

  * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference 

+ * in order to manage Class Diagram specific elements (reference

  * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

  * </pre>

  */

@@ -50,42 +50,43 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 	private IGraphicalTypeRegistry inheritedRegistry = new GraphicalTypeRegistry();

 

 	private CreateOrShowExistingElementHelper existingElementHelper = new SysMLCreateOrShowExistingElementHelper();

+

 	/**

 	 * {@inheritDoc}

 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

 

-		if(inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

-		if(!registry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 		final Command defaultCommand = super.getCreateRelationshipCommand(req);

-		if(defaultCommand.canExecute()  && req.getSource()!=null && req.getTarget()!=null) {

+		if (defaultCommand.canExecute() && req.getSource() != null && req.getTarget() != null) {

 			final EClass eClass = req.getElementType().getEClass();

 			final IElementType elementType = req.getElementType();

-			if(UMLPackage.eINSTANCE.getInterfaceRealization()==eClass){

-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand,elementType);

-			}else if(elementType.getEClass() == UMLPackage.eINSTANCE.getAssociation()) {

+			if (UMLPackage.eINSTANCE.getInterfaceRealization() == eClass) {

+				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

+			} else if (elementType.getEClass() == UMLPackage.eINSTANCE.getAssociation()) {

 				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if(eClass == UMLPackage.eINSTANCE.getDependency()) {

+			} else if (eClass == UMLPackage.eINSTANCE.getDependency()) {

 				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if(eClass == UMLPackage.eINSTANCE.getGeneralization()) {

+			} else if (eClass == UMLPackage.eINSTANCE.getGeneralization()) {

 				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if(eClass == UMLPackage.eINSTANCE.getUsage()) {

+			} else if (eClass == UMLPackage.eINSTANCE.getUsage()) {

 				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

 			}

 		}

@@ -98,14 +99,14 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 	@Override

 	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

 

-		View reconnectedView = (View)req.getParameter(RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : IGraphicalTypeRegistry.UNDEFINED_TYPE;

+		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

+		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDiagramDragDropEditPolicy.java
index bbfee6394b2..c3ee977720e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDiagramDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDiagramDragDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -50,20 +50,20 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	protected Set<String> getSpecificDropBehaviorTypes() {

 		return Collections.emptySet();

 	}

-	

+

 	/**

 	 * {@inheritDoc}

 	 */

 	@Override

 	protected ICommand getUnknownDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject) {

-		

+

 		// Add a notification message in case an attempt to drop a UML Association in this diagram occurs.

 		if ((droppedEObject instanceof Association) && !(droppedEObject instanceof AssociationClass)) {

 			if (!((ISpecializationType) SysMLElementTypes.ASSOCIATION).getMatcher().matches(droppedEObject)) {

 				return new IdentityCommandWithNotification(Messages.Notification_Drop_Title, NLS.bind(Messages.Notification_Drop_UMLAssociationWarning, EMFCoreUtil.getQualifiedName(droppedEObject, true)), Type.WARNING);

 			}

 		}

-		

+

 		return super.getUnknownDropCommand(dropRequest, droppedEObject);

 	}

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageCreationEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageCreationEditPolicy.java
index f5446efa8b0..88333fc65a5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageCreationEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageCreationEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -35,79 +35,81 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultCreationEditPolicy;

 

 /**

- * this editpolicy allow graphical and semantic reparent for contained elements  

+ * this editpolicy allow graphical and semantic reparent for contained elements

  *

  */

 

 public class PackageCreationEditPolicy extends DefaultCreationEditPolicy {

-	

+

 	/**

-	 * return a command to reparent both the semantic and view elements. 

-	 * @param request the request

+	 * return a command to reparent both the semantic and view elements.

+	 * 

+	 * @param request

+	 *            the request

 	 * @return command

 	 */

+	@Override

 	protected Command getReparentCommand(ChangeBoundsRequest request) {

 		Iterator<EditPart> editParts = request.getEditParts().iterator();

-		View container = (View)getHost().getAdapter(View.class);

+		View container = (View) getHost().getAdapter(View.class);

 		EObject context = container == null ? null : ViewUtil.resolveSemanticElement(container);

-        CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);

-		while ( editParts.hasNext() ) {

-			EditPart ep = (EditPart)editParts.next();

-			if ( ep instanceof LabelEditPart ) {

+		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);

+		while (editParts.hasNext()) {

+			EditPart ep = editParts.next();

+			if (ep instanceof LabelEditPart) {

 				continue;

 			}

 			if (ep instanceof GroupEditPart) {

-                cc.compose(getReparentGroupCommand((GroupEditPart) ep));

-            }		

-			View view = (View)ep.getAdapter(View.class);

-			if ( view == null ) {

+				cc.compose(getReparentGroupCommand((GroupEditPart) ep));

+			}

+			View view = (View) ep.getAdapter(View.class);

+			if (view == null) {

 				continue;

 			}

-			

+

 			EObject semantic = ViewUtil.resolveSemanticElement(view);

-			if ( semantic == null ) {

-				cc.compose(getReparentViewCommand((IGraphicalEditPart)ep));

+			if (semantic == null) {

+				cc.compose(getReparentViewCommand((IGraphicalEditPart) ep));

 			}

-			else if ( context != null && shouldReparent(semantic, context)) {

-				cc.compose(getReparentCommand((IGraphicalEditPart)ep));

+			else if (context != null && shouldReparent(semantic, context)) {

+				cc.compose(getReparentCommand((IGraphicalEditPart) ep));

 			}

 		}

 		return cc.isEmpty() ? null : new ICommandProxy(cc.reduce());

 	}

-	

-	

+

+

 	/**

-	 *change the order of the move, first graphical, then semantic to launch behavior about editservice

-	 * {@inheritDoc}

+	 * change the order of the move, first graphical, then semantic to launch behavior about editservice {@inheritDoc}

 	 */

 	@Override

-	protected ICommand getReparentCommand( IGraphicalEditPart gep ) {

-        CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label); 

-		View container = (View)getHost().getModel();

+	protected ICommand getReparentCommand(IGraphicalEditPart gep) {

+		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);

+		View container = (View) getHost().getModel();

 		EObject context = ViewUtil.resolveSemanticElement(container);

-		View view = (View)gep.getModel();

+		View view = (View) gep.getModel();

 		EObject element = ViewUtil.resolveSemanticElement(view);

 

-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())

-            .getEditingDomain();

-    	//

+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())

+				.getEditingDomain();

+		//

 		// notation

 		cc.compose(getReparentViewCommand(gep));

-        //

+		//

 		// semantic

-		if ( element != null ) {

+		if (element != null) {

 			Command moveSemanticCmd =

-				getHost().getCommand(

-					new EditCommandRequestWrapper(

-						new MoveRequest(editingDomain, context, element)));

-            

-              if (moveSemanticCmd == null) {

-                  return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

-              }

-			

-			cc.compose ( new CommandProxy(moveSemanticCmd) );

+					getHost().getCommand(

+							new EditCommandRequestWrapper(

+									new MoveRequest(editingDomain, context, element)));

+

+			if (moveSemanticCmd == null) {

+				return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

+			}

+

+			cc.compose(new CommandProxy(moveSemanticCmd));

 		}

-	

+

 		return cc;

 	}

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageSemanticEditPolicy.java
index 90db7109190..c833d8c7d9f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -23,29 +23,31 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+

 /**

  * this editpolicy allow the move command between semantic element

  *

  */

 

 public class PackageSemanticEditPolicy extends DefaultSemanticEditPolicy {

-	

+

 	/**

 	 * allow the move command between elements

 	 */

-		protected Command getMoveCommand(MoveRequest req) {

-			EObject targetCEObject = req.getTargetContainer();

-			if(targetCEObject != null) {

-				IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);

-				if(provider != null) {

-					ICommand moveCommand = provider.getEditCommand(req);

-					if(moveCommand != null) {

-						return new ICommandProxy(moveCommand);

-					}

+	@Override

+	protected Command getMoveCommand(MoveRequest req) {

+		EObject targetCEObject = req.getTargetContainer();

+		if (targetCEObject != null) {

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);

+			if (provider != null) {

+				ICommand moveCommand = provider.getEditCommand(req);

+				if (moveCommand != null) {

+					return new ICommandProxy(moveCommand);

 				}

-				return UnexecutableCommand.INSTANCE;

-			} else {

-				return getGEFWrapper(new MoveElementsCommand(req));

 			}

+			return UnexecutableCommand.INSTANCE;

+		} else {

+			return getGEFWrapper(new MoveElementsCommand(req));

 		}

+	}

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java
index 7fdbe23cd00..db7bcdb38e5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -22,16 +22,16 @@ import org.eclipse.papyrus.sysml.diagram.blockdefinition.part.SysMLVisualIDRegis
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractUMLShowHideRelatedLinkEditPolicy;

 

 /**

- * 

+ *

  * The edit policy to use in the IBD diagram to restore existing links

- * 

+ *

  */

 public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLinkEditPolicy {

 

 	/**

-	 * 

+	 *

 	 * Constructor.

-	 * 

+	 *

 	 * @param host

 	 */

 	public ShowHideRelatedLinkEditPolicy(DiagramEditPart host) {

@@ -39,9 +39,9 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IDiagramInformationProviderEditPolicy#getDiagramUpdater()

-	 * 

+	 *

 	 * @return

 	 */

 	public DiagramUpdater getDiagramUpdater() {

@@ -49,9 +49,9 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IDiagramInformationProviderEditPolicy#getDiagramStructure()

-	 * 

+	 *

 	 * @return

 	 */

 	public DiagramStructure getDiagramStructure() {

@@ -59,9 +59,9 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#getSemanticHint(org.eclipse.emf.ecore.EObject)

-	 * 

+	 *

 	 * @param eobject

 	 * @return

 	 */

@@ -70,222 +70,223 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 		return SysMLVisualIDRegistry.getLinkWithClassVisualID(eobject);

 	}

 

-	//	/**

-	//	 * 

-	//	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#cleanAdd(java.util.Collection,

-	//	 *      org.eclipse.gmf.runtime.notation.View, java.util.List, java.util.Map)

-	//	 * 

-	//	 * @param result

-	//	 * @param view

-	//	 * @param descriptors

-	//	 * @param domain2NotationMap

-	//	 */

-	//	@Override

-	//	protected void cleanAdd(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Map<EObject, View> domain2NotationMap) {

-	//		cleanAddForConnector(result, view, descriptors, domain2NotationMap);

-	//		super.cleanAdd(result, view, descriptors, domain2NotationMap);

-	//	}

+	// /**

+	// *

+	// * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#cleanAdd(java.util.Collection,

+	// * org.eclipse.gmf.runtime.notation.View, java.util.List, java.util.Map)

+	// *

+	// * @param result

+	// * @param view

+	// * @param descriptors

+	// * @param domain2NotationMap

+	// */

+	// @Override

+	// protected void cleanAdd(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Map<EObject, View> domain2NotationMap) {

+	// cleanAddForConnector(result, view, descriptors, domain2NotationMap);

+	// super.cleanAdd(result, view, descriptors, domain2NotationMap);

+	// }

 	//

-	//	/**

-	//	 * This method manages descriptors representing Connector to verify that it

-	//	 * can be displayed according to the nestedPath of the {@link ConnectorEnd} If the connector can be displayed :

-	//	 * <ul>

-	//	 * <li>

-	//	 * the link descriptor is removed from descriptors and added to result</li>

-	//	 * <li>

-	//	 * the view associated to the role of the connector are added to domain2NotationMap (using the ConnectorEnd as key)</li>

-	//	 * </ul>

-	//	 * 

-	//	 * 

-	//	 * 

-	//	 * @param result

-	//	 *        the result of the method

-	//	 * @param view

-	//	 *        a view

-	//	 * @param descriptors

-	//	 *        the link descriptors

-	//	 * @param domain2NotationMap

-	//	 *        the map between model element and views

-	//	 * 

-	//	 * 

-	//	 */

-	//	protected void cleanAddForConnector(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Map<EObject, View> domain2NotationMap) {

-	//		final List<UpdaterLinkDescriptor> toRemove = new ArrayList<UpdaterLinkDescriptor>();

-	//		for(final Object current : descriptors) {

-	//			if(current instanceof UpdaterLinkDescriptor) {

-	//				final UpdaterLinkDescriptor descriptor = (UpdaterLinkDescriptor)current;

-	//				final EObject element = descriptor.getModelElement();

-	//				if(element instanceof Connector) {

-	//					if(canBeDisplayed((Connector)element, view, domain2NotationMap)) {

-	//						result.add((UpdaterLinkDescriptor)current);

-	//					}

-	//					toRemove.add((UpdaterLinkDescriptor)current);

-	//				}

-	//			}

-	//		}

-	//		descriptors.removeAll(toRemove);

-	//	}

+	// /**

+	// * This method manages descriptors representing Connector to verify that it

+	// * can be displayed according to the nestedPath of the {@link ConnectorEnd} If the connector can be displayed :

+	// * <ul>

+	// * <li>

+	// * the link descriptor is removed from descriptors and added to result</li>

+	// * <li>

+	// * the view associated to the role of the connector are added to domain2NotationMap (using the ConnectorEnd as key)</li>

+	// * </ul>

+	// *

+	// *

+	// *

+	// * @param result

+	// * the result of the method

+	// * @param view

+	// * a view

+	// * @param descriptors

+	// * the link descriptors

+	// * @param domain2NotationMap

+	// * the map between model element and views

+	// *

+	// *

+	// */

+	// protected void cleanAddForConnector(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Map<EObject, View> domain2NotationMap) {

+	// final List<UpdaterLinkDescriptor> toRemove = new ArrayList<UpdaterLinkDescriptor>();

+	// for(final Object current : descriptors) {

+	// if(current instanceof UpdaterLinkDescriptor) {

+	// final UpdaterLinkDescriptor descriptor = (UpdaterLinkDescriptor)current;

+	// final EObject element = descriptor.getModelElement();

+	// if(element instanceof Connector) {

+	// if(canBeDisplayed((Connector)element, view, domain2NotationMap)) {

+	// result.add((UpdaterLinkDescriptor)current);

+	// }

+	// toRemove.add((UpdaterLinkDescriptor)current);

+	// }

+	// }

+	// }

+	// descriptors.removeAll(toRemove);

+	// }

 

-	//	/**

-	//	 * 

-	//	 * @param end

-	//	 *        a connector end

-	//	 * @param view

-	//	 *        a view

-	//	 * @return <code>true</code> if the view represents the role of the

-	//	 *         connector AND if the view is encapsulated as required by the

-	//	 *         nested path of the connector end

-	//	 */

-	//	protected boolean isCorrectGraphicalView(final ConnectorEnd end, final View view) {

-	//		final NestedConnectorEnd nestedConnectorEnd = org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication(end, NestedConnectorEnd.class);

-	//		final Property partWithPort = end.getPartWithPort();

-	//		// final ConnectableElement role = end.getRole();

-	//		// 1. we get the top view of this view with the same semantic element

-	//		View localView = getTopViewWithSameSemanticElement(view);

+	// /**

+	// *

+	// * @param end

+	// * a connector end

+	// * @param view

+	// * a view

+	// * @return <code>true</code> if the view represents the role of the

+	// * connector AND if the view is encapsulated as required by the

+	// * nested path of the connector end

+	// */

+	// protected boolean isCorrectGraphicalView(final ConnectorEnd end, final View view) {

+	// final NestedConnectorEnd nestedConnectorEnd = org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication(end, NestedConnectorEnd.class);

+	// final Property partWithPort = end.getPartWithPort();

+	// // final ConnectableElement role = end.getRole();

+	// // 1. we get the top view of this view with the same semantic element

+	// View localView = getTopViewWithSameSemanticElement(view);

 	//

-	//		// 2. we verify the part with port

-	//		if(partWithPort != null) {

-	//			View parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(localView));

-	//			if(parent.getElement() != partWithPort) {

-	//				return false;

-	//			}

-	//		}

+	// // 2. we verify the part with port

+	// if(partWithPort != null) {

+	// View parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(localView));

+	// if(parent.getElement() != partWithPort) {

+	// return false;

+	// }

+	// }

 	//

-	//		// 3. we verify the nested path

-	//		if(nestedConnectorEnd != null && nestedConnectorEnd.getPropertyPath().size() > 0) {

-	//			View parent = view;

-	//			final List<Property> paths = nestedConnectorEnd.getPropertyPath();

-	//			for(int i = paths.size() - 1; i >= 0; i--) {

-	//				final Property currentProperty = paths.get(i);

-	//				parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(parent));

-	//				if(parent.getElement() != currentProperty) {

-	//					return false;

-	//				}

-	//			}

-	//		}

-	//		return true;

-	//	}

+	// // 3. we verify the nested path

+	// if(nestedConnectorEnd != null && nestedConnectorEnd.getPropertyPath().size() > 0) {

+	// View parent = view;

+	// final List<Property> paths = nestedConnectorEnd.getPropertyPath();

+	// for(int i = paths.size() - 1; i >= 0; i--) {

+	// final Property currentProperty = paths.get(i);

+	// parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(parent));

+	// if(parent.getElement() != currentProperty) {

+	// return false;

+	// }

+	// }

+	// }

+	// return true;

+	// }

 

-	//	/**

-	//	 * 

-	//	 * @param connector

-	//	 *        a connector

-	//	 * @param selectedView

-	//	 *        a view used as source or target for the connector to display

-	//	 * @param domain2NotationMap

-	//	 *        the map to complete if we found source and target View on the

-	//	 *        diagram to diplsay the connector

-	//	 * @return <code>true</code> if the view can be used as source/target for

-	//	 *         the connector according to the nested path AND if we found a

-	//	 *         second view for the 2nd connector end according to the nested

-	//	 *         path

-	//	 */

-	//	protected boolean canBeDisplayed(final Connector connector, final View selectedView, final Map<EObject, View> domain2NotationMap) {

-	//		// we need to verify the selected view

-	//		final EObject semanticElement = selectedView.getElement();

-	//		ConnectorEnd endForView = null;

+	// /**

+	// *

+	// * @param connector

+	// * a connector

+	// * @param selectedView

+	// * a view used as source or target for the connector to display

+	// * @param domain2NotationMap

+	// * the map to complete if we found source and target View on the

+	// * diagram to diplsay the connector

+	// * @return <code>true</code> if the view can be used as source/target for

+	// * the connector according to the nested path AND if we found a

+	// * second view for the 2nd connector end according to the nested

+	// * path

+	// */

+	// protected boolean canBeDisplayed(final Connector connector, final View selectedView, final Map<EObject, View> domain2NotationMap) {

+	// // we need to verify the selected view

+	// final EObject semanticElement = selectedView.getElement();

+	// ConnectorEnd endForView = null;

 	//

-	//		// 1. look for the connector end represented by the selected view

-	//		for(final ConnectorEnd current : connector.getEnds()) {

-	//			if(current.getRole() == semanticElement) {

-	//				endForView = current;

-	//				break;

-	//			}

-	//		}

-	//		Assert.isNotNull(endForView);

-	//		// 2. verify the view of the selected connector end

-	//		if(!isCorrectGraphicalView(endForView, selectedView)) {

-	//			return false;

-	//		}

+	// // 1. look for the connector end represented by the selected view

+	// for(final ConnectorEnd current : connector.getEnds()) {

+	// if(current.getRole() == semanticElement) {

+	// endForView = current;

+	// break;

+	// }

+	// }

+	// Assert.isNotNull(endForView);

+	// // 2. verify the view of the selected connector end

+	// if(!isCorrectGraphicalView(endForView, selectedView)) {

+	// return false;

+	// }

 	//

-	//		// 3. try to find a view for the second connector end

-	//		View secondView = null;

-	//		for(final ConnectorEnd end : connector.getEnds()) {

-	//			final ConnectableElement role = end.getRole();

-	//			if(role==null){

-	//				return false;

-	//			}

-	//			if(end == endForView) {

-	//				continue;

-	//			}

+	// // 3. try to find a view for the second connector end

+	// View secondView = null;

+	// for(final ConnectorEnd end : connector.getEnds()) {

+	// final ConnectableElement role = end.getRole();

+	// if(role==null){

+	// return false;

+	// }

+	// if(end == endForView) {

+	// continue;

+	// }

 	//

-	//			final Set<View> views = CrossReferencerUtil.getCrossReferencingViewsInDiagram(role, getCurrentDiagram());

-	//			final Iterator<View> iterOnView = views.iterator();

-	//			while(secondView == null && iterOnView.hasNext()) {

-	//				final View currentView = iterOnView.next();

-	//				if(isCorrectGraphicalView(end, currentView)) {

-	//					domain2NotationMap.put(endForView, selectedView);

-	//					domain2NotationMap.put(end, currentView);

-	//					secondView = currentView;

-	//				}

-	//			}

-	//		}

-	//		return secondView != null;

-	//	}

+	// final Set<View> views = CrossReferencerUtil.getCrossReferencingViewsInDiagram(role, getCurrentDiagram());

+	// final Iterator<View> iterOnView = views.iterator();

+	// while(secondView == null && iterOnView.hasNext()) {

+	// final View currentView = iterOnView.next();

+	// if(isCorrectGraphicalView(end, currentView)) {

+	// domain2NotationMap.put(endForView, selectedView);

+	// domain2NotationMap.put(end, currentView);

+	// secondView = currentView;

+	// }

+	// }

+	// }

+	// return secondView != null;

+	// }

 

-	//	/**

-	//	 * 

-	//	 * @param domain

-	//	 *        the editing domain to use for this command

-	//	 * @param linkToShow

-	//	 *        a link to show

-	//	 * @param domain2NotationMap

-	//	 * @param linkDescriptors

-	//	 * @return the command to display the link on the diagram

-	//	 */

-	//	protected ICommand getShowLinkCommand(final TransactionalEditingDomain domain, final EObject linkToShow, final Map<EObject, View> domain2NotationMap, final Collection<? extends UpdaterLinkDescriptor> linkDescriptors) {

-	//		if(!(linkToShow instanceof Connector)) {

-	//			return super.getShowLinkCommand(domain, linkToShow, domain2NotationMap, linkDescriptors);

-	//		}

-	//		mapModel((View)getHost().getAdapter(View.class), domain2NotationMap);

-	//		final View view = domain2NotationMap.get(linkToShow);

-	//		if(view != null) {

+	// /**

+	// *

+	// * @param domain

+	// * the editing domain to use for this command

+	// * @param linkToShow

+	// * a link to show

+	// * @param domain2NotationMap

+	// * @param linkDescriptors

+	// * @return the command to display the link on the diagram

+	// */

+	// protected ICommand getShowLinkCommand(final TransactionalEditingDomain domain, final EObject linkToShow, final Map<EObject, View> domain2NotationMap, final Collection<? extends UpdaterLinkDescriptor> linkDescriptors) {

+	// if(!(linkToShow instanceof Connector)) {

+	// return super.getShowLinkCommand(domain, linkToShow, domain2NotationMap, linkDescriptors);

+	// }

+	// mapModel((View)getHost().getAdapter(View.class), domain2NotationMap);

+	// final View view = domain2NotationMap.get(linkToShow);

+	// if(view != null) {

 	//			return new SetPropertyCommand(domain, "Restore related linksCommand show view", new EObjectAdapter(view), Properties.ID_ISVISIBLE, Boolean.TRUE);//$NON-NLS-1$

-	//		} else {// we need to recreate the view

+	// } else {// we need to recreate the view

 	//

-	//			// we look for the link descriptor

-	//			UpdaterLinkDescriptor descriptor = getLinkDescriptor(linkToShow, linkDescriptors);

+	// // we look for the link descriptor

+	// UpdaterLinkDescriptor descriptor = getLinkDescriptor(linkToShow, linkDescriptors);

 	//

-	//			if(descriptor != null) {

-	//				// we override the way to find the source and the target edit

-	//				// part

-	//				EditPart sourceEditPart = getEditPart(((Connector)linkToShow).getEnds().get(0), domain2NotationMap);

-	//				EditPart targetEditPart = getEditPart(((Connector)linkToShow).getEnds().get(1), domain2NotationMap);

+	// if(descriptor != null) {

+	// // we override the way to find the source and the target edit

+	// // part

+	// EditPart sourceEditPart = getEditPart(((Connector)linkToShow).getEnds().get(0), domain2NotationMap);

+	// EditPart targetEditPart = getEditPart(((Connector)linkToShow).getEnds().get(1), domain2NotationMap);

 	//

-	//				// If the parts are still null...

-	//				if(sourceEditPart == null || targetEditPart == null) {

-	//					return null;

-	//				}

-	//				String semanticHint = getSemanticHint(linkToShow);

-	//				CreateConnectionViewRequest.ConnectionViewDescriptor viewDescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(descriptor.getSemanticAdapter(), semanticHint, ViewUtil.APPEND, false, ((GraphicalEditPart)getHost()).getDiagramPreferencesHint());

-	//				CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(viewDescriptor);

-	//				ccr.setType(RequestConstants.REQ_CONNECTION_START);

-	//				ccr.setSourceEditPart(sourceEditPart);

-	//				sourceEditPart.getCommand(ccr);

-	//				ccr.setTargetEditPart(targetEditPart);

-	//				ccr.setType(RequestConstants.REQ_CONNECTION_END);

-	//				return new CommandProxy(targetEditPart.getCommand(ccr));

-	//			}

-	//		}

-	//		return null;

-	//	}

+	// // If the parts are still null...

+	// if(sourceEditPart == null || targetEditPart == null) {

+	// return null;

+	// }

+	// String semanticHint = getSemanticHint(linkToShow);

+	// CreateConnectionViewRequest.ConnectionViewDescriptor viewDescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(descriptor.getSemanticAdapter(), semanticHint, ViewUtil.APPEND, false,

+	// ((GraphicalEditPart)getHost()).getDiagramPreferencesHint());

+	// CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(viewDescriptor);

+	// ccr.setType(RequestConstants.REQ_CONNECTION_START);

+	// ccr.setSourceEditPart(sourceEditPart);

+	// sourceEditPart.getCommand(ccr);

+	// ccr.setTargetEditPart(targetEditPart);

+	// ccr.setType(RequestConstants.REQ_CONNECTION_END);

+	// return new CommandProxy(targetEditPart.getCommand(ccr));

+	// }

+	// }

+	// return null;

+	// }

 

-	//	/**

-	//	 * 

-	//	 * @param view

-	//	 *        a view

-	//	 * @return the last parent of this view referencing the same semantic

-	//	 *         element

-	//	 */

-	//	protected View getTopViewWithSameSemanticElement(final View view) {

-	//		final EObject semanticElement = view.getElement();

-	//		View parent = view;

-	//		View lastParent = view;

-	//		while(parent.getElement() == semanticElement) {

-	//			lastParent = parent;

-	//			parent = (View)parent.eContainer();

-	//		}

-	//		return lastParent;

-	//	}

+	// /**

+	// *

+	// * @param view

+	// * a view

+	// * @return the last parent of this view referencing the same semantic

+	// * element

+	// */

+	// protected View getTopViewWithSameSemanticElement(final View view) {

+	// final EObject semanticElement = view.getElement();

+	// View parent = view;

+	// View lastParent = view;

+	// while(parent.getElement() == semanticElement) {

+	// lastParent = parent;

+	// parent = (View)parent.eContainer();

+	// }

+	// return lastParent;

+	// }

 

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/handler/BlockDefinitionManageInterfacesHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/handler/BlockDefinitionManageInterfacesHandler.java
index 77465458c44..066c614b211 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/handler/BlockDefinitionManageInterfacesHandler.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/handler/BlockDefinitionManageInterfacesHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringBlockDeleteHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringBlockDeleteHelperAdvice.java
index 9c781c87804..d5b25148ceb 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringBlockDeleteHelperAdvice.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringBlockDeleteHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -43,21 +43,21 @@ public class DeleteViewDuringBlockDeleteHelperAdvice extends AbstractEditHelperA
 	@Override

 	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

 

-		

+

 		EObject elementToEdit = request.getElementToDestroy();

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		// Get all Part or Reference typed by this deleted Block

-		Iterator<?> references = EMFCoreUtil.getReferencers(elementToEdit, new EReference[]{UMLPackage.eINSTANCE.getTypedElement_Type()}).iterator();

-		while(references.hasNext()) {

+		Iterator<?> references = EMFCoreUtil.getReferencers(elementToEdit, new EReference[] { UMLPackage.eINSTANCE.getTypedElement_Type() }).iterator();

+		while (references.hasNext()) {

 			Object current = references.next();

-			

-			if (! (current instanceof EObject)) {

+

+			if (!(current instanceof EObject)) {

 				continue;

 			}

-			

+

 			EObject property = (EObject) current;

-			

+

 			// Search inconsistent views if the reference is a Part or a Reference

 			if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(property)) {

 				viewsToDestroy.addAll(getPartViewsToDestroy(property));

@@ -67,57 +67,57 @@ public class DeleteViewDuringBlockDeleteHelperAdvice extends AbstractEditHelperA
 			}

 		}

 

-		if(!(viewsToDestroy.isEmpty())) {

+		if (!(viewsToDestroy.isEmpty())) {

 			DestroyDependentsRequest req = new DestroyDependentsRequest(request.getEditingDomain(), elementToEdit, false);

 			req.setClientContext(request.getClientContext());

 			req.addParameters(request.getParameters());

 			return req.getDestroyDependentsCommand(viewsToDestroy);

 		}

-		

+

 		return super.getBeforeDestroyDependentsCommand(request);

 	}

 

 	/**

 	 * This methods looks for inconsistent Part views to delete.

-	 * 

+	 *

 	 * @param modifiedObject

-	 *        the modified {@link EObject}

+	 *            the modified {@link EObject}

 	 * @return the list of {@link View} to delete

 	 */

 	private Set<View> getPartViewsToDestroy(EObject modifiedObject) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while(viewIt.hasNext()) {

-			View view = (View)viewIt.next();

+		while (viewIt.hasNext()) {

+			View view = viewIt.next();

 

 			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

 

-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {

+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {

 				viewsToDestroy.add(view);

 			}

 		}

 

 		return viewsToDestroy;

 	}

-	

+

 	/**

 	 * This methods looks for inconsistent Reference views to delete.

-	 * 

+	 *

 	 * @param modifiedObject

-	 *        the modified {@link EObject}

+	 *            the modified {@link EObject}

 	 * @return the list of {@link View} to delete

 	 */

 	private Set<View> getReferenceViewsToDestroy(EObject modifiedObject) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while(viewIt.hasNext()) {

-			View view = (View)viewIt.next();

+		while (viewIt.hasNext()) {

+			View view = viewIt.next();

 

 			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

 

-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {

+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {

 				viewsToDestroy.add(view);

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringDataTypeDeleteHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringDataTypeDeleteHelperAdvice.java
index df14842fb93..33c6cbcf8b0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringDataTypeDeleteHelperAdvice.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringDataTypeDeleteHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -42,54 +42,54 @@ public class DeleteViewDuringDataTypeDeleteHelperAdvice extends AbstractEditHelp
 	@Override

 	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

 

-		

+

 		EObject elementToEdit = request.getElementToDestroy();

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		// Get all Value (property) typed by this deleted DataType

-		Iterator<?> references = EMFCoreUtil.getReferencers(elementToEdit, new EReference[]{UMLPackage.eINSTANCE.getTypedElement_Type()}).iterator();

-		while(references.hasNext()) {

+		Iterator<?> references = EMFCoreUtil.getReferencers(elementToEdit, new EReference[] { UMLPackage.eINSTANCE.getTypedElement_Type() }).iterator();

+		while (references.hasNext()) {

 			Object current = references.next();

-			

-			if (! (current instanceof EObject)) {

+

+			if (!(current instanceof EObject)) {

 				continue;

 			}

-			

+

 			EObject property = (EObject) current;

-			

+

 			// Search inconsistent views if the property is a Value

 			if (((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(property)) {

 				viewsToDestroy.addAll(getValueViewsToDestroy(property));

 			}

 		}

 

-		if(!(viewsToDestroy.isEmpty())) {

+		if (!(viewsToDestroy.isEmpty())) {

 			DestroyDependentsRequest req = new DestroyDependentsRequest(request.getEditingDomain(), elementToEdit, false);

 			req.setClientContext(request.getClientContext());

 			req.addParameters(request.getParameters());

 			return req.getDestroyDependentsCommand(viewsToDestroy);

 		}

-		

+

 		return super.getBeforeDestroyDependentsCommand(request);

 	}

 

 	/**

 	 * This methods looks for inconsistent Value views to delete.

-	 * 

+	 *

 	 * @param modifiedObject

-	 *        the modified {@link EObject}

+	 *            the modified {@link EObject}

 	 * @return the list of {@link View} to delete

 	 */

 	private Set<View> getValueViewsToDestroy(EObject modifiedObject) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while(viewIt.hasNext()) {

-			View view = (View)viewIt.next();

+		while (viewIt.hasNext()) {

+			View view = viewIt.next();

 

 			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

 

-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {

+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {

 				viewsToDestroy.add(view);

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringMoveHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringMoveHelperAdvice.java
index 1f5da44baf7..e9776b3c03d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringMoveHelperAdvice.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringMoveHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -37,7 +37,7 @@ import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;
  */

 public class DeleteViewDuringMoveHelperAdvice extends AbstractEditHelperAdvice {

 

-	

+

 	@Override

 	protected ICommand getAfterMoveCommand(MoveRequest request) {

 

@@ -47,14 +47,14 @@ public class DeleteViewDuringMoveHelperAdvice extends AbstractEditHelperAdvice {
 

 		@SuppressWarnings("unchecked")

 		Iterator<EObject> it = request.getElementsToMove().keySet().iterator();

-		while(it.hasNext()) {

+		while (it.hasNext()) {

 			EObject eObject = it.next();

 			viewsToDestroy.addAll(getViewsToDestroy(eObject));

 		}

-		Iterator<View> viewToDestroyIterator= viewsToDestroy.iterator();

-		while(viewToDestroyIterator.hasNext()) {

+		Iterator<View> viewToDestroyIterator = viewsToDestroy.iterator();

+		while (viewToDestroyIterator.hasNext()) {

 			View view = viewToDestroyIterator.next();

-			CustomDeleteCommand destroyViewsCommand = new CustomDeleteCommand(request.getEditingDomain(),view);

+			CustomDeleteCommand destroyViewsCommand = new CustomDeleteCommand(request.getEditingDomain(), view);

 			moveCommand = CompositeCommand.compose(moveCommand, destroyViewsCommand);

 		}

 

@@ -63,23 +63,23 @@ public class DeleteViewDuringMoveHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * This methods looks for inconsistent views to delete in case a semantic move done in the model explorer.

-	 * 

+	 *

 	 * @param movedObject

-	 *        the moved {@link EObject}

+	 *            the moved {@link EObject}

 	 * @return the list of {@link View} to delete

 	 */

 	protected Set<View> getViewsToDestroy(EObject movedObject) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(movedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while(viewIt.hasNext()) {

-			View view = (View)viewIt.next();

+		while (viewIt.hasNext()) {

+			View view = viewIt.next();

 

 			// Views are to be destroyed if they are not the diagram itself (containerType == null)

-			// and not a view directly owned by the diagram (the current policy in Papyrus allows 

+			// and not a view directly owned by the diagram (the current policy in Papyrus allows

 			// to drop nearly anything in the diagram whatever the semantic container).

-			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;		

-			if((containerType != null) && !ElementTypes.DIAGRAM_ID.equals(containerType)) {

+			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

+			if ((containerType != null) && !ElementTypes.DIAGRAM_ID.equals(containerType)) {

 				viewsToDestroy.add(view);

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringPartEditHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringPartEditHelperAdvice.java
index 90f1ee93447..84a21d88993 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringPartEditHelperAdvice.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringPartEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -45,29 +45,29 @@ public class DeleteViewDuringPartEditHelperAdvice extends AbstractEditHelperAdvi
 

 	@Override

 	protected ICommand getBeforeSetCommand(SetRequest request) {

-		

+

 		ICommand setCommand = super.getBeforeSetCommand(request);

 

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		// Get modified object and retrieve inconsistent view

 		EObject modifiedObject = request.getElementToEdit();

-		if ((modifiedObject != null) && (modifiedObject instanceof Property) 

-			&& (request.getFeature() == UMLPackage.eINSTANCE.getProperty_Aggregation()) 

-			&& (request.getValue() != AggregationKind.COMPOSITE_LITERAL)) {

-			

+		if ((modifiedObject != null) && (modifiedObject instanceof Property)

+				&& (request.getFeature() == UMLPackage.eINSTANCE.getProperty_Aggregation())

+				&& (request.getValue() != AggregationKind.COMPOSITE_LITERAL)) {

+

 			viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

 		}

 

-		if ((modifiedObject != null) && (modifiedObject instanceof Property) 

-			&& (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type())

-			 && (request.getValue() instanceof Type)

-			 && !((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue())) {

-			

+		if ((modifiedObject != null) && (modifiedObject instanceof Property)

+				&& (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type())

+				&& (request.getValue() instanceof Type)

+				&& !((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue())) {

+

 			viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

 		}

 

-		if(!viewsToDestroy.isEmpty()) {

+		if (!viewsToDestroy.isEmpty()) {

 			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getElementToEdit(), false);

 			ddr.setClientContext(request.getClientContext());

 			ddr.addParameters(request.getParameters());

@@ -80,21 +80,21 @@ public class DeleteViewDuringPartEditHelperAdvice extends AbstractEditHelperAdvi
 

 	/**

 	 * This methods looks for inconsistent views to delete in case a Part aggregation kind changes.

-	 * 

+	 *

 	 * @param modifiedObject

-	 *        the modified {@link EObject}

+	 *            the modified {@link EObject}

 	 * @return the list of {@link View} to delete

 	 */

 	protected Set<View> getViewsToDestroy(EObject modifiedObject) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while(viewIt.hasNext()) {

-			View view = (View)viewIt.next();

+		while (viewIt.hasNext()) {

+			View view = viewIt.next();

 

 			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

 

-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {

+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {

 				viewsToDestroy.add(view);

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringReferenceEditHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringReferenceEditHelperAdvice.java
index 842c5ea6a60..cf2686deae2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringReferenceEditHelperAdvice.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringReferenceEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -45,29 +45,29 @@ public class DeleteViewDuringReferenceEditHelperAdvice extends AbstractEditHelpe
 

 	@Override

 	protected ICommand getBeforeSetCommand(SetRequest request) {

-		

+

 		ICommand setCommand = super.getBeforeSetCommand(request);

 

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		// Get modified object and retrieve inconsistent view

 		EObject modifiedObject = request.getElementToEdit();

-		if ((modifiedObject != null) && (modifiedObject instanceof Property) 

-			&& (request.getFeature() == UMLPackage.eINSTANCE.getProperty_Aggregation()) 

-			&& (request.getValue() == AggregationKind.COMPOSITE_LITERAL)) {

-			

+		if ((modifiedObject != null) && (modifiedObject instanceof Property)

+				&& (request.getFeature() == UMLPackage.eINSTANCE.getProperty_Aggregation())

+				&& (request.getValue() == AggregationKind.COMPOSITE_LITERAL)) {

+

 			viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

 		}

 

-		if ((modifiedObject != null) && (modifiedObject instanceof Property) 

-			&& (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type())

-			 && (request.getValue() instanceof Type)

-			 && !((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue())) {

-			

+		if ((modifiedObject != null) && (modifiedObject instanceof Property)

+				&& (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type())

+				&& (request.getValue() instanceof Type)

+				&& !((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue())) {

+

 			viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

 		}

 

-		if(!viewsToDestroy.isEmpty()) {

+		if (!viewsToDestroy.isEmpty()) {

 			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getElementToEdit(), false);

 			ddr.setClientContext(request.getClientContext());

 			ddr.addParameters(request.getParameters());

@@ -80,21 +80,21 @@ public class DeleteViewDuringReferenceEditHelperAdvice extends AbstractEditHelpe
 

 	/**

 	 * This methods looks for inconsistent views to delete in case a Reference aggregation kind changes.

-	 * 

+	 *

 	 * @param modifiedObject

-	 *        the modified {@link EObject}

+	 *            the modified {@link EObject}

 	 * @return the list of {@link View} to delete

 	 */

 	protected Set<View> getViewsToDestroy(EObject modifiedObject) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while(viewIt.hasNext()) {

-			View view = (View)viewIt.next();

+		while (viewIt.hasNext()) {

+			View view = viewIt.next();

 

 			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

 

-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {

+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {

 				viewsToDestroy.add(view);

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringValueEditHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringValueEditHelperAdvice.java
index a1b0edbc020..59ddc93a096 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringValueEditHelperAdvice.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringValueEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -44,7 +44,7 @@ public class DeleteViewDuringValueEditHelperAdvice extends AbstractEditHelperAdv
 

 	@Override

 	protected ICommand getBeforeSetCommand(SetRequest request) {

-		

+

 		ICommand setCommand = super.getBeforeSetCommand(request);

 

 		Set<View> viewsToDestroy = new HashSet<View>();

@@ -52,24 +52,24 @@ public class DeleteViewDuringValueEditHelperAdvice extends AbstractEditHelperAdv
 		// Get modified object and retrieve inconsistent view

 		EObject modifiedObject = request.getElementToEdit();

 		if ((modifiedObject != null) && (modifiedObject instanceof Property) && !(modifiedObject instanceof Port)) {

-			

+

 			// Aggregation modified

 			if ((request.getFeature() == UMLPackage.eINSTANCE.getProperty_Aggregation()) && (request.getValue() != AggregationKind.COMPOSITE_LITERAL)) {

 				viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

 			}

-			

+

 			// Type modified

 			if ((request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && (request.getValue() != modifiedObject.eGet(UMLPackage.eINSTANCE.getTypedElement_Type()))) {

-				

+

 				EObject newType = (request.getValue() instanceof EObject) ? (EObject) request.getValue() : null;

 				if ((newType == null) || !(newType instanceof DataType)) {

 					viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

 				}

-				

+

 			}

 		}

 

-		if(!viewsToDestroy.isEmpty()) {

+		if (!viewsToDestroy.isEmpty()) {

 			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getElementToEdit(), false);

 			ddr.setClientContext(request.getClientContext());

 			ddr.addParameters(request.getParameters());

@@ -82,21 +82,21 @@ public class DeleteViewDuringValueEditHelperAdvice extends AbstractEditHelperAdv
 

 	/**

 	 * This methods looks for inconsistent views to delete in case a Reference aggregation kind changes.

-	 * 

+	 *

 	 * @param modifiedObject

-	 *        the modified {@link EObject}

+	 *            the modified {@link EObject}

 	 * @return the list of {@link View} to delete

 	 */

 	protected Set<View> getViewsToDestroy(EObject modifiedObject) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while(viewIt.hasNext()) {

-			View view = (View)viewIt.next();

+		while (viewIt.hasNext()) {

+			View view = viewIt.next();

 

 			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

 

-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {

+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {

 				viewsToDestroy.add(view);

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationHelperAdvice.java
index 5dc825dd350..ffc539a15a7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationHelperAdvice.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -45,12 +45,12 @@ public class GeneralizationHelperAdvice extends AbstractEditHelperAdvice {
 		// The list of member views becoming inconsistent after re-orient that should be deleted.

 		Set<View> viewsToDestroy = new HashSet<View>();

 

-		if(request.getRelationship() instanceof Generalization) {

-			viewsToDestroy.addAll(getMemberViewsToDestroy((Generalization)request.getRelationship()));

+		if (request.getRelationship() instanceof Generalization) {

+			viewsToDestroy.addAll(getMemberViewsToDestroy((Generalization) request.getRelationship()));

 		}

 

-		//return the command to destroy all these views

-		if(!viewsToDestroy.isEmpty()) {

+		// return the command to destroy all these views

+		if (!viewsToDestroy.isEmpty()) {

 

 			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getRelationship(), false);

 			ddr.setClientContext(request.getClientContext());

@@ -68,12 +68,12 @@ public class GeneralizationHelperAdvice extends AbstractEditHelperAdvice {
 

 		Set<View> viewsToDestroy = new HashSet<View>();

 

-		if(destructee instanceof Generalization) {

-			viewsToDestroy = getMemberViewsToDestroy((Generalization)destructee);

+		if (destructee instanceof Generalization) {

+			viewsToDestroy = getMemberViewsToDestroy((Generalization) destructee);

 		}

 

-		//return the command to destroy all these views

-		if(!viewsToDestroy.isEmpty()) {

+		// return the command to destroy all these views

+		if (!viewsToDestroy.isEmpty()) {

 			return request.getDestroyDependentsCommand(viewsToDestroy);

 		}

 		return null;

@@ -82,29 +82,29 @@ public class GeneralizationHelperAdvice extends AbstractEditHelperAdvice {
 	/**

 	 * This methods looks for inconsistent views to delete in case the generalization is deleted or

 	 * re-oriented.

-	 * 

+	 *

 	 * @param generalization

-	 *        the modified generalization

+	 *            the modified generalization

 	 * @return the list of {@link View} to delete

 	 */

 	protected Set<View> getMemberViewsToDestroy(Generalization generalization) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

-		Classifier general = ((Generalization)generalization).getGeneral();

-		if(general != null) {

+		Classifier general = generalization.getGeneral();

+		if (general != null) {

 

 			// Parse members

 			EList<NamedElement> members = general.getMembers();

-			for(NamedElement member : members) {

+			for (NamedElement member : members) {

 

 				// Find Views in Composite Structure Diagram that are referencing current member

 				Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(member, ElementTypes.DIAGRAM_ID).iterator();

-				while(viewIt.hasNext()) {

-					View view = (View)viewIt.next();

+				while (viewIt.hasNext()) {

+					View view = viewIt.next();

 

 					// Test if current view (member) is concerned by the deletion (re-orientation) of the generalization

 					GeneralizationUtil util = new GeneralizationUtil();

-					if(util.isConcernedByGeneralizationChanges(generalization, view)) {

+					if (util.isConcernedByGeneralizationChanges(generalization, view)) {

 						viewsToDestroy.add(view);

 					}

 				}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationUtil.java
index 87d650ef335..e053ec50910 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationUtil.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationUtil.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -29,11 +29,11 @@ public class GeneralizationUtil {
 

 	/**

 	 * Tests <code>true</code> if the classifier has this generalization in its inheritance links (directly or indirectly)

-	 * 

+	 *

 	 * @param generalization

-	 *        a generalization

+	 *            a generalization

 	 * @param el

-	 *        a {@link Classifier} or a {@link Property}

+	 *            a {@link Classifier} or a {@link Property}

 	 * @return

 	 *         <code>true</code> if the classifier has this generalization in its inheritance links (directly or indirectly) <code>false</code> if not

 	 */

@@ -42,20 +42,20 @@ public class GeneralizationUtil {
 		NamedElement graphicalOwner = getGraphicalOwner(view);

 

 		// If the View element is owned by its graphical owner bypass the tests

-		if((Element)view.getElement().eContainer() != graphicalOwner) {

+		if ((Element) view.getElement().eContainer() != graphicalOwner) {

 

-			if(graphicalOwner instanceof Classifier) {

-				if(graphicalOwner != null && generalization != null) {

-					isConcerned = getAllGeneralization((Classifier)graphicalOwner, null).contains(generalization);

+			if (graphicalOwner instanceof Classifier) {

+				if (graphicalOwner != null && generalization != null) {

+					isConcerned = getAllGeneralization((Classifier) graphicalOwner, null).contains(generalization);

 				}

-			} else if(graphicalOwner instanceof Property) {

-				Type type = ((Property)graphicalOwner).getType();

-				if(type instanceof Classifier) {

-					isConcerned = getAllGeneralization((Classifier)type, null).contains(generalization);

+			} else if (graphicalOwner instanceof Property) {

+				Type type = ((Property) graphicalOwner).getType();

+				if (type instanceof Classifier) {

+					isConcerned = getAllGeneralization((Classifier) type, null).contains(generalization);

 				}

 			}

 

-			if(isConcerned && existsAnotherInheritanceWay((Element)view.getElement(), generalization, graphicalOwner, null)) {

+			if (isConcerned && existsAnotherInheritanceWay((Element) view.getElement(), generalization, graphicalOwner, null)) {

 				isConcerned = false;

 			}

 

@@ -66,13 +66,13 @@ public class GeneralizationUtil {
 

 	/**

 	 * Tests if the classifier owns another way to inherit of the element

-	 * 

+	 *

 	 * @param inheritedElement

-	 *        the inherited element

+	 *            the inherited element

 	 * @param forbiddenPath

-	 *        the generalization that we are destroying

+	 *            the generalization that we are destroying

 	 * @param el

-	 * 

+	 *

 	 * @return

 	 *         <code>true</code> if another way exists to inherit of this element <code>false</code> if not

 	 */

@@ -81,36 +81,36 @@ public class GeneralizationUtil {
 		Set<Generalization> generalizations = new HashSet<Generalization>();

 

 		Classifier _classifier = null;

-		if(el instanceof Property) {

-			Type type = ((Property)el).getType();

-			if(type instanceof Classifier) {

-				_classifier = (Classifier)type;

+		if (el instanceof Property) {

+			Type type = ((Property) el).getType();

+			if (type instanceof Classifier) {

+				_classifier = (Classifier) type;

 			}

-		} else if(el instanceof Classifier) {

-			_classifier = (Classifier)el;

+		} else if (el instanceof Classifier) {

+			_classifier = (Classifier) el;

 		}

 

 		// List Generalization that have already been tested to avoid loop issues

 		// in case of Generalization cycles (such cycle creation should be avoided)

 		Set<Element> ignoredGeneralizationsTmp = new HashSet<Element>();

-		if(ignoredGeneralizations != null) {

+		if (ignoredGeneralizations != null) {

 			ignoredGeneralizationsTmp.addAll(ignoredGeneralizations);

 		}

 

-		if(el != null) {

+		if (el != null) {

 			generalizations.addAll(_classifier.getGeneralizations());

 

-			for(Generalization generalization : generalizations) {

-				if((generalization != forbiddenPath) && (!ignoredGeneralizationsTmp.contains(generalization))) {

+			for (Generalization generalization : generalizations) {

+				if ((generalization != forbiddenPath) && (!ignoredGeneralizationsTmp.contains(generalization))) {

 

 					Classifier general = generalization.getGeneral();

-					if(general != null) {

+					if (general != null) {

 						ignoredGeneralizationsTmp.add(generalization);

 

-						if(general.getOwnedMembers().contains(inheritedElement)) {

+						if (general.getOwnedMembers().contains(inheritedElement)) {

 							return true;

 

-						} else if(existsAnotherInheritanceWay(inheritedElement, forbiddenPath, general, ignoredGeneralizationsTmp)) {

+						} else if (existsAnotherInheritanceWay(inheritedElement, forbiddenPath, general, ignoredGeneralizationsTmp)) {

 							return true;

 						}

 					}

@@ -122,19 +122,19 @@ public class GeneralizationUtil {
 

 	/**

 	 * Returns the classifier owning the view

-	 * 

+	 *

 	 * @param view

-	 *        a view

+	 *            a view

 	 * @return

 	 *         the Element owning this view

 	 *         or <code>null</code> if not found

 	 */

 	protected NamedElement getGraphicalOwner(View view) {

-		//the view is in a compartment

-		if(view.eContainer() instanceof View) {

-			EObject graphicalParent = ((View)view.eContainer()).getElement();

-			if(graphicalParent instanceof Classifier || graphicalParent instanceof Property) {

-				return (NamedElement)graphicalParent;

+		// the view is in a compartment

+		if (view.eContainer() instanceof View) {

+			EObject graphicalParent = ((View) view.eContainer()).getElement();

+			if (graphicalParent instanceof Classifier || graphicalParent instanceof Property) {

+				return (NamedElement) graphicalParent;

 			}

 		}

 		return null;

@@ -142,9 +142,9 @@ public class GeneralizationUtil {
 

 	/**

 	 * Return all the generalization (direct and indirect) owning by the classifier

-	 * 

+	 *

 	 * @param classifier

-	 *        a classifier

+	 *            a classifier

 	 * @return

 	 *         all the generalization (direct and indirect) owning by the classifier

 	 */

@@ -152,20 +152,20 @@ public class GeneralizationUtil {
 

 		Set<Generalization> generalizations = new HashSet<Generalization>();

 

-		// Keep track of already parsed Classifiers to avoid loop in case 

+		// Keep track of already parsed Classifiers to avoid loop in case

 		// of Generalization cycle.

 		Set<Classifier> parsedClassifiers = new HashSet<Classifier>();

-		if(alreadyParsedClassifiers != null) {

+		if (alreadyParsedClassifiers != null) {

 			parsedClassifiers.addAll(alreadyParsedClassifiers);

 		}

 

 		Set<Generalization> generalizationsTmp = new HashSet<Generalization>();

-		if(classifier != null) {

+		if (classifier != null) {

 			generalizations.addAll(classifier.getGeneralizations());

 

-			if(!parsedClassifiers.contains(classifier)) {

+			if (!parsedClassifiers.contains(classifier)) {

 				parsedClassifiers.add(classifier);

-				for(Generalization generalization : generalizations) {

+				for (Generalization generalization : generalizations) {

 					generalizationsTmp.addAll(getAllGeneralization(generalization.getGeneral(), parsedClassifiers));

 				}

 			}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/messages/Messages.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/messages/Messages.java
index e56007cb5ad..17c30bc30ae 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/messages/Messages.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/messages/Messages.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconcilier.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconcilier.java
index a0cda62c3f0..e21e0a4dac4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconcilier.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconcilier.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2014 CEA LIST

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -50,7 +50,7 @@ public class BDDReconcilier extends DiagramReconciler {
 		@Override

 		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

 			EObject element = diagram.getElement();

-			if(element instanceof org.eclipse.uml2.uml.Class) { // Block

+			if (element instanceof org.eclipse.uml2.uml.Class) { // Block

 				org.eclipse.uml2.uml.Class clazz = (org.eclipse.uml2.uml.Class) element;

 				diagram.setElement(clazz.getNearestPackage());

 				DiagramUtils.setOwner(diagram, element);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
index f7c0cc5126f..be3cba6897b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *      Christian W. Damus (CEA) - bug 410909

  *

@@ -75,7 +75,7 @@ import org.eclipse.uml2.uml.Usage;
 

 

 /**

- * 

+ *

  * @author vl222926

  *         Adapted code from generated code for UML Diagram

  *         The name of the methods are not java compliant, but it is done to be consistent with the generated classes which use the id of the elements

@@ -88,9 +88,9 @@ public class SysMLDiagramUpdater {
 	public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() {

 

 		/**

-		 * 

+		 *

 		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getSemanticChildren(org.eclipse.gmf.runtime.notation.View)

-		 * 

+		 *

 		 * @param view

 		 * @return

 		 */

@@ -99,9 +99,9 @@ public class SysMLDiagramUpdater {
 		}

 

 		/**

-		 * 

+		 *

 		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getContainedLinks(org.eclipse.gmf.runtime.notation.View)

-		 * 

+		 *

 		 * @param view

 		 * @return

 		 */

@@ -110,9 +110,9 @@ public class SysMLDiagramUpdater {
 		}

 

 		/**

-		 * 

+		 *

 		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getIncomingLinks(org.eclipse.gmf.runtime.notation.View)

-		 * 

+		 *

 		 * @param view

 		 * @return

 		 */

@@ -121,9 +121,9 @@ public class SysMLDiagramUpdater {
 		}

 

 		/**

-		 * 

+		 *

 		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getOutgoingLinks(org.eclipse.gmf.runtime.notation.View)

-		 * 

+		 *

 		 * @param view

 		 * @return

 		 */

@@ -141,117 +141,117 @@ public class SysMLDiagramUpdater {
 	}

 

 	/**

-	 * 

+	 *

 	 * @param view

-	 *        a view

+	 *            a view

 	 * @return

 	 *         the list of the incoming links for this view

 	 */

 	public static List<UpdaterLinkDescriptor> getIncomingLinks(final View view) {

 		final String id = view.getType();

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID)) {

 			return getBlock_shape_sysml_block_as_classifier_IncomingLink(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID)) {

+		if (id.equals(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID)) {

 			return getAssociation_link_sysml_association_IncomingLink(view);

 		}

-		if(id.equals(Integer.toString(PackageEditPart.VISUAL_ID)) || id.equals(Integer.toString(PackageEditPartCN.VISUAL_ID))) {

+		if (id.equals(Integer.toString(PackageEditPart.VISUAL_ID)) || id.equals(Integer.toString(PackageEditPartCN.VISUAL_ID))) {

 			return getPackage_2007IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {

 			return getActor_shape_uml_actor_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID)) {

 			return getSignal_shape_uml_signal_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID)) {

 			return getProperty_shape_uml_property_as_label_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID)) {

 			return getPart_shape_sysml_part_as_label_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID)) {

 			return getReference_shape_sysml_reference_as_label_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID)) {

 			return getValue_shape_sysml_value_as_label_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID)) {

 			return getOperation_shape_uml_operation_as_label_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID)) {

 			return getReception_shape_uml_reception_as_label_IncomingLinks(view);

 		}

-		if(id.equals(Integer.toString(InstanceSpecificationEditPart.VISUAL_ID)) || id.equals(Integer.toString(InstanceSpecificationEditPartCN.VISUAL_ID))) {

+		if (id.equals(Integer.toString(InstanceSpecificationEditPart.VISUAL_ID)) || id.equals(Integer.toString(InstanceSpecificationEditPartCN.VISUAL_ID))) {

 			return getInstanceSpecification_2001IncomingLinks(view);

 		}

-		if(id.equals(Integer.toString(SlotEditPart.VISUAL_ID))) {

+		if (id.equals(Integer.toString(SlotEditPart.VISUAL_ID))) {

 			return getSlot_2001IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

 			return getDependency_link_uml_dependency_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID)) {

 			return getGeneralization_link_uml_generalization_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID)) {

 			return getPort_shape_uml_port_as_label_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID)) {

 			return getFlowPort_shape_sysml_flowport_as_label_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

 			return getPort_shape_uml_port_as_affixed_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

 			return getFlowPort_shape_sysml_flowport_as_affixed_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID)) {

 			return getFlowSpecification_shape_sysml_flowspecification_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID)) {

 			return getInterface_shape_uml_interface_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID)) {

 			return getFlowProperty_shape_sysml_flowproperty_as_label_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID)) {

 			return getInterfaceRealization_link_uml_interfacerealization_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_USAGE_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_USAGE_ID)) {

 			return getUsage_link_uml_usage_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID)) {

 			return getDataType_shape_uml_data_type_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID)) {

 			return getEnumeration_shape_uml_enumeration_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID)) {

 			return getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID)) {

 			return getPrimitiveType_shape_uml_primitivetype_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID)) {

 			return getDimension_shape_sysml_dimension_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID)) {

 			return getUnit_shape_sysml_unit_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID)) {

 			return getValueType_shape_sysml_valuetype_as_classifier_IncommingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID)) {

 			return getConstraintBlock_shape_sysml_constraintblock_as_classifier_IncomingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID)) {

 			return getConstraintProperty_shape_sysml_constraintproperty_as_label_IncomingLinks(view);

 		}

-		if(id.equals(Integer.toString(CommentEditPart.VISUAL_ID)) || id.equals(CommentEditPartCN.VISUAL_ID)) {

+		if (id.equals(Integer.toString(CommentEditPart.VISUAL_ID)) || id.equals(CommentEditPartCN.VISUAL_ID)) {

 			return getComment_IncominkLinks(view);

 		}

-		if(id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID)) || id.equals(ConstraintEditPartCN.VISUAL_ID)) {

+		if (id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID)) || id.equals(ConstraintEditPartCN.VISUAL_ID)) {

 			return getConstraint_IncomingLinks(view);

 		}

 

@@ -263,124 +263,124 @@ public class SysMLDiagramUpdater {
 

 

 	/**

-	 * 

+	 *

 	 * @param view

-	 *        a view

+	 *            a view

 	 * @return

 	 *         the list of the outgoing links for this view

 	 */

 	public static List<UpdaterLinkDescriptor> getOutgoingLinks(final View view) {

 		final String id = view.getType();

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID)) {

 			return getBlock_shape_sysml_block_as_classifier_OutgoingLink(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID)) {

+		if (id.equals(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID)) {

 			return getAssociation_link_sysml_association_OutgoingLink(view);

 		}

-		if(id.equals(Integer.toString(PackageEditPart.VISUAL_ID)) || id.equals(Integer.toString(PackageEditPartCN.VISUAL_ID))) {

+		if (id.equals(Integer.toString(PackageEditPart.VISUAL_ID)) || id.equals(Integer.toString(PackageEditPartCN.VISUAL_ID))) {

 			return getPackage_2007OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {

 			return getActor_shape_uml_actor_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID)) {

 			return getSignal_shape_uml_signal_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID)) {

 			return getProperty_shape_uml_property_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID)) {

 			return getPart_shape_sysml_part_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID)) {

 			return getReference_shape_sysml_reference_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID)) {

 			return getValue_shape_sysml_value_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID)) {

 			return getOperation_shape_uml_operation_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID)) {

 			return getReception_shape_uml_reception_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(Integer.toString(InstanceSpecificationEditPart.VISUAL_ID)) || id.equals(Integer.toString(InstanceSpecificationEditPartCN.VISUAL_ID))) {

+		if (id.equals(Integer.toString(InstanceSpecificationEditPart.VISUAL_ID)) || id.equals(Integer.toString(InstanceSpecificationEditPartCN.VISUAL_ID))) {

 			return getInstanceSpecification_2001OutgoingLinks(view);

 		}

-		if(id.equals(Integer.toString(SlotEditPart.VISUAL_ID))) {

+		if (id.equals(Integer.toString(SlotEditPart.VISUAL_ID))) {

 			return getSlot_2001OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

 			return getDependency_link_uml_dependency_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID)) {

 			return getGeneralization_link_uml_generalization_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID)) {

 			return getPort_shape_uml_port_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID)) {

 			return getFlowPort_shape_sysml_flowport_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

 			return getPort_shape_uml_port_as_affixed_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

 			return getFlowPort_shape_sysml_flowport_as_affixed_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID)) {

 			return getFlowSpecification_shape_sysml_flowspecification_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID)) {

 			return getInterface_shape_uml_interface_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID)) {

 			return getFlowProperty_shape_sysml_flowproperty_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID)) {

 			return getInterfaceRealization_link_uml_interfacerealization_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_USAGE_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_USAGE_ID)) {

 			return getUsage_link_uml_usage_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID)) {

 			return getDataType_shape_uml_data_type_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID)) {

 			return getEnumeration_shape_uml_enumeration_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID)) {

 			return getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID)) {

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID)) {

 			return getPrimitiveType_shape_uml_primitivetype_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID)) {

 			return getDimension_shape_sysml_dimension_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID)) {

 			return getUnit_shape_sysml_unit_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID)) {

 			return getValueType_shape_sysml_valuetype_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID)) {

 			return getConstraintBlock_shape_sysml_constraintblock_as_classifier_OutgoingLinks(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID)) {

 			return getConstraintProperty_shape_sysml_constraintproperty_as_label_OutgoingLinks(view);

 		}

-		if(id.equals(Integer.toString(CommentEditPart.VISUAL_ID)) || id.equals(CommentEditPartCN.VISUAL_ID)) {

+		if (id.equals(Integer.toString(CommentEditPart.VISUAL_ID)) || id.equals(CommentEditPartCN.VISUAL_ID)) {

 			return getComment_OutgoingLinks(view);

 		}

-		if(id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID)) || id.equals(ConstraintEditPartCN.VISUAL_ID)) {

+		if (id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID)) || id.equals(ConstraintEditPartCN.VISUAL_ID)) {

 			return getConstraint_OutgoingLinks(view);

 		}

 		return Collections.emptyList();

 	}

 

 	private static List<UpdaterLinkDescriptor> getConstraint_IncomingLinks(View view) {

-		Constraint modelElement = (Constraint)view.getElement();

+		Constraint modelElement = (Constraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -391,7 +391,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getConstraint_OutgoingLinks(View view) {

-		Constraint modelElement = (Constraint)view.getElement();

+		Constraint modelElement = (Constraint) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

@@ -400,7 +400,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getComment_IncominkLinks(View view) {

-		Comment modelElement = (Comment)view.getElement();

+		Comment modelElement = (Comment) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -409,7 +409,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getComment_OutgoingLinks(View view) {

-		Comment modelElement = (Comment)view.getElement();

+		Comment modelElement = (Comment) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement));

 		return result;

@@ -460,7 +460,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getPrimitiveType_shape_uml_primitivetype_as_classifier_IncomingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		PrimitiveType modelElement = (PrimitiveType) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -473,7 +473,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getPrimitiveType_shape_uml_primitivetype_as_classifier_OutgoingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		PrimitiveType modelElement = (PrimitiveType) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -485,7 +485,7 @@ public class SysMLDiagramUpdater {
 

 

 	private static List<UpdaterLinkDescriptor> getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_IncomingLinks(View view) {

-		EnumerationLiteral modelElement = (EnumerationLiteral)view.getElement();

+		EnumerationLiteral modelElement = (EnumerationLiteral) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -496,7 +496,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_OutgoingLinks(View view) {

-		EnumerationLiteral modelElement = (EnumerationLiteral)view.getElement();

+		EnumerationLiteral modelElement = (EnumerationLiteral) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -504,7 +504,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getEnumeration_shape_uml_enumeration_as_classifier_IncomingLinks(View view) {

-		Enumeration modelElement = (Enumeration)view.getElement();

+		Enumeration modelElement = (Enumeration) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -517,7 +517,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getEnumeration_shape_uml_enumeration_as_classifier_OutgoingLinks(View view) {

-		Enumeration modelElement = (Enumeration)view.getElement();

+		Enumeration modelElement = (Enumeration) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -527,7 +527,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getDataType_shape_uml_data_type_as_classifier_IncomingLinks(View view) {

-		DataType modelElement = (DataType)view.getElement();

+		DataType modelElement = (DataType) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -540,7 +540,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getDataType_shape_uml_data_type_as_classifier_OutgoingLinks(View view) {

-		DataType modelElement = (DataType)view.getElement();

+		DataType modelElement = (DataType) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -550,7 +550,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getUsage_link_uml_usage_IncomingLinks(View view) {

-		Usage modelElement = (Usage)view.getElement();

+		Usage modelElement = (Usage) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -561,7 +561,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getUsage_link_uml_usage_OutgoingLinks(View view) {

-		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

+		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -569,7 +569,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getInterfaceRealization_link_uml_interfacerealization_IncomingLinks(View view) {

-		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

+		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -580,7 +580,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getInterfaceRealization_link_uml_interfacerealization_OutgoingLinks(View view) {

-		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

+		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -612,7 +612,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getInterface_IncomingLinks(View view) {

-		Interface modelElement = (Interface)view.getElement();

+		Interface modelElement = (Interface) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -626,7 +626,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getInterface_OutgoingLinks(View view) {

-		Interface modelElement = (Interface)view.getElement();

+		Interface modelElement = (Interface) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -668,7 +668,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_IncomingLinks(View view) {

-		Dependency modelElement = (Dependency)view.getElement();

+		Dependency modelElement = (Dependency) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -679,7 +679,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_OutgoingLinks(View view) {

-		Dependency modelElement = (Dependency)view.getElement();

+		Dependency modelElement = (Dependency) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -687,7 +687,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getGeneralization_link_uml_generalization_IncomingLinks(View view) {

-		Generalization modelElement = (Generalization)view.getElement();

+		Generalization modelElement = (Generalization) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -700,7 +700,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getSlot_2001IncomingLinks(View view) {

-		Slot modelElement = (Slot)view.getElement();

+		Slot modelElement = (Slot) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -713,7 +713,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getInstanceSpecification_2001IncomingLinks(View view) {

-		InstanceSpecification modelElement = (InstanceSpecification)view.getElement();

+		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -724,7 +724,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getInstanceSpecification_2001OutgoingLinks(View view) {

-		InstanceSpecification modelElement = (InstanceSpecification)view.getElement();

+		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -732,7 +732,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getReception_shape_uml_reception_as_label_IncomingLinks(View view) {

-		Reception modelElement = (Reception)view.getElement();

+		Reception modelElement = (Reception) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -743,7 +743,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getReception_shape_uml_reception_as_label_OutgoingLinks(View view) {

-		Reception modelElement = (Reception)view.getElement();

+		Reception modelElement = (Reception) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -751,7 +751,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getOperation_shape_uml_operation_as_label_IncomingLinks(View view) {

-		Operation modelElement = (Operation)view.getElement();

+		Operation modelElement = (Operation) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -762,7 +762,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getOperation_shape_uml_operation_as_label_OutgoingLinks(View view) {

-		Operation modelElement = (Operation)view.getElement();

+		Operation modelElement = (Operation) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -805,25 +805,25 @@ public class SysMLDiagramUpdater {
 	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_4003(Interface target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInterfaceRealization_Contract() || false == setting.getEObject() instanceof InterfaceRealization) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInterfaceRealization_Contract() || false == setting.getEObject() instanceof InterfaceRealization) {

 				continue;

 			}

-			InterfaceRealization link = (InterfaceRealization)setting.getEObject();

-			if(InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			InterfaceRealization link = (InterfaceRealization) setting.getEObject();

+			if (InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

-			if(false == link.eContainer() instanceof BehavioredClassifier) {

+			if (false == link.eContainer() instanceof BehavioredClassifier) {

 				continue;

 			}

-			BehavioredClassifier container = (BehavioredClassifier)link.eContainer();

+			BehavioredClassifier container = (BehavioredClassifier) link.eContainer();

 			result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.InterfaceRealization_4003, InterfaceRealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

 

 	private static List<UpdaterLinkDescriptor> getProperty_IncomingLinks(View view) {

-		Property modelElement = (Property)view.getElement();

+		Property modelElement = (Property) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -834,7 +834,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getProperty_OutgoingLinks(View view) {

-		Property modelElement = (Property)view.getElement();

+		Property modelElement = (Property) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -843,7 +843,7 @@ public class SysMLDiagramUpdater {
 

 

 	private static List<UpdaterLinkDescriptor> getSignal_shape_uml_signal_as_classifier_IncomingLinks(View view) {

-		Signal modelElement = (Signal)view.getElement();

+		Signal modelElement = (Signal) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -856,7 +856,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getSignal_shape_uml_signal_as_classifier_OutgoingLinks(View view) {

-		Signal modelElement = (Signal)view.getElement();

+		Signal modelElement = (Signal) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -867,7 +867,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getActor_shape_uml_actor_as_classifier_IncomingLinks(View view) {

-		Actor modelElement = (Actor)view.getElement();

+		Actor modelElement = (Actor) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));

@@ -879,7 +879,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getActor_shape_uml_actor_as_classifier_OutgoingLinks(View view) {

-		Actor modelElement = (Actor)view.getElement();

+		Actor modelElement = (Actor) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

@@ -889,7 +889,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	public static List<UpdaterLinkDescriptor> getPackage_2007IncomingLinks(View view) {

-		Package modelElement = (Package)view.getElement();

+		Package modelElement = (Package) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));

@@ -900,7 +900,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	public static List<UpdaterLinkDescriptor> getPackage_2007OutgoingLinks(View view) {

-		Package modelElement = (Package)view.getElement();

+		Package modelElement = (Package) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

@@ -909,7 +909,7 @@ public class SysMLDiagramUpdater {
 

 

 	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_classifier_IncomingLink(View view) {

-		final Class modelElement = (Class)view.getElement();

+		final Class modelElement = (Class) view.getElement();

 		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement, crossReferencer));

@@ -922,7 +922,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_classifier_OutgoingLink(final View view) {

-		final Class modelElement = (Class)view.getElement();

+		final Class modelElement = (Class) view.getElement();

 		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

@@ -933,7 +933,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getAssociation_link_sysml_association_IncomingLink(final View view) {

-		final Association modelElement = (Association)view.getElement();

+		final Association modelElement = (Association) view.getElement();

 		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));

@@ -946,7 +946,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getAssociation_link_sysml_association_OutgoingLink(final View view) {

-		final Association modelElement = (Association)view.getElement();

+		final Association modelElement = (Association) view.getElement();

 		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));

@@ -958,20 +958,20 @@ public class SysMLDiagramUpdater {
 	private static Collection<UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency)setting.getEObject();

-			if(!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			Dependency link = (Dependency) setting.getEObject();

+			if (!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

 			List<NamedElement> sources = link.getClients();

 			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			if(false == theSource instanceof NamedElement) {

+			if (false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement)theSource;

+			NamedElement src = (NamedElement) theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4008, -1));

 		}

 		return result;

@@ -979,13 +979,13 @@ public class SysMLDiagramUpdater {
 

 	private static Collection<UpdaterLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_link_uml_interfacerealization(BehavioredClassifier container) {

 		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for(Iterator<InterfaceRealization> links = container.getInterfaceRealizations().iterator(); links.hasNext();) {

-			EObject linkObject = (EObject)links.next();

-			if(false == linkObject instanceof InterfaceRealization) {

+		for (Iterator<InterfaceRealization> links = container.getInterfaceRealizations().iterator(); links.hasNext();) {

+			EObject linkObject = links.next();

+			if (false == linkObject instanceof InterfaceRealization) {

 				continue;

 			}

-			InterfaceRealization link = (InterfaceRealization)linkObject;

-			if(!UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			InterfaceRealization link = (InterfaceRealization) linkObject;

+			if (!UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

 			Interface dst = link.getContract();

@@ -997,20 +997,20 @@ public class SysMLDiagramUpdater {
 	private static Collection<UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_link_uml_usage(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Usage) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Usage) {

 				continue;

 			}

-			Usage link = (Usage)setting.getEObject();

-			if(!UMLGraphicalTypes.LINK_UML_USAGE_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			Usage link = (Usage) setting.getEObject();

+			if (!UMLGraphicalTypes.LINK_UML_USAGE_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

 			List<NamedElement> sources = link.getClients();

 			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			if(false == theSource instanceof NamedElement) {

+			if (false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement)theSource;

+			NamedElement src = (NamedElement) theSource;

 			result.add(new UpdaterLinkDescriptor(src, target, link, UMLElementTypes.Usage_4007, -1));

 		}

 		return result;

@@ -1021,8 +1021,8 @@ public class SysMLDiagramUpdater {
 	 */

 	private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(Comment source) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for(Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

-			Element destination = (Element)destinations.next();

+		for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element) destinations.next();

 			result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_4013, CommentAnnotatedElementEditPart.VISUAL_ID));

 		}

 		return result;

@@ -1033,8 +1033,8 @@ public class SysMLDiagramUpdater {
 	 */

 	private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Constraint source) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for(Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

-			Element destination = (Element)destinations.next();

+		for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element) destinations.next();

 			result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4014, ConstraintConstrainedElementEditPart.VISUAL_ID));

 		}

 		return result;

@@ -1046,8 +1046,8 @@ public class SysMLDiagramUpdater {
 	private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(Element target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

 				result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_4013, CommentAnnotatedElementEditPart.VISUAL_ID));

 			}

 		}

@@ -1060,8 +1060,8 @@ public class SysMLDiagramUpdater {
 	private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Element target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

 				result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4014, ConstraintConstrainedElementEditPart.VISUAL_ID));

 			}

 		}

@@ -1074,37 +1074,37 @@ public class SysMLDiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if(element instanceof Package) {

-				container = (Package)element;

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

 			}

 		}

-		if(container == null) {

+		if (container == null) {

 			return Collections.emptyList();

 		}

 		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for(Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {

-			EObject linkObject = (EObject)links.next();

-			if(false == linkObject instanceof Usage) {

+		for (Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = links.next();

+			if (false == linkObject instanceof Usage) {

 				continue;

 			}

-			Usage link = (Usage)linkObject;

-			if(!UMLGraphicalTypes.LINK_UML_USAGE_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(linkObject))) {

+			Usage link = (Usage) linkObject;

+			if (!UMLGraphicalTypes.LINK_UML_USAGE_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(linkObject))) {

 				continue;

 			}

 			List<NamedElement> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if(false == theTarget instanceof NamedElement) {

+			if (false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement)theTarget;

+			NamedElement dst = (NamedElement) theTarget;

 			List<NamedElement> sources = link.getClients();

 			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			if(false == theSource instanceof NamedElement) {

+			if (false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement)theSource;

-			if(src != source) {

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_4007, -1));

@@ -1120,37 +1120,37 @@ public class SysMLDiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if(element instanceof Package) {

-				container = (Package)element;

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

 			}

 		}

-		if(container == null) {

+		if (container == null) {

 			return Collections.emptyList();

 		}

 		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for(Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {

-			EObject linkObject = (EObject)links.next();

-			if(false == linkObject instanceof Dependency) {

+		for (Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = links.next();

+			if (false == linkObject instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency)linkObject;

-			if(!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			Dependency link = (Dependency) linkObject;

+			if (!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

 			List<NamedElement> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if(false == theTarget instanceof NamedElement) {

+			if (false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement)theTarget;

+			NamedElement dst = (NamedElement) theTarget;

 			List<NamedElement> sources = link.getClients();

 			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			if(false == theSource instanceof NamedElement) {

+			if (false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement)theSource;

-			if(src != source) {

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

 				continue;

 			}

 			result.add(new UpdaterLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4008, -1));

@@ -1160,13 +1160,13 @@ public class SysMLDiagramUpdater {
 

 	private static Collection<UpdaterLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(Classifier container) {

 		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for(Iterator<Generalization> links = container.getGeneralizations().iterator(); links.hasNext();) {

-			EObject linkObject = (EObject)links.next();

-			if(false == linkObject instanceof Generalization) {

+		for (Iterator<Generalization> links = container.getGeneralizations().iterator(); links.hasNext();) {

+			EObject linkObject = links.next();

+			if (false == linkObject instanceof Generalization) {

 				continue;

 			}

-			Generalization link = (Generalization)linkObject;

-			if(!UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			Generalization link = (Generalization) linkObject;

+			if (!UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

 			Classifier dst = link.getGeneral();

@@ -1178,18 +1178,18 @@ public class SysMLDiagramUpdater {
 	private static Collection<UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(Classifier target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) {

 				continue;

 			}

-			Generalization link = (Generalization)setting.getEObject();

-			if(!UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			Generalization link = (Generalization) setting.getEObject();

+			if (!UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

-			if(false == link.eContainer() instanceof Classifier) {

+			if (false == link.eContainer() instanceof Classifier) {

 				continue;

 			}

-			Classifier container = (Classifier)link.eContainer();

+			Classifier container = (Classifier) link.eContainer();

 			result.add(new UpdaterLinkDescriptor(container, target, link, UMLElementTypes.Generalization_4002, -1));

 		}

 		return result;

@@ -1199,21 +1199,21 @@ public class SysMLDiagramUpdater {
 	private static Collection<? extends UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Association_link_sysml_association(Type target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof Association) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof Association) {

 				continue;

 			}

-			Association link = (Association)setting.getEObject();

-			if(!SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			Association link = (Association) setting.getEObject();

+			if (!SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

 			List<Type> sources = link.getEndTypes();

-			//Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			Object theSource = sources.size() >= 2 ? sources.get(1) : null;//source and target ar einverted in BDD

-			if(false == theSource instanceof Type) {

+			// Object theSource = sources.size() >= 1 ? sources.get(0) : null;

+			Object theSource = sources.size() >= 2 ? sources.get(1) : null;// source and target ar einverted in BDD

+			if (false == theSource instanceof Type) {

 				continue;

 			}

-			Type src = (Type)theSource;

+			Type src = (Type) theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, SysMLElementTypes.ASSOCIATION, -1));

 		}

 		return result;

@@ -1224,40 +1224,40 @@ public class SysMLDiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if(element instanceof Package) {

-				container = (Package)element;

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

 			}

 		}

-		if(container == null) {

+		if (container == null) {

 			return Collections.emptyList();

 		}

 		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for(Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {

-			EObject linkObject = (EObject)links.next();

-			if(false == linkObject instanceof Association) {

+		for (Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = links.next();

+			if (false == linkObject instanceof Association) {

 				continue;

 			}

-			Association link = (Association)linkObject;

-			if(!SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			Association link = (Association) linkObject;

+			if (!SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

-			//Papyrus GenCode 

+			// Papyrus GenCode

 			List<Type> targets = link.getEndTypes();

-			//			Object theTarget = targets.size() >= 2 ? targets.get(1) : null;

-			Object theTarget = targets.size() >= 1 ? targets.get(0) : null;//source and target are inverted in BDD

-			if(false == theTarget instanceof Type) {

+			// Object theTarget = targets.size() >= 2 ? targets.get(1) : null;

+			Object theTarget = targets.size() >= 1 ? targets.get(0) : null;// source and target are inverted in BDD

+			if (false == theTarget instanceof Type) {

 				continue;

 			}

-			Type dst = (Type)theTarget;

+			Type dst = (Type) theTarget;

 			List<Type> sources = link.getEndTypes();

-			//			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			Object theSource = sources.size() >= 2 ? sources.get(1) : null;//source and target are inverted in BDD

-			if(false == theSource instanceof Type) {

+			// Object theSource = sources.size() >= 1 ? sources.get(0) : null;

+			Object theSource = sources.size() >= 2 ? sources.get(1) : null;// source and target are inverted in BDD

+			if (false == theSource instanceof Type) {

 				continue;

 			}

-			Type src = (Type)theSource;

-			if(src != source) {

+			Type src = (Type) theSource;

+			if (src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, SysMLElementTypes.ASSOCIATION, -1));

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java
index f7d6ab6acc7..3fcef92082e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -22,7 +22,7 @@ import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

- * 

+ *

  * @author vl222926

  *         Adapted code for the code generated for the UML Diagrams

  */

@@ -31,83 +31,83 @@ public class SysMLVisualIDRegistry {
 	private static final String UNKNOWN = "-1"; //$NON-NLS-1$

 

 	public static String getLinkWithClassVisualID(EObject domainElement) {

-		if(domainElement == null) {

+		if (domainElement == null) {

 			return UNKNOWN;

 		}

 		final EClass eClass = domainElement.eClass();

-		if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(eClass)) {

+		if (UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(eClass)) {

 			return UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID;

 		}

-		if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(eClass)) {

+		if (UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(eClass)) {

 			return UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID;

 		}

-		if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(eClass)) {

+		if (UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(eClass)) {

 			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;

 		}

-		if(UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(eClass)) {

+		if (UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(eClass)) {

 			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;

 		}

-		//		if(UMLPackage.eINSTANCE.getAssociationClass().isSuperTypeOf(domainElement.eClass())) {

-		//			return AssociationClassLinkEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-		//			return AssociationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-		//			return AssociationBranchEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

-		//			return GeneralizationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

-		//			return InterfaceRealizationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

-		//			return SubstitutionEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

-		//			return RealizationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

-		//			return AbstractionEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

-		//			return UsageEditPart.VISUAL_ID;

-		//		}

-		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

+		// if(UMLPackage.eINSTANCE.getAssociationClass().isSuperTypeOf(domainElement.eClass())) {

+		// return AssociationClassLinkEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

+		// return AssociationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

+		// return AssociationBranchEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

+		// return GeneralizationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

+		// return InterfaceRealizationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

+		// return SubstitutionEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

+		// return RealizationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

+		// return AbstractionEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

+		// return UsageEditPart.VISUAL_ID;

+		// }

+		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

 			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;

 		}

-		//		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

-		//			return DependencyBranchEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {

-		//			return ElementImportEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) {

-		//			return PackageImportEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getPackageMerge().isSuperTypeOf(domainElement.eClass())) {

-		//			return PackageMergeEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) {

-		//			return ProfileApplicationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getTemplateBinding().isSuperTypeOf(domainElement.eClass())) {

-		//			return TemplateBindingEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getGeneralizationSet().isSuperTypeOf(domainElement.eClass())) {

-		//			return GeneralizationSetEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-		//			return InstanceSpecificationLinkEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

-		//			return InformationFlowEditPart.VISUAL_ID;

-		//		}

+		// if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

+		// return DependencyBranchEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {

+		// return ElementImportEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) {

+		// return PackageImportEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getPackageMerge().isSuperTypeOf(domainElement.eClass())) {

+		// return PackageMergeEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) {

+		// return ProfileApplicationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getTemplateBinding().isSuperTypeOf(domainElement.eClass())) {

+		// return TemplateBindingEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getGeneralizationSet().isSuperTypeOf(domainElement.eClass())) {

+		// return GeneralizationSetEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

+		// return InstanceSpecificationLinkEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

+		// return InformationFlowEditPart.VISUAL_ID;

+		// }

 		return UNKNOWN;

 	}

 

-	//	//TODO : this class as not been tested...

+	// //TODO : this class as not been tested...

 	public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {

 

 		@Override

@@ -140,38 +140,38 @@ public class SysMLVisualIDRegistry {
 			return false;

 		}

 

-		//			public String getVisualIDAsString(final View view) {

-		//				return view.getType();

-		//			}

-		//	

-		//			public int getVisualID(View view) {//TODO : not useful with sysml, because we are using String!

-		//				final String type = view.getType();

-		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view);

-		//			}

-		//	

-		//	

-		//			public String getModelID(View view) {

-		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(view);

-		//			}

-		//	

-		//	

-		//			public int getNodeVisualID(View containerView, EObject domainElement) {

-		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

-		//			}

-		//	

-		//	

-		//			public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

-		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

-		//			}

-		//	

-		//	

-		//			public boolean isCompartmentVisualID(int visualID) {

-		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isCompartmentVisualID(visualID);

-		//			}

-		//	

-		//	

-		//			public boolean isSemanticLeafVisualID(int visualID) {

-		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isSemanticLeafVisualID(visualID);

-		//			}

+		// public String getVisualIDAsString(final View view) {

+		// return view.getType();

+		// }

+		//

+		// public int getVisualID(View view) {//TODO : not useful with sysml, because we are using String!

+		// final String type = view.getType();

+		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view);

+		// }

+		//

+		//

+		// public String getModelID(View view) {

+		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(view);

+		// }

+		//

+		//

+		// public int getNodeVisualID(View containerView, EObject domainElement) {

+		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

+		// }

+		//

+		//

+		// public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

+		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

+		// }

+		//

+		//

+		// public boolean isCompartmentVisualID(int visualID) {

+		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isCompartmentVisualID(visualID);

+		// }

+		//

+		//

+		// public boolean isSemanticLeafVisualID(int visualID) {

+		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isSemanticLeafVisualID(visualID);

+		// }

 	};

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java
index e32a387d1cf..a2463473072 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java
@@ -61,9 +61,9 @@ public class CustomPreferenceInitializer extends BlockDefinitionDiagramPreferenc
 	 * Initialize default position of a link label in preferences.

 	 *

 	 * @param parentGraphicalType

-	 *        the graphical type of the view owning the label

+	 *            the graphical type of the view owning the label

 	 * @param graphicalType

-	 *        the graphical type of the label

+	 *            the graphical type of the label

 	 * @param x

 	 * @param y

 	 */

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsCompartmentItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsCompartmentItemPreferencePage.java
index 1de34b89fce..273a95d78b7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsCompartmentItemPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsCompartmentItemPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsCompartmentItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsCompartmentItemPreferencePage.java
index 8b2e2028dd7..cca7a478b4c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsCompartmentItemPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsCompartmentItemPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPolicyProvider.java
index 44c5971fa91..7055680c86c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPolicyProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPolicyProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -17,7 +17,6 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultCreationEditPolicy;

@@ -71,68 +70,67 @@ import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
 import org.eclipse.papyrus.uml.diagram.common.edit.part.PrimitiveTypeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.edit.part.SignalEditPart;

 import org.eclipse.papyrus.uml.diagram.common.edit.part.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 

 /**

  * Edit policy provider for the Block definition diagram (install or remove policies on edit part creation).

  */

 public class CustomEditPolicyProvider extends BlockDefinitionDiagramEditPolicyProvider {

 

+	@Override

 	public boolean provides(IOperation operation) {

 

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;

-		if(!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {

+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

+		if (!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {

 			return false;

 		}

 

 		// Make sure this concern Block Definition Diagram only

-		IGraphicalEditPart gep = (IGraphicalEditPart)epOperation.getEditPart();

+		IGraphicalEditPart gep = (IGraphicalEditPart) epOperation.getEditPart();

 		String diagramType = gep.getNotationView().getDiagram().getType();

-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

 			return false;

 		}

 

 		// Provides for edit parts that represent nodes in Block Definition diagram

-		if(gep instanceof AbstractElementEditPart) {

+		if (gep instanceof AbstractElementEditPart) {

 			return true;

 		}

 

 		// Provides for edit parts that represent edges in Block Definition diagram

-		if(gep instanceof AbstractElementLinkEditPart) {

+		if (gep instanceof AbstractElementLinkEditPart) {

 			return true;

 		}

 

-		if(gep instanceof ResizeableListCompartmentEditPart) {

+		if (gep instanceof ResizeableListCompartmentEditPart) {

 			return true;

 		}

 

-		if(gep instanceof AbstractElementChildLabelEditPart) {

+		if (gep instanceof AbstractElementChildLabelEditPart) {

 			return true;

 		}

 

-		if(gep instanceof BlockDefinitionDiagramEditPart) {

+		if (gep instanceof BlockDefinitionDiagramEditPart) {

 			return true;

 		}

 

 		return super.provides(operation);

 	}

 

+	@Override

 	public void createEditPolicies(EditPart editPart) {

 		super.createEditPolicies(editPart);

 

-		if(editPart instanceof BlockDefinitionDiagramEditPart) {

+		if (editPart instanceof BlockDefinitionDiagramEditPart) {

 			editPart.installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());

-			// no installation of other policies. 

+			// no installation of other policies.

 			return;

 		}

 

 		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 

 		// Legacy management of new Nodes / Edges with nodes from Class Diagram and navigation support (installed by edit policy provider in Class Diagram)

-		if((editPart instanceof PackagePackageableElementCompartmentEditPartCN) || (editPart instanceof PackagePackageableElementCompartmentEditPart)) {

+		if ((editPart instanceof PackagePackageableElementCompartmentEditPartCN) || (editPart instanceof PackagePackageableElementCompartmentEditPart)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageSemanticEditPolicy());// replace DefaultCreationEditPolicy to let reparent

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PackageCreationEditPolicy());// replace DefaultCreationEditPolicy to let reparent

 			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());

@@ -140,7 +138,7 @@ public class CustomEditPolicyProvider extends BlockDefinitionDiagramEditPolicyPr
 

 		}

 

-		if((editPart instanceof ModelPackageableElementCompartmentEditPartCN) || (editPart instanceof ModelPackageableElementCompartmentEditPartTN)) {

+		if ((editPart instanceof ModelPackageableElementCompartmentEditPartCN) || (editPart instanceof ModelPackageableElementCompartmentEditPartTN)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageSemanticEditPolicy());// replace DefaultCreationEditPolicy to let reparent

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PackageCreationEditPolicy());// replace DefaultCreationEditPolicy to let reparent

 			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());

@@ -148,119 +146,119 @@ public class CustomEditPolicyProvider extends BlockDefinitionDiagramEditPolicyPr
 

 		}

 

-		if((editPart instanceof PackageEditPart) || (editPart instanceof PackageEditPartCN)) {

+		if ((editPart instanceof PackageEditPart) || (editPart instanceof PackageEditPartCN)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PackageCreationEditPolicy());// replace DefaultCreationEditPolicy to let reparent

 			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		}

 

-		if((editPart instanceof ModelEditPartTN) || (editPart instanceof ModelEditPartCN)) {

+		if ((editPart instanceof ModelEditPartTN) || (editPart instanceof ModelEditPartCN)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PackageCreationEditPolicy());// replace DefaultCreationEditPolicy to let reparent

 			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		}

 

-		if((editPart instanceof InstanceSpecificationEditPart) || (editPart instanceof InstanceSpecificationEditPartCN)) {

+		if ((editPart instanceof InstanceSpecificationEditPart) || (editPart instanceof InstanceSpecificationEditPartCN)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		}

 

-		if((editPart instanceof InstanceSpecificationSlotCompartmentEditPart) || (editPart instanceof InstanceSpecificationSlotCompartmentEditPartCN)) {

+		if ((editPart instanceof InstanceSpecificationSlotCompartmentEditPart) || (editPart instanceof InstanceSpecificationSlotCompartmentEditPartCN)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		}

 

-		if((editPart instanceof ConstraintEditPart) || (editPart instanceof ConstraintEditPartCN)) {

+		if ((editPart instanceof ConstraintEditPart) || (editPart instanceof ConstraintEditPartCN)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		}

 

-		if((editPart instanceof CommentEditPart) || (editPart instanceof CommentEditPartCN)) {

+		if ((editPart instanceof CommentEditPart) || (editPart instanceof CommentEditPartCN)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		}

 

 		// Legacy management of Comment / Constraint links

-		if(editPart instanceof ActorEditPart) {

+		if (editPart instanceof ActorEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof EnumerationEditPart) {

+		if (editPart instanceof EnumerationEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof PrimitiveTypeEditPart) {

+		if (editPart instanceof PrimitiveTypeEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof ValueTypeEditPart) {

+		if (editPart instanceof ValueTypeEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof DataTypeEditPart) {

+		if (editPart instanceof DataTypeEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof FlowSpecificationEditPart) {

+		if (editPart instanceof FlowSpecificationEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof InterfaceEditPart) {

+		if (editPart instanceof InterfaceEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof SignalEditPart) {

+		if (editPart instanceof SignalEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof ConstraintBlockEditPart) {

+		if (editPart instanceof ConstraintBlockEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof BlockEditPart) {

+		if (editPart instanceof BlockEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockCompositeSemanticEditPolicy());

 		}

 

-		if(editPart instanceof DimensionEditPart) {

+		if (editPart instanceof DimensionEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof UnitEditPart) {

+		if (editPart instanceof UnitEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof DependencyEditPart) {

+		if (editPart instanceof DependencyEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof GeneralizationEditPart) {

+		if (editPart instanceof GeneralizationEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof UsageEditPart) {

+		if (editPart instanceof UsageEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof AssociationEditPart) {

+		if (editPart instanceof AssociationEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof InterfaceRealizationEditPart) {

+		if (editPart instanceof InterfaceRealizationEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof FlowPortChildLabelEditPart) {

+		if (editPart instanceof FlowPortChildLabelEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof FlowPortAffixedNodeEditPart || editPart instanceof PortAffixedNodeEditPart) {

+		if (editPart instanceof FlowPortAffixedNodeEditPart || editPart instanceof PortAffixedNodeEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof AbstractElementChildLabelEditPart) {

+		if (editPart instanceof AbstractElementChildLabelEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ParserProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ParserProvider.java
index 3d65339c95b..f86682a3bcc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ParserProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ParserProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -85,10 +85,10 @@ public class ParserProvider extends AbstractProvider implements IParserProvider
 	 * {@inheritDoc}

 	 */

 	public boolean provides(IOperation operation) {

-		if(operation instanceof GetParserOperation) {

-			IAdaptable hint = ((GetParserOperation)operation).getHint();

+		if (operation instanceof GetParserOperation) {

+			IAdaptable hint = ((GetParserOperation) operation).getHint();

 

-			if(!ElementTypes.DIAGRAM_ID.equals(getDiagramType(hint))) {

+			if (!ElementTypes.DIAGRAM_ID.equals(getDiagramType(hint))) {

 				return false;

 			}

 

@@ -101,18 +101,18 @@ public class ParserProvider extends AbstractProvider implements IParserProvider
 	 * {@inheritDoc}

 	 */

 	public IParser getParser(IAdaptable hint) {

-		String parserHint = (String)hint.getAdapter(String.class);

-		if(parserHint != null) {

+		String parserHint = (String) hint.getAdapter(String.class);

+		if (parserHint != null) {

 			IParser parser = graphicalHintToParser.get(parserHint);

-			if(parser != null) {

+			if (parser != null) {

 				return parser;

 			}

 		}

 

-		View view = (View)hint.getAdapter(View.class);

-		if(view != null) {

+		View view = (View) hint.getAdapter(View.class);

+		if (view != null) {

 			IParser parser = graphicalHintToParser.get(view.getType());

-			if(parser != null) {

+			if (parser != null) {

 				return parser;

 			}

 		}

@@ -121,8 +121,8 @@ public class ParserProvider extends AbstractProvider implements IParserProvider
 	}

 

 	private String getDiagramType(IAdaptable hint) {

-		Diagram diagram = (Diagram)hint.getAdapter(Diagram.class);

-		if(diagram != null) {

+		Diagram diagram = (Diagram) hint.getAdapter(Diagram.class);

+		if (diagram != null) {

 			return diagram.getType();

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationDecoratorProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationDecoratorProvider.java
index b806337a13e..88652d35737 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationDecoratorProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationDecoratorProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -28,32 +28,34 @@ import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
 

 public class ValidationDecoratorProvider extends org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider implements IDecoratorProvider {

 

+	@Override

 	public void createDecorators(IDecoratorTarget decoratorTarget) {

-		EditPart editPart = (EditPart)decoratorTarget.getAdapter(EditPart.class);

-		if(editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

+		EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class);

+		if (editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

 			Object model = editPart.getModel();

-			if((model instanceof View)) {

-				View view = (View)model;

-				if(!(view instanceof Edge) && !view.isSetElement()) {

+			if ((model instanceof View)) {

+				View view = (View) model;

+				if (!(view instanceof Edge) && !view.isSetElement()) {

 					return;

 				}

 			}

 			EditDomain ed = editPart.getViewer().getEditDomain();

-			if(!(ed instanceof DiagramEditDomain)) {

+			if (!(ed instanceof DiagramEditDomain)) {

 				return;

 			}

-			if(((DiagramEditDomain)ed).getEditorPart() instanceof UmlGmfDiagramEditor) {

+			if (((DiagramEditDomain) ed).getEditorPart() instanceof UmlGmfDiagramEditor) {

 				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

 			}

 		}

 	}

 

+	@Override

 	public boolean provides(IOperation operation) {

-		if(!(operation instanceof CreateDecoratorsOperation)) {

+		if (!(operation instanceof CreateDecoratorsOperation)) {

 			return false;

 		}

-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation)operation).getDecoratorTarget();

-		View view = (View)decoratorTarget.getAdapter(View.class);

+		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();

+		View view = (View) decoratorTarget.getAdapter(View.class);

 		return view != null && ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType());

 	}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationProvider.java
index 375ce86c331..cc5d1036d47 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -38,7 +38,7 @@ public class ValidationProvider {
 				}

 			}

 		};

-		if(editingDomain != null) {

+		if (editingDomain != null) {

 			try {

 				editingDomain.runExclusive(task);

 			} catch (Exception e) {

@@ -50,11 +50,11 @@ public class ValidationProvider {
 	}

 

 	static boolean isInDefaultEditorContext(Object object) {

-		if(shouldConstraintsBePrivate() && !constraintsActive) {

+		if (shouldConstraintsBePrivate() && !constraintsActive) {

 			return false;

 		}

-		if(object instanceof View) {

-			return constraintsActive && ElementTypes.DIAGRAM_ID.equals(((View)object).getDiagram().getType());

+		if (object instanceof View) {

+			return constraintsActive && ElementTypes.DIAGRAM_ID.equals(((View) object).getDiagram().getType());

 		}

 		return true;

 	}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/ui/BlockDefinitionInterfaceManagerDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/ui/BlockDefinitionInterfaceManagerDialog.java
index 76a96fba5ec..bc88eda072c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/ui/BlockDefinitionInterfaceManagerDialog.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/ui/BlockDefinitionInterfaceManagerDialog.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
  * <pre>
- * This class provides a Dialog to manage easily the provided and 
+ * This class provides a Dialog to manage easily the provided and
  * the required Interfaces for a {@link Port}.
  * </pre>
  */
@@ -41,9 +41,9 @@ public class BlockDefinitionInterfaceManagerDialog extends InterfaceManagerDialo
 	 * Instantiates a new block definition interface manager dialog.
 	 *
 	 * @param parentShell
-	 *        the parent shell
+	 *            the parent shell
 	 * @param port
-	 *        the port
+	 *            the port
 	 */
 	public BlockDefinitionInterfaceManagerDialog(Shell parentShell, Port port) {
 		super(parentShell, port);
@@ -55,23 +55,24 @@ public class BlockDefinitionInterfaceManagerDialog extends InterfaceManagerDialo
 	 * Gets the all available interfaces.
 	 *
 	 * @param pack
-	 *        the pack
+	 *            the pack
 	 * @return the all available interfaces
 	 * @see org.eclipse.papyrus.uml.diagram.common.dialogs.InterfaceManagerDialog#getAllAvailableInterfaces(org.eclipse.uml2.uml.Package)
 	 */
+	@Override
 	protected List<Interface> getAllAvailableInterfaces(Package pack) {
 		Set<Interface> otherInterfaces = new HashSet<Interface>();
 		List<Element> interfaces = Visitor.getOwnedAndImportedElement(pack, Interface.class);
-		for(Namespace namespace : Visitor.getOwnedAndImportedNamespaces(pack)) {
+		for (Namespace namespace : Visitor.getOwnedAndImportedNamespaces(pack)) {
 			interfaces.addAll(Visitor.getOwnedAndImportedElement(namespace, Interface.class));
 
 		}
 
-		for(Element element : interfaces) {
+		for (Element element : interfaces) {
 			// Test if the interface is a FlowSpecification
 			FlowSpecification flowSpec = UMLUtil.getStereotypeApplication(element, FlowSpecification.class);
-			if(flowSpec == null) {
-				otherInterfaces.add((Interface)element);
+			if (flowSpec == null) {
+				otherInterfaces.add((Interface) element);
 			}
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java
index a42389d0cdf..81ffe6d66fb 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -40,33 +40,35 @@ public class FixPortsLocationOnOpening {
 
 	/**
 	 * This method fix the diagram Port and FlowPort locations.
-	 * @param diagram the diagram
+	 * 
+	 * @param diagram
+	 *            the diagram
 	 */
 	public void fix(Diagram diagram) {
-		
+
 		// Parse diagram content
 		Iterator<EObject> it = diagram.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject current = it.next();
-			
+
 			// Select Port and FlowPorts
-			if (! (current instanceof Shape)) {
+			if (!(current instanceof Shape)) {
 				continue;
 			}
-			Shape portView = (Shape)current;
+			Shape portView = (Shape) current;
 			String currentType = (portView).getType();
 			if (SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(currentType) || UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(currentType)) {
-				
+
 				int borderItemOffset = 10;
 				View parentView = ViewUtil.getViewContainer(portView);
-				
-				if (parentView instanceof Shape){
-					Shape parentShape = (Shape)parentView;
+
+				if (parentView instanceof Shape) {
+					Shape parentShape = (Shape) parentView;
 					Bounds portViewBounds = (Bounds) portView.getLayoutConstraint();
 					Bounds parentViewBounds = (Bounds) parentShape.getLayoutConstraint();
-					
+
 					final Rectangle portBounds = new Rectangle(portViewBounds.getX(), portViewBounds.getY(), portViewBounds.getWidth(), portViewBounds.getHeight());
-					
+
 					int parentWidth = parentViewBounds.getWidth();
 					int parentHeight = parentViewBounds.getHeight();
 					if ((parentWidth == -1) && (parentHeight == -1)) {
@@ -76,13 +78,13 @@ public class FixPortsLocationOnOpening {
 						parentHeight = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.HEIGHT));
 					}
 					final Rectangle parentBounds = new Rectangle(parentViewBounds.getX(), parentViewBounds.getY(), parentWidth, parentHeight);
-					
+
 					// Calculate the valid location based on currently stored location and parent bounds
 					final Rectangle validLocation = PortPositionLocatorUtils.getBorderLocation(parentBounds, portBounds, borderItemOffset);
-					
+
 					// Fix when current location is not the valid location (only possible if parent size is set)
-					if (! portBounds.equals(validLocation)) {
-						
+					if (!portBounds.equals(validLocation)) {
+
 						TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(diagram);
 						Command fixCommand = new FixLocationCommand(editingDomain, "Fix Port location on opening", portViewBounds, validLocation);
 						editingDomain.getCommandStack().execute(fixCommand);
@@ -92,20 +94,20 @@ public class FixPortsLocationOnOpening {
 			}
 		}
 	}
-	
+
 	/**
 	 * This command set the Port view with valid locations.
 	 */
 	public class FixLocationCommand extends RecordingCommand {
-		
+
 		/** Port view bounds. */
 		private Bounds portViewBounds;
-		
+
 		/** Port valid bounds (only the location is used here). */
 		private Rectangle portValidBounds;
-		
+
 		/** Constructor. */
-		public FixLocationCommand(TransactionalEditingDomain domain,String label, Bounds portViewBounds, Rectangle portValidBounds) {
+		public FixLocationCommand(TransactionalEditingDomain domain, String label, Bounds portViewBounds, Rectangle portValidBounds) {
 			super(domain, label);
 			this.portViewBounds = portViewBounds;
 			this.portValidBounds = portValidBounds;
@@ -121,6 +123,6 @@ public class FixPortsLocationOnOpening {
 		public boolean canUndo() {
 			return false;
 		}
-		
+
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/CreateViewCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/CreateViewCommand.java
index b877e3a2c73..612d3c0d170 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/CreateViewCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/CreateViewCommand.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -23,9 +23,7 @@ import org.eclipse.gmf.runtime.notation.View;
 
 /**
  * A replacement for CreateCommand that avoids that takes into account the incorrect
- * generation of ViewProvider by GMFTooling and modifies SemanticAdapter in call to
- * {@link ViewService#provides(Class, org.eclipse.core.runtime.IAdaptable, View, String, int, boolean, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)}
- * .
+ * generation of ViewProvider by GMFTooling and modifies SemanticAdapter in call to {@link ViewService#provides(Class, org.eclipse.core.runtime.IAdaptable, View, String, int, boolean, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)} .
  */
 public class CreateViewCommand extends CreateCommand {
 
@@ -41,13 +39,13 @@ public class CreateViewCommand extends CreateCommand {
 	public boolean canExecute() {
 
 		// Warning the element adapter can possibly be null (see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=353129)
-		if(viewDescriptor.getElementAdapter() == null) {
+		if (viewDescriptor.getElementAdapter() == null) {
 			return false;
 		}
 
 		// Try to adapt the descriptor ElementAdapter in EObject
-		EObject element = (EObject)viewDescriptor.getElementAdapter().getAdapter(EObject.class);
-		IElementType elementType = (IElementType)viewDescriptor.getElementAdapter().getAdapter(IElementType.class);
+		EObject element = (EObject) viewDescriptor.getElementAdapter().getAdapter(EObject.class);
+		IElementType elementType = (IElementType) viewDescriptor.getElementAdapter().getAdapter(IElementType.class);
 
 		SemanticElementAdapter semanticAdapter = new SemanticElementAdapter(element, elementType);
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/ISemanticHintAdapter.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/ISemanticHintAdapter.java
index cc0b896137a..d25ac3a5782 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/ISemanticHintAdapter.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/ISemanticHintAdapter.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -15,12 +15,13 @@ package org.eclipse.papyrus.gmf.diagram.common.commands;
 
 
 /**
- * Interface for an adapter that can give a semantic hint 
+ * Interface for an adapter that can give a semantic hint
  */
 public interface ISemanticHintAdapter {
-	
+
 	/**
 	 * Returns the semantic hint for this adapter
+	 * 
 	 * @return the semantic hint for this adapter
 	 */
 	public String getSemanticHint();
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/IdentityCommandWithNotification.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/IdentityCommandWithNotification.java
index ec0e19b8971..5410455d754 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/IdentityCommandWithNotification.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/IdentityCommandWithNotification.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,7 +26,7 @@ import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.Notificat
 /**
  * A command that is always executable, undoable and redoable, but does nothing.
  * It always returns the same OK command result.
- * 
+ *
  * @author ldamus
  */
 public class IdentityCommandWithNotification extends AbstractCommand {
@@ -65,6 +65,7 @@ public class IdentityCommandWithNotification extends AbstractCommand {
 	/**
 	 * Does nothing and returns an OK command result.
 	 */
+	@Override
 	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 
 		new NotificationBuilder().setBuilderClass(CombinedPopupAndViewBuilder.class).setType(type).setTitle(title).setMessage(message).run();
@@ -75,6 +76,7 @@ public class IdentityCommandWithNotification extends AbstractCommand {
 	/**
 	 * Does nothing and returns an OK command result.
 	 */
+	@Override
 	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 
 		return getCommandResult();
@@ -83,6 +85,7 @@ public class IdentityCommandWithNotification extends AbstractCommand {
 	/**
 	 * Does nothing and returns an OK command result.
 	 */
+	@Override
 	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 
 		return getCommandResult();
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/SemanticElementAdapter.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/SemanticElementAdapter.java
index cbfbce3b15b..c7787e7c51e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/SemanticElementAdapter.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/SemanticElementAdapter.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -51,25 +51,25 @@ public class SemanticElementAdapter extends SemanticAdapter implements ISemantic
 	@SuppressWarnings("rawtypes")
 	@Override
 	public Object getAdapter(Class adapter) {
-		if(adapter.equals(IHintedType.class)) {
-			if(elementType instanceof IHintedType) {
+		if (adapter.equals(IHintedType.class)) {
+			if (elementType instanceof IHintedType) {
 				return elementType;
 			}
 		}
-		
-		if(adapter.equals(IElementType.class)) {
+
+		if (adapter.equals(IElementType.class)) {
 			return elementType;
 		}
 		return super.getAdapter(adapter);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public Object getProxyClassID() {
-		if(elementType !=null) {
-			return PackageUtil.getID(((IElementType)elementType).getEClass());
+		if (elementType != null) {
+			return PackageUtil.getID(((IElementType) elementType).getEClass());
 		}
 		return super.getProxyClassID();
 	}
@@ -77,9 +77,10 @@ public class SemanticElementAdapter extends SemanticAdapter implements ISemantic
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getSemanticHint() {
-		if(elementType instanceof IHintedType) {
-			return ((IHintedType)elementType).getSemanticHint();
+		if (elementType instanceof IHintedType) {
+			return ((IHintedType) elementType).getSemanticHint();
 		}
 		return null;
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/DiagramVersioningUtils.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/DiagramVersioningUtils.java
index 618265841a9..cd8cc7b790a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/DiagramVersioningUtils.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/DiagramVersioningUtils.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/IDiagramVersionUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/IDiagramVersionUpdater.java
index a487396ac2f..0c9da54c8dc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/IDiagramVersionUpdater.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/IDiagramVersionUpdater.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -22,9 +22,13 @@ public interface IDiagramVersionUpdater {
 
 	/**
 	 * Update a diagram to a new version.
-	 * @param diagram the diagram to update
-	 * @param oldVersion the old version of the diagram
-	 * @param newVersion the new version of the diagram
+	 * 
+	 * @param diagram
+	 *            the diagram to update
+	 * @param oldVersion
+	 *            the old version of the diagram
+	 * @param newVersion
+	 *            the new version of the diagram
 	 * @return TODO : should return a status, not int.
 	 */
 	public int update(Diagram diagram, String oldVersion, String newVersion);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/part/ITextAwareEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/part/ITextAwareEditPart.java
index b887daaf6ed..b532c971a63 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/part/ITextAwareEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/part/ITextAwareEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -23,15 +23,15 @@ public interface ITextAwareEditPart extends org.eclipse.gmf.runtime.diagram.ui.e
 
 	/**
 	 * Get the parser elements.
-	 * 
+	 *
 	 * @return the element being parsed.
 	 */
 	public EObject getParserElement();
-	
-    /**
-     * Gets the default parser options (meaning parser options stored in preferences).
-     * 
-     * @return ParserOptions the parser options
-     */
+
+	/**
+	 * Gets the default parser options (meaning parser options stored in preferences).
+	 *
+	 * @return ParserOptions the parser options
+	 */
 	public ParserOptions getDefaultParserOptions();
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java
index 4802945aec3..055afdce855 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -85,7 +85,7 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 	}
 
 	private Set<String> getSpecificDropList() {
-		if(specificDropList == null) {
+		if (specificDropList == null) {
 			specificDropList = getSpecificDropBehaviorTypes();
 		}
 		return specificDropList;
@@ -105,13 +105,13 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 	protected Command getDropCommand(ChangeBoundsRequest request) {
 
 		Iterator<?> iter = request.getEditParts().iterator();
-		EObject graphicalParentObject = ((GraphicalEditPart)getHost()).resolveSemanticElement();
-		while((graphicalParentObject != null) && (iter.hasNext())) {
-			EditPart droppedEditPart = (EditPart)iter.next();
-			if(droppedEditPart instanceof AbstractElementBorderEditPart) {
+		EObject graphicalParentObject = ((GraphicalEditPart) getHost()).resolveSemanticElement();
+		while ((graphicalParentObject != null) && (iter.hasNext())) {
+			EditPart droppedEditPart = (EditPart) iter.next();
+			if (droppedEditPart instanceof AbstractElementBorderEditPart) {
 				return UnexecutableCommand.INSTANCE;
 			}
-			if(droppedEditPart instanceof AbstractElementLabelEditPart) {
+			if (droppedEditPart instanceof AbstractElementLabelEditPart) {
 				return UnexecutableCommand.INSTANCE;
 			}
 		}
@@ -127,24 +127,24 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 		CompoundCommand completeDropCommand = new CompoundCommand("DropObjectsAndArrange"); //$NON-NLS-1$
 
 		// Detect file drop
-		if((dropRequest.getObjects().size() > 0) && (dropRequest.getObjects().get(0) instanceof String)) {
+		if ((dropRequest.getObjects().size() > 0) && (dropRequest.getObjects().get(0) instanceof String)) {
 			return getDropFileCommand(dropRequest);
 		}
 
 		// Create the drop command by composite drop command for each dropped elements
 		CompositeCommand gmfDropCommand = new CompositeCommand("DropObjects"); //$NON-NLS-1$
 		Iterator<?> iter = dropRequest.getObjects().iterator();
-		while(iter.hasNext()) {
-			EObject droppedObject = (EObject)iter.next();
+		while (iter.hasNext()) {
+			EObject droppedObject = (EObject) iter.next();
 			gmfDropCommand.add(getDropObjectCommand(dropRequest, droppedObject));
 		}
 
 		// Create the complete drop command by adding an arrange command after drop
-		if(!gmfDropCommand.isEmpty()) {
+		if (!gmfDropCommand.isEmpty()) {
 
 			// Retrieve drop result (most probably created view but not necessarily) and update the request
 			CommandResult result = gmfDropCommand.getCommandResult();
-			List<?> newValues = (List<?>)result.getReturnValue();
+			List<?> newValues = (List<?>) result.getReturnValue();
 			dropRequest.setResult(newValues);
 
 			// Prepare refresh command
@@ -161,12 +161,12 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 			completeDropCommand.add(dropCommand.chain(refreshCommand));
 			completeDropCommand.add(arrangeCommand);
 
-			//add snap command if required
-			//430099: [Diagram] Snap to Grid for elements dropped from the ModelExplorer is ignored
-			//https://bugs.eclipse.org/bugs/show_bug.cgi?id=430099
+			// add snap command if required
+			// 430099: [Diagram] Snap to Grid for elements dropped from the ModelExplorer is ignored
+			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=430099
 			final Object value = dropRequest.getExtendedData().get(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT);
-			if(value instanceof Boolean && Boolean.TRUE.equals(value)) {
-				DeferredSnapToGridCommand snapCommand = new DeferredSnapToGridCommand(getEditingDomain(), newValues, (IGraphicalEditPart)getHost());
+			if (value instanceof Boolean && Boolean.TRUE.equals(value)) {
+				DeferredSnapToGridCommand snapCommand = new DeferredSnapToGridCommand(getEditingDomain(), newValues, (IGraphicalEditPart) getHost());
 				completeDropCommand.add(new ICommandProxy(snapCommand));
 			}
 
@@ -179,49 +179,49 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 
 		Point location = dropRequest.getLocation().getCopy();
 
-		View dropTargetView = ((IGraphicalEditPart)getHost()).getNotationView();
+		View dropTargetView = ((IGraphicalEditPart) getHost()).getNotationView();
 		EObject dropTargetElement = dropTargetView.getElement();
 
 		String droppedNodeType = registry.getNodeGraphicalType(droppedObject, dropTargetView.getType());
 		String droppedEdgeType = registry.getEdgeGraphicalType(droppedObject);
 
 		// Test if a specific drop command should be used
-		if(getSpecificDropList().contains(droppedNodeType) || getSpecificDropList().contains(droppedEdgeType)) {
+		if (getSpecificDropList().contains(droppedNodeType) || getSpecificDropList().contains(droppedEdgeType)) {
 			return getSpecificDropCommand(dropRequest, droppedObject, droppedNodeType, droppedEdgeType);
 		}
 
 		// Decide unknown type handling
-		if(UNDEFINED_TYPE.equals(droppedNodeType) && UNDEFINED_TYPE.equals(droppedEdgeType)) {
+		if (UNDEFINED_TYPE.equals(droppedNodeType) && UNDEFINED_TYPE.equals(droppedEdgeType)) {
 			return getUnknownDropCommand(dropRequest, droppedObject);
 		}
 
 		// The dropped element is a node
-		if(!UNDEFINED_TYPE.equals(droppedNodeType)) {
+		if (!UNDEFINED_TYPE.equals(droppedNodeType)) {
 
 			// Drop restriction:
 			// - no restriction when dropped on diagram
-			// - require containment when dropped on any other EObject		
-			 if((dropTargetView instanceof Diagram) || dropTargetElement.eContents().contains(droppedObject)) {
+			// - require containment when dropped on any other EObject
+			if ((dropTargetView instanceof Diagram) || dropTargetElement.eContents().contains(droppedObject)) {
 				return getDefaultDropNodeCommand(droppedNodeType, location, droppedObject);
-			 }
+			}
 
-			 // Allow drop for inherited elements
-			 if (dropTargetElement instanceof Classifier && ((Classifier) dropTargetElement).getAllAttributes().contains(droppedObject) ) {
+			// Allow drop for inherited elements
+			if (dropTargetElement instanceof Classifier && ((Classifier) dropTargetElement).getAllAttributes().contains(droppedObject)) {
 				return getDefaultDropNodeCommand(droppedNodeType, location, droppedObject);
-			 }		
-			 return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
+			}
+			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
 		}
 
 		// The dropped element is a edge
-		if(!UNDEFINED_TYPE.equals(droppedEdgeType)) {
+		if (!UNDEFINED_TYPE.equals(droppedEdgeType)) {
 
-			Collection<?> sources = linkMappingHelper.getSource((Element)droppedObject);
-			Collection<?> targets = linkMappingHelper.getTarget((Element)droppedObject);
+			Collection<?> sources = linkMappingHelper.getSource((Element) droppedObject);
+			Collection<?> targets = linkMappingHelper.getTarget((Element) droppedObject);
 
 			// Only manage binary link during drop
-			if((sources.size() > 0) && (targets.size() > 0)) {
-				EObject source = (EObject)sources.toArray()[0];
-				EObject target = (EObject)targets.toArray()[0];
+			if ((sources.size() > 0) && (targets.size() > 0)) {
+				EObject source = (EObject) sources.toArray()[0];
+				EObject target = (EObject) targets.toArray()[0];
 				return getDefaultDropEdgeCommand(droppedObject, source, target, droppedEdgeType, location);
 			}
 
@@ -250,7 +250,7 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 
 		CompositeCommand completeDropCommand = new CompositeCommand("CompleteDropEdge"); //$NON-NLS-1$
 
-		// Find views in current diagram representing source and target 
+		// Find views in current diagram representing source and target
 		Collection<View> sourceViews = getViews(source);
 		Collection<View> targetViews = getViews(target);
 
@@ -260,28 +260,28 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 		// If either a source or target lacks create view for these elements
 		// - using defaultDrop command (assumed to be a view creation)
 		// - try to create view on host
-		if(sourceViews.isEmpty() || targetViews.isEmpty()) {
+		if (sourceViews.isEmpty() || targetViews.isEmpty()) {
 
 			CompositeCommand createEndViewsCommand = new CompositeCommand("CreateSourceTargetViews"); //$NON-NLS-1$
 
-			View dropContainerView = ((IGraphicalEditPart)getHost()).getNotationView();
+			View dropContainerView = ((IGraphicalEditPart) getHost()).getNotationView();
 			EObject dropContainerElement = dropContainerView.getElement();
 
-			if(sourceViews.isEmpty()) {
-				if(dropContainerElement.eContents().contains(source)) {
+			if (sourceViews.isEmpty()) {
+				if (dropContainerElement.eContents().contains(source)) {
 					ICommand dropSourceCommand = getDefaultDropNodeCommand(registry.getNodeGraphicalType(source, dropContainerView.getType()), absoluteLocation.getCopy(), source);
 					CompositeCommand.compose(createEndViewsCommand, dropSourceCommand);
-					sourceViewAdapter = (IAdaptable)dropSourceCommand.getCommandResult().getReturnValue();
+					sourceViewAdapter = (IAdaptable) dropSourceCommand.getCommandResult().getReturnValue();
 				} else {
 					return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
 				}
 			}
 
-			if(targetViews.isEmpty()) {
-				if(dropContainerElement.eContents().contains(target)) {
+			if (targetViews.isEmpty()) {
+				if (dropContainerElement.eContents().contains(target)) {
 					ICommand dropTargetCommand = getDefaultDropNodeCommand(registry.getNodeGraphicalType(target, dropContainerView.getType()), absoluteLocation.getCopy(), target);
 					CompositeCommand.compose(createEndViewsCommand, dropTargetCommand);
-					targetViewAdapter = (IAdaptable)dropTargetCommand.getCommandResult().getReturnValue();
+					targetViewAdapter = (IAdaptable) dropTargetCommand.getCommandResult().getReturnValue();
 				} else {
 					return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
 				}
@@ -291,12 +291,12 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 		}
 
 		// Create source adapter
-		if(!sourceViews.isEmpty()) { // sourceViewAdapter should still be null in this case
+		if (!sourceViews.isEmpty()) { // sourceViewAdapter should still be null in this case
 			sourceViewAdapter = new SemanticAdapter(null, sourceViews.toArray()[0]);
 		}
 
 		// Create target adapter
-		if(!targetViews.isEmpty()) { // targetViewAdapter should still be null in this case
+		if (!targetViews.isEmpty()) { // targetViewAdapter should still be null in this case
 			targetViewAdapter = new SemanticAdapter(null, targetViews.toArray()[0]);
 		}
 
@@ -305,7 +305,8 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 
 		CreateConnectionViewRequest.ConnectionViewDescriptor linkdescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(droppedObjectAdapter, droppedEdgeType, getDiagramPreferencesHint());
 
-		CommonDeferredCreateConnectionViewCommand createConnectionViewCommand = new CommonDeferredCreateConnectionViewCommand(getEditingDomain(), droppedEdgeType, sourceViewAdapter, targetViewAdapter, getViewer(), getDiagramPreferencesHint(), linkdescriptor, null);
+		CommonDeferredCreateConnectionViewCommand createConnectionViewCommand = new CommonDeferredCreateConnectionViewCommand(getEditingDomain(), droppedEdgeType, sourceViewAdapter, targetViewAdapter, getViewer(), getDiagramPreferencesHint(), linkdescriptor,
+				null);
 		createConnectionViewCommand.setElement(droppedObject);
 
 		CompositeCommand.compose(completeDropCommand, createConnectionViewCommand);
@@ -344,39 +345,39 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 	}
 
 	protected EditPartViewer getViewer() {
-		return ((IGraphicalEditPart)getHost()).getViewer();
+		return ((IGraphicalEditPart) getHost()).getViewer();
 	}
 
 	protected TransactionalEditingDomain getEditingDomain() {
-		return ((IGraphicalEditPart)getHost()).getEditingDomain();
+		return ((IGraphicalEditPart) getHost()).getEditingDomain();
 	}
 
 	protected PreferencesHint getDiagramPreferencesHint() {
-		return ((IGraphicalEditPart)getHost()).getDiagramPreferencesHint();
+		return ((IGraphicalEditPart) getHost()).getDiagramPreferencesHint();
 	}
 
 	/**
 	 * This methods looks for views representing a given EObject in the host diagram.
-	 * 
+	 *
 	 * @param eObject
-	 *        the {@link EObject} to look for.
+	 *            the {@link EObject} to look for.
 	 * @return the list of {@link View} representing the eObject.
 	 */
 	private Set<View> getViews(EObject eObject) {
 		Set<View> views = new HashSet<View>();
 
 		// Retrieve host diagram
-		View hostView = ((IGraphicalEditPart)getHost()).getNotationView();
+		View hostView = ((IGraphicalEditPart) getHost()).getNotationView();
 		View hostDiagram = (hostView instanceof Diagram) ? hostView : hostView.getDiagram();
 
 		// Retrieve all views for the eObject
-		Collection<View> relatedViews =  CrossReferencerUtil.getCrossReferencingViews(eObject, hostDiagram.getType());
-		
-		// Parse and select views from host diagram only	
+		Collection<View> relatedViews = CrossReferencerUtil.getCrossReferencingViews(eObject, hostDiagram.getType());
+
+		// Parse and select views from host diagram only
 		Iterator<View> it = relatedViews.iterator();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			View currentView = it.next();
-			if(!(currentView instanceof Diagram) && (currentView.getDiagram() == hostDiagram)) {
+			if (!(currentView instanceof Diagram) && (currentView.getDiagram() == hostDiagram)) {
 				views.add(currentView);
 			}
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CompartmentSemanticEditPolicy.java
index fd4c6e3d220..43e3c75de41 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CompartmentSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -22,10 +22,11 @@ import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 
 public class CompartmentSemanticEditPolicy extends DefaultSemanticEditPolicy {
 
+	@Override
 	protected Command getCreateCommand(CreateElementRequest req) {
 
 		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(req.getContainer());
-		if(commandService == null) {
+		if (commandService == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -33,7 +34,7 @@ public class CompartmentSemanticEditPolicy extends DefaultSemanticEditPolicy {
 		createRequest.addParameters(req.getParameters());
 		Command semanticCreateCommand = new ICommandProxy(commandService.getEditCommand(createRequest));
 
-		if((semanticCreateCommand != null) && (semanticCreateCommand.canExecute())) {
+		if ((semanticCreateCommand != null) && (semanticCreateCommand.canExecute())) {
 			return semanticCreateCommand;
 		} // else
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultContainerNodeEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultContainerNodeEditPolicy.java
index 68e68028613..663d811f22b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultContainerNodeEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultContainerNodeEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -46,24 +46,25 @@ public class DefaultContainerNodeEditPolicy extends ContainerNodeEditPolicy {
 	 */
 	@Override
 	protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
-		if (!(request instanceof CreateConnectionViewRequest))
+		if (!(request instanceof CreateConnectionViewRequest)) {
 			return null;
+		}
 		CreateConnectionViewRequest req = (CreateConnectionViewRequest) request;
 		CompositeCommand cc = new CompositeCommand(
-			DiagramUIMessages.Commands_CreateCommand_Connection_Label);
-		Diagram diagramView = ((View)getHost().getModel())
+				DiagramUIMessages.Commands_CreateCommand_Connection_Label);
+		Diagram diagramView = ((View) getHost().getModel())
 				.getDiagram();
-        
+
 		// TransactionalEditingDomain editingDomain = getEditingDomain();
 		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-        CreateCommand createCommand = new CreateViewCommand(editingDomain, req
+		CreateCommand createCommand = new CreateViewCommand(editingDomain, req
 				.getConnectionViewDescriptor(), diagramView.getDiagram());
-        //
+		//
 		setViewAdapter((IAdaptable) createCommand.getCommandResult()
 				.getReturnValue());
-        
-        
-        SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK);
+
+
+		SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK);
 		sceCommand.setEdgeAdaptor(getViewAdapter());
 		sceCommand.setNewSourceAdaptor(new EObjectAdapter(getView()));
 		ConnectionAnchor sourceAnchor = getConnectableEditPart()
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultCreationEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultCreationEditPolicy.java
index 0e65f571fb5..fc7cce3f9e0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultCreationEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultCreationEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -47,35 +47,35 @@ public class DefaultCreationEditPolicy extends CreationEditPolicy {
 	 */
 	@Override
 	protected Command getReparentCommand(ChangeBoundsRequest request) {
-		//the behavior has been changed in order to allow the move of element 
-		//that are not attached to a semantic element
+		// the behavior has been changed in order to allow the move of element
+		// that are not attached to a semantic element
 		// so it Forbid re-parent in this edit policy (to be used by compartment)
 		// in order to avoid node attached to semantic to be moved in compartments.
 		@SuppressWarnings("rawtypes")
 		Iterator editParts = request.getEditParts().iterator();
-        CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);
-		while ( editParts.hasNext() ) {
-			EditPart ep = (EditPart)editParts.next();
-			if ( ep instanceof LabelEditPart ) {
+		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);
+		while (editParts.hasNext()) {
+			EditPart ep = (EditPart) editParts.next();
+			if (ep instanceof LabelEditPart) {
 				continue;
-			}		
-			View view = (View)ep.getAdapter(View.class);
-			if ( view == null ) {
+			}
+			View view = (View) ep.getAdapter(View.class);
+			if (view == null) {
 				continue;
 			}
-			
+
 			EObject semantic = ViewUtil.resolveSemanticElement(view);
-			if ( semantic == null ) {
-				cc.compose(getReparentViewCommand((IGraphicalEditPart)ep));
+			if (semantic == null) {
+				cc.compose(getReparentViewCommand((IGraphicalEditPart) ep));
 			}
-			else{
+			else {
 				return UnexecutableCommand.INSTANCE;
 			}
-			
+
 		}
 		return cc.isEmpty() ? null : new ICommandProxy(cc.reduce());
-		
-		
+
+
 	}
 
 	/**
@@ -86,24 +86,24 @@ public class DefaultCreationEditPolicy extends CreationEditPolicy {
 
 		// This overrides getCreatCommand in order to use a specific CreateViewCommand (instead of
 		// org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand.
-		
+
 		// The original CreateCommand#canExecute() implementation rely on ViewProvider#provides(CreateViewForKindOperation op)
 		// method to know if a view can be created. The problem is that this method is incorrectly generated by GMF Tooling and should be avoided.
-		
+
 		// CreateViewCommand replace the semantic adapter in its call to ViewService to know if a provider exists.
-		
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-        CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);
-        
-        Iterator<? extends ViewDescriptor> descriptors = request.getViewDescriptors().iterator();
+
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
+		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);
+
+		Iterator<? extends ViewDescriptor> descriptors = request.getViewDescriptors().iterator();
 		while (descriptors.hasNext()) {
-			
-			CreateViewRequest.ViewDescriptor descriptor = (CreateViewRequest.ViewDescriptor)descriptors.next();
-			CreateCommand createCommand = new CreateViewCommand(editingDomain, descriptor, (View)(getHost().getModel()));
+
+			CreateViewRequest.ViewDescriptor descriptor = descriptors.next();
+			CreateCommand createCommand = new CreateViewCommand(editingDomain, descriptor, (View) (getHost().getModel()));
 			cc.compose(createCommand);
-			
+
 		}
-		
+
 		return new ICommandProxy(cc.reduce());
 
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultGraphicalNodeEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultGraphicalNodeEditPolicy.java
index dc711eaab88..4d2d2928481 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultGraphicalNodeEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultGraphicalNodeEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -67,32 +67,32 @@ public class DefaultGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
 
 		// Add parameter (source and target view to the CreateRelationshipRequest
 		CreateElementRequestAdapter requestAdapter = request.getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
-		CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest)requestAdapter.getAdapter(CreateRelationshipRequest.class);
+		CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class);
 
-		View sourceView = (View)request.getSourceEditPart().getModel();
+		View sourceView = (View) request.getSourceEditPart().getModel();
 		createElementRequest.setParameter(RequestParameterConstants.EDGE_CREATE_REQUEST_SOURCE_VIEW, sourceView);
 
-		View targetView = (View)request.getTargetEditPart().getModel();
+		View targetView = (View) request.getTargetEditPart().getModel();
 		createElementRequest.setParameter(RequestParameterConstants.EDGE_CREATE_REQUEST_TARGET_VIEW, targetView);
 		createElementRequest.setParameter(RequestParameterConstants.EDGE_TARGET_POINT, request.getLocation());
 
-		//see bug 430702: [Diagram] Moving source of a link moves the target too, we need to store in the parameters : 
-		//- the source point
-		//- the target point
-		//- the source figure
-		//- the target figure
+		// see bug 430702: [Diagram] Moving source of a link moves the target too, we need to store in the parameters :
+		// - the source point
+		// - the target point
+		// - the source figure
+		// - the target figure
 		final EditPart sourceEP = request.getSourceEditPart();
-		if(sourceEP instanceof GraphicalEditPart) {
-			createElementRequest.setParameter(RequestParameterConstants.EDGE_SOURCE_FIGURE, ((GraphicalEditPart)sourceEP).getFigure());
+		if (sourceEP instanceof GraphicalEditPart) {
+			createElementRequest.setParameter(RequestParameterConstants.EDGE_SOURCE_FIGURE, ((GraphicalEditPart) sourceEP).getFigure());
 		}
 		final EditPart targetEP = request.getTargetEditPart();
-		if(targetEP instanceof GraphicalEditPart) {
-			createElementRequest.setParameter(RequestParameterConstants.EDGE_TARGET_FIGURE, ((GraphicalEditPart)targetEP).getFigure());
+		if (targetEP instanceof GraphicalEditPart) {
+			createElementRequest.setParameter(RequestParameterConstants.EDGE_TARGET_FIGURE, ((GraphicalEditPart) targetEP).getFigure());
 		}
 
-		final TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
+		final TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
 		final Command defaultCommand = super.getConnectionAndRelationshipCompleteCommand(request);
-		if(defaultCommand != null && defaultCommand.canExecute()) {
+		if (defaultCommand != null && defaultCommand.canExecute()) {
 			final CompoundCommand cc = new CompoundCommand("ConnectionAndRelationshipCompleteCommand");//$NON-NLS-1$
 			cc.add(defaultCommand);
 			final ICommand fixAnchor = new FixEdgeAnchorAfterCreationCommand(editingDomain, request);
@@ -108,23 +108,24 @@ public class DefaultGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
 	@SuppressWarnings("restriction")
 	@Override
 	protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
-		if(!(request instanceof CreateConnectionViewRequest))
+		if (!(request instanceof CreateConnectionViewRequest)) {
 			return null;
-		CreateConnectionViewRequest req = (CreateConnectionViewRequest)request;
+		}
+		CreateConnectionViewRequest req = (CreateConnectionViewRequest) request;
 		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.Commands_CreateCommand_Connection_Label);
-		Diagram diagramView = ((View)getHost().getModel()).getDiagram();
+		Diagram diagramView = ((View) getHost().getModel()).getDiagram();
 
 		// TransactionalEditingDomain editingDomain = getEditingDomain();
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
 		CreateCommand createCommand = new CreateViewCommand(editingDomain, req.getConnectionViewDescriptor(), diagramView.getDiagram());
 		//
-		setViewAdapter((IAdaptable)createCommand.getCommandResult().getReturnValue());
-		
-		//see bug 430702: [Diagram] Moving source of a link moves the target too, we need to store the source point to fix this bug.
+		setViewAdapter((IAdaptable) createCommand.getCommandResult().getReturnValue());
+
+		// see bug 430702: [Diagram] Moving source of a link moves the target too, we need to store the source point to fix this bug.
 		@SuppressWarnings("unchecked")
-		Map<Object,Object> parameters = req.getExtendedData();
+		Map<Object, Object> parameters = req.getExtendedData();
 		parameters.put(RequestParameterConstants.EDGE_SOURCE_POINT, request.getLocation());
-		
+
 		SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK);
 		sceCommand.setEdgeAdaptor(getViewAdapter());
 		sceCommand.setNewSourceAdaptor(new EObjectAdapter(getView()));
@@ -144,40 +145,40 @@ public class DefaultGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
 	}
 
 	/**
-	 * 
+	 *
 	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy#getReconnectSourceCommand(org.eclipse.gef.requests.ReconnectRequest)
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */
 	@Override
 	protected Command getReconnectSourceCommand(final ReconnectRequest request) {
 		final Command reconnectCmd = super.getReconnectSourceCommand(request);
-		if(reconnectCmd != null && reconnectCmd.canExecute()) {
+		if (reconnectCmd != null && reconnectCmd.canExecute()) {
 			final CompoundCommand cc = new CompoundCommand();
 			cc.add(reconnectCmd);
-			//see bug 430702: [Diagram] Moving source of a link moves the target too.
-			cc.add(new ICommandProxy(new FixEdgeAnchorsDeferredCommand(getEditingDomain(), (IGraphicalEditPart)getHost(), Collections.singleton(request.getConnectionEditPart()))));
+			// see bug 430702: [Diagram] Moving source of a link moves the target too.
+			cc.add(new ICommandProxy(new FixEdgeAnchorsDeferredCommand(getEditingDomain(), (IGraphicalEditPart) getHost(), Collections.singleton(request.getConnectionEditPart()))));
 			return cc;
 		}
 		return reconnectCmd;
 	}
 
 	/**
-	 * 
+	 *
 	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy#getReconnectTargetCommand(org.eclipse.gef.requests.ReconnectRequest)
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */
 	@Override
 	protected Command getReconnectTargetCommand(ReconnectRequest request) {
 		final Command reconnectCmd = super.getReconnectTargetCommand(request);
-		if(reconnectCmd != null && reconnectCmd.canExecute()) {
+		if (reconnectCmd != null && reconnectCmd.canExecute()) {
 			final CompoundCommand cc = new CompoundCommand();
 			cc.add(reconnectCmd);
-			//see bug 430702: [Diagram] Moving source of a link moves the target too.
-			cc.add(new ICommandProxy(new FixEdgeAnchorsDeferredCommand(getEditingDomain(), (IGraphicalEditPart)getHost(), Collections.singleton(request.getConnectionEditPart()))));
+			// see bug 430702: [Diagram] Moving source of a link moves the target too.
+			cc.add(new ICommandProxy(new FixEdgeAnchorsDeferredCommand(getEditingDomain(), (IGraphicalEditPart) getHost(), Collections.singleton(request.getConnectionEditPart()))));
 			return cc;
 		}
 		return reconnectCmd;
@@ -186,7 +187,7 @@ public class DefaultGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
 
 
 	/**
-	 * 
+	 *
 	 * @return
 	 *         the editing domain to use
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSemanticEditPolicy.java
index 2cd79d07ac7..2a7169a82f2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
 
 /**
  * This class has been moved in infra.gmfdiag.common framework. Keeping it here for compatibility
+ * 
  * @deprecated
  * @use {@link org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy}
  */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSnapBackEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSnapBackEditPolicy.java
index 7d8cdbb4b64..a80e4dd0007 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSnapBackEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSnapBackEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -49,10 +49,11 @@ public class DefaultSnapBackEditPolicy extends GraphicalNodeEditPolicy {
 
 	/**
 	 * Understands RequestConstants.REQ_SNAP_BACK request types
-	 * 
+	 *
 	 * @param request
 	 * @return boolean
 	 */
+	@Override
 	public boolean understandsRequest(Request request) {
 		return RequestConstants.REQ_SNAP_BACK.equals(request.getType());
 	}
@@ -60,24 +61,26 @@ public class DefaultSnapBackEditPolicy extends GraphicalNodeEditPolicy {
 	/**
 	 * Returns a <code>Command</code> which sets the label's offset to its
 	 * original position.
-	 * 
+	 *
 	 * @param request
-	 *        the request
+	 *            the request
 	 * @return the command
 	 */
+	@Override
 	public Command getCommand(Request request) {
-		if(RequestConstants.REQ_SNAP_BACK.equals(request.getType())) {
-			View view = (View)getHost().getModel();
+		if (RequestConstants.REQ_SNAP_BACK.equals(request.getType())) {
+			View view = (View) getHost().getModel();
 
-			// YT - Use a snap back hint that takes into account the diagram 
+			// YT - Use a snap back hint that takes into account the diagram
 			// and parent view type.
 			String hint = getSnapBackHint(view);
 
 			Point offset = LabelEditPart.getSnapBackPosition(hint);
-			if(offset == null)
+			if (offset == null) {
 				return null;
+			}
 
-			TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
+			TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
 
 			ICommand moveCommand = new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, new EObjectAdapter(view), offset);
 			return new ICommandProxy(moveCommand);
@@ -85,17 +88,19 @@ public class DefaultSnapBackEditPolicy extends GraphicalNodeEditPolicy {
 		return null;
 	}
 
+	@Override
 	public EditPart getTargetEditPart(Request request) {
-		if(understandsRequest(request))
+		if (understandsRequest(request)) {
 			return getHost();
+		}
 		return super.getTargetEditPart(request);
 	}
 
 	/**
 	 * Get the snap back hint for the view.
-	 * 
+	 *
 	 * @param view
-	 *        the view to snap back.
+	 *            the view to snap back.
 	 * @return the snap back hint.
 	 */
 	private String getSnapBackHint(View view) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java
index 9f4e08a5090..30aafed5da7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -43,37 +43,38 @@ public class DefaultXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEdi
 	/**
 	 * Called in response to a <tt>REQ_CREATE</tt> request. Returns a command
 	 * to set each created element bounds and auto-size properties.
-	 * 
+	 *
 	 * @param request
-	 *        a create request (understands instances of {@link CreateViewRequest}).
+	 *            a create request (understands instances of {@link CreateViewRequest}).
 	 * @return a command to satisfy the request; <tt>null</tt> if the request is not
 	 *         understood.
 	 */
+	@Override
 	protected Command getCreateCommand(CreateRequest request) {
-		CreateViewRequest req = (CreateViewRequest)request;
+		CreateViewRequest req = (CreateViewRequest) request;
 
 
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
 
 		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);
 		Iterator<?> iter = req.getViewDescriptors().iterator();
-		final Rectangle BOUNDS = (Rectangle)getConstraintFor(request);
+		final Rectangle BOUNDS = (Rectangle) getConstraintFor(request);
 		boolean couldBeSnaped = request.getLocation().equals(LayoutHelper.UNDEFINED.getLocation()) && req.isSnapToEnabled();
-		while(iter.hasNext()) {
-			CreateViewRequest.ViewDescriptor viewDescriptor = (CreateViewRequest.ViewDescriptor)iter.next();
+		while (iter.hasNext()) {
+			CreateViewRequest.ViewDescriptor viewDescriptor = (CreateViewRequest.ViewDescriptor) iter.next();
 			Rectangle rect = getBoundsOffest(req, BOUNDS, viewDescriptor);
 
-			//see bug 427129: Figures newly created via the palette should be snapped to grid if "snap to grid" is activated
-			if(couldBeSnaped) {
-				//this code fix the bug in some case...
+			// see bug 427129: Figures newly created via the palette should be snapped to grid if "snap to grid" is activated
+			if (couldBeSnaped) {
+				// this code fix the bug in some case...
 				int add = 0;
-				DiagramRootEditPart drep = (DiagramRootEditPart)getHost().getRoot();
+				DiagramRootEditPart drep = (DiagramRootEditPart) getHost().getRoot();
 				double spacing = drep.getGridSpacing();
 				final double max_value = spacing * 20;
-				final SnapToHelper helper = (SnapToHelper)getHost().getAdapter(SnapToHelper.class);
-				if(helper != null) {
+				final SnapToHelper helper = (SnapToHelper) getHost().getAdapter(SnapToHelper.class);
+				if (helper != null) {
 					final LayoutHelper layoutHelper = new LayoutHelper();
-					while(add < max_value) {//we define a max value to do test
+					while (add < max_value) {// we define a max value to do test
 						Rectangle LOCAL_BOUNDS = BOUNDS.getCopy();
 						LOCAL_BOUNDS.translate(add, add);
 						Rectangle tmp_rect = getBoundsOffest(req, LOCAL_BOUNDS, viewDescriptor);
@@ -83,8 +84,8 @@ public class DefaultXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEdi
 						PrecisionPoint res1 = new PrecisionPoint(tmp_rect.getLocation());
 						helper.snapPoint(request, PositionConstants.NORTH_WEST, res1.getPreciseCopy(), res1);
 						final Point pt = layoutHelper.validatePosition(getHostFigure(), resultRect.setLocation(res1));
-						if(couldBeSnaped) {
-							if(pt.equals(resultRect.getLocation())) {
+						if (couldBeSnaped) {
+							if (pt.equals(resultRect.getLocation())) {
 								rect.setLocation(resultRect.getLocation());
 								break;
 							} else {
@@ -95,7 +96,7 @@ public class DefaultXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEdi
 					}
 				}
 			}
-			if(rect.getSize().isEmpty()) {
+			if (rect.getSize().isEmpty()) {
 				// Only set location and let the ViewFactory deal with dimension.
 				cc.compose(new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, viewDescriptor, rect.getLocation().getCopy()));
 
@@ -107,7 +108,7 @@ public class DefaultXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEdi
 
 		}
 
-		if(cc.reduce() == null) {
+		if (cc.reduce() == null) {
 			return null;
 		}
 		return chainGuideAttachmentCommands(request, new ICommandProxy(cc.reduce()));
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ExternalLabelPrimaryDragRoleEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ExternalLabelPrimaryDragRoleEditPolicy.java
index 0a37dafeb78..108eeff46c1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ExternalLabelPrimaryDragRoleEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ExternalLabelPrimaryDragRoleEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -44,7 +44,7 @@ public class ExternalLabelPrimaryDragRoleEditPolicy extends NonResizableLabelEdi
 	 */
 	@Override
 	protected List createSelectionHandles() {
-		MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());
+		MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
 		mh.setBorder(null);
 		return Collections.singletonList(mh);
 	}
@@ -54,7 +54,7 @@ public class ExternalLabelPrimaryDragRoleEditPolicy extends NonResizableLabelEdi
 	 */
 	@Override
 	protected Command getMoveCommand(ChangeBoundsRequest request) {
-		LabelEditPart editPart = (LabelEditPart)getHost();
+		LabelEditPart editPart = (LabelEditPart) getHost();
 
 		// FeedBack - Parent + Delta
 		Rectangle updatedRect = new Rectangle();
@@ -69,7 +69,7 @@ public class ExternalLabelPrimaryDragRoleEditPolicy extends NonResizableLabelEdi
 		rect.resize(request.getSizeDelta());
 		getHostFigure().translateToRelative(rect);
 
-		ICommand moveCommand = new SetBoundsCommand(editPart.getEditingDomain(), DiagramUIMessages.MoveLabelCommand_Label_Location, new EObjectAdapter((View)editPart.getModel()), updatedRect);
+		ICommand moveCommand = new SetBoundsCommand(editPart.getEditingDomain(), DiagramUIMessages.MoveLabelCommand_Label_Location, new EObjectAdapter((View) editPart.getModel()), updatedRect);
 		return new ICommandProxy(moveCommand);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ILinkMappingHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ILinkMappingHelper.java
index 17e513b3573..445f0452530 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ILinkMappingHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ILinkMappingHelper.java
@@ -7,37 +7,33 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
 
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * Interface to map links at semantic level.
  */
 @Deprecated
-public interface ILinkMappingHelper extends org.eclipse.papyrus.uml.diagram.common.helper.ILinkMappingHelper{
+public interface ILinkMappingHelper extends org.eclipse.papyrus.uml.diagram.common.helper.ILinkMappingHelper {
 
-//	/**
-//	 * Get the sources.
-//	 * 
-//	 * @param link
-//	 *        the link.
-//	 * @return the sources.
-//	 */
-//	public Collection<?> getSource(EObject link);
-//
-//	/**
-//	 * Get the targets.
-//	 * 
-//	 * @param link
-//	 *        the link.
-//	 * @return the targets.
-//	 */
-//	public Collection<?> getTarget(EObject link);
+	// /**
+	// * Get the sources.
+	// *
+	// * @param link
+	// * the link.
+	// * @return the sources.
+	// */
+	// public Collection<?> getSource(EObject link);
+	//
+	// /**
+	// * Get the targets.
+	// *
+	// * @param link
+	// * the link.
+	// * @return the targets.
+	// */
+	// public Collection<?> getTarget(EObject link);
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDefaultSemanticEditPolicy.java
index 93581d4b237..6eb3aa4a337 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDefaultSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDefaultSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,7 +36,7 @@ public class LabelDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {
 		return super.getDestroyElementCommand(req);
 	}
-	
+
 	@Override
 	protected Command getConfigureCommand(ConfigureRequest req) {
 		return UnexecutableCommand.INSTANCE;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDirectEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDirectEditPolicy.java
index a441c171db2..82987b7820e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDirectEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDirectEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.gmf.diagram.common.edit.part.ITextAwareEditPart;
  * Overrides {@link org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy} in
  * order to pass parser options to the method that returns the modification command.
  * (always pass 0 - ParserOptions.NONE in the original class).
- * 
+ *
  * Also this uses (or tries to) the EObject given by {@link org.eclipse.papyrus.gmf.diagram.common.edit.part.ITextAwareEditPart#getParserElement()} to
  * get the edit command instead of using the EObject associated to the edited edit part.
  */
@@ -43,23 +43,25 @@ public class LabelDirectEditPolicy extends org.eclipse.gmf.runtime.diagram.ui.ed
 
 		/**
 		 * constructor
-		 * 
+		 *
 		 * @param element
-		 *        element to be wrapped
+		 *            element to be wrapped
 		 * @param view
-		 *        view to be wrapped
+		 *            view to be wrapped
 		 */
 		public EObjectAdapterEx(EObject element, View view) {
 			super(element);
 			this.view = view;
 		}
 
+		@Override
 		@SuppressWarnings("rawtypes")
 		public Object getAdapter(Class adapter) {
 			Object o = super.getAdapter(adapter);
-			if(o != null)
+			if (o != null) {
 				return o;
-			if(adapter.equals(View.class)) {
+			}
+			if (adapter.equals(View.class)) {
 				return view;
 			}
 			return null;
@@ -69,37 +71,40 @@ public class LabelDirectEditPolicy extends org.eclipse.gmf.runtime.diagram.ui.ed
 	/**
 	 * @see DirectEditPolicy#getDirectEditCommand(DirectEditRequest)
 	 */
+	@Override
 	protected Command getDirectEditCommand(DirectEditRequest edit) {
-		if(edit.getCellEditor() instanceof TextCellEditorEx)
-			if(!((TextCellEditorEx)edit.getCellEditor()).hasValueChanged())
+		if (edit.getCellEditor() instanceof TextCellEditorEx) {
+			if (!((TextCellEditorEx) edit.getCellEditor()).hasValueChanged()) {
 				return null;
+			}
+		}
 
-		String labelText = (String)edit.getCellEditor().getValue();
+		String labelText = (String) edit.getCellEditor().getValue();
 
-		//for CellEditor, null is always returned for invalid values
-		if(labelText == null) {
+		// for CellEditor, null is always returned for invalid values
+		if (labelText == null) {
 			return null;
 		}
 
 		// Papyrus - using org.eclipse.papyrus.gmf.diagram.common.edit.part.ITextAwareEditPart here
-		ITextAwareEditPart compartment = (ITextAwareEditPart)getHost();
+		ITextAwareEditPart compartment = (ITextAwareEditPart) getHost();
 		EObjectAdapter elementAdapter = new EObjectAdapterEx(compartment.getParserElement(), null);
 		//
 
 		// Papyrus - elementAdapter created with compartment.getParserElement(), no need to use the view here.
-		//		EObject model = (EObject)compartment.getModel();
-		//		EObjectAdapter elementAdapter = null;
-		//		if(model instanceof View) {
-		//			View view = (View)model;
-		//			elementAdapter = new EObjectAdapterEx(ViewUtil.resolveSemanticElement(view), view);
-		//		} else
-		//			elementAdapter = new EObjectAdapterEx(model, null);
+		// EObject model = (EObject)compartment.getModel();
+		// EObjectAdapter elementAdapter = null;
+		// if(model instanceof View) {
+		// View view = (View)model;
+		// elementAdapter = new EObjectAdapterEx(ViewUtil.resolveSemanticElement(view), view);
+		// } else
+		// elementAdapter = new EObjectAdapterEx(model, null);
 
 		// check to make sure an edit has occurred before returning a command.
 		String prevText = compartment.getParser().getEditString(elementAdapter, compartment.getParserOptions().intValue());
-		if(!prevText.equals(labelText)) {
+		if (!prevText.equals(labelText)) {
 			ICommand iCommand = compartment.getParser().getParseCommand(elementAdapter, labelText, compartment.getParserOptions().intValue());
-			// Papyrus - use parser options to build command 
+			// Papyrus - use parser options to build command
 			// compartment.getParser().getParseCommand(elementAdapter, labelText, 0);
 			return new ICommandProxy(iCommand);
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LinkLabelDragEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LinkLabelDragEditPolicy.java
index 4388650ac3b..76833fcc528 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LinkLabelDragEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LinkLabelDragEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -32,7 +32,7 @@ public class LinkLabelDragEditPolicy extends NonResizableLabelEditPolicy {
 	@Override
 	@SuppressWarnings("rawtypes")
 	protected List createSelectionHandles() {
-		MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());
+		MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
 		mh.setBorder(null);
 		return Collections.singletonList(mh);
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextNonResizableEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextNonResizableEditPolicy.java
index 9ea6c944bac..766f156d554 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextNonResizableEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextNonResizableEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -46,9 +46,9 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	 */
 	@Override
 	protected void showPrimarySelection() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setSelected(true);
-			((WrappingLabel)getHostFigure()).setFocus(true);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setSelected(true);
+			((WrappingLabel) getHostFigure()).setFocus(true);
 		} else {
 			showSelection();
 			showFocus();
@@ -60,9 +60,9 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	 */
 	@Override
 	protected void showSelection() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setSelected(true);
-			((WrappingLabel)getHostFigure()).setFocus(false);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setSelected(true);
+			((WrappingLabel) getHostFigure()).setFocus(false);
 		} else {
 			hideSelection();
 			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
@@ -77,11 +77,11 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	 */
 	@Override
 	protected void hideSelection() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setSelected(false);
-			((WrappingLabel)getHostFigure()).setFocus(false);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setSelected(false);
+			((WrappingLabel) getHostFigure()).setFocus(false);
 		} else {
-			if(selectionFeedbackFigure != null) {
+			if (selectionFeedbackFigure != null) {
 				removeFeedback(selectionFeedbackFigure);
 				getHostFigure().removeFigureListener(getHostPositionListener());
 				selectionFeedbackFigure = null;
@@ -95,8 +95,8 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	 */
 	@Override
 	protected void showFocus() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setFocus(true);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setFocus(true);
 		} else {
 			hideFocus();
 			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
@@ -109,10 +109,10 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	 */
 	@Override
 	protected void hideFocus() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setFocus(false);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setFocus(false);
 		} else {
-			if(focusFeedbackFigure != null) {
+			if (focusFeedbackFigure != null) {
 				removeFeedback(focusFeedbackFigure);
 				focusFeedbackFigure = null;
 			}
@@ -121,8 +121,8 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 
 	protected Rectangle getFeedbackBounds() {
 		Rectangle bounds;
-		if(getHostFigure() instanceof Label) {
-			bounds = ((Label)getHostFigure()).getTextBounds();
+		if (getHostFigure() instanceof Label) {
+			bounds = ((Label) getHostFigure()).getTextBounds();
 			bounds.intersect(getHostFigure().getBounds());
 		} else {
 			bounds = getHostFigure().getBounds().getCopy();
@@ -133,7 +133,7 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	}
 
 	protected IFigure createSelectionFeedbackFigure() {
-		if(getHostFigure() instanceof Label) {
+		if (getHostFigure() instanceof Label) {
 			Label feedbackFigure = new Label();
 			feedbackFigure.setOpaque(true);
 			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);
@@ -149,6 +149,7 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	protected IFigure createFocusFeedbackFigure() {
 		return new Figure() {
 
+			@Override
 			protected void paintFigure(Graphics graphics) {
 				graphics.drawFocus(getBounds().getResized(-1, -1));
 			}
@@ -156,16 +157,16 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	}
 
 	protected void updateLabel(Label target) {
-		Label source = (Label)getHostFigure();
+		Label source = (Label) getHostFigure();
 		target.setText(source.getText());
 		target.setTextAlignment(source.getTextAlignment());
 		target.setFont(source.getFont());
 	}
 
 	protected void refreshSelectionFeedback() {
-		if(selectionFeedbackFigure != null) {
-			if(selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label)selectionFeedbackFigure);
+		if (selectionFeedbackFigure != null) {
+			if (selectionFeedbackFigure instanceof Label) {
+				updateLabel((Label) selectionFeedbackFigure);
 				selectionFeedbackFigure.setBounds(getFeedbackBounds());
 			} else {
 				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));
@@ -174,7 +175,7 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	}
 
 	protected void refreshFocusFeedback() {
-		if(focusFeedbackFigure != null) {
+		if (focusFeedbackFigure != null) {
 			focusFeedbackFigure.setBounds(getFeedbackBounds());
 		}
 	}
@@ -185,9 +186,10 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	}
 
 	private FigureListener getHostPositionListener() {
-		if(hostPositionListener == null) {
+		if (hostPositionListener == null) {
 			hostPositionListener = new FigureListener() {
 
+				@Override
 				public void figureMoved(IFigure source) {
 					refreshFeedback();
 				}
@@ -201,7 +203,7 @@ public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
 	 */
 	@Override
 	protected List createSelectionHandles() {
-		MoveHandle moveHandle = new MoveHandle((GraphicalEditPart)getHost());
+		MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost());
 		moveHandle.setBorder(null);
 		moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));
 		return Collections.singletonList(moveHandle);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextSelectionEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextSelectionEditPolicy.java
index 01392a52ad8..9952e69dac6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextSelectionEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextSelectionEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -40,9 +40,9 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	 */
 	@Override
 	protected void showPrimarySelection() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setSelected(true);
-			((WrappingLabel)getHostFigure()).setFocus(true);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setSelected(true);
+			((WrappingLabel) getHostFigure()).setFocus(true);
 		} else {
 			showSelection();
 			showFocus();
@@ -54,9 +54,9 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	 */
 	@Override
 	protected void showSelection() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setSelected(true);
-			((WrappingLabel)getHostFigure()).setFocus(false);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setSelected(true);
+			((WrappingLabel) getHostFigure()).setFocus(false);
 		} else {
 			hideSelection();
 			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
@@ -71,11 +71,11 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	 */
 	@Override
 	protected void hideSelection() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setSelected(false);
-			((WrappingLabel)getHostFigure()).setFocus(false);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setSelected(false);
+			((WrappingLabel) getHostFigure()).setFocus(false);
 		} else {
-			if(selectionFeedbackFigure != null) {
+			if (selectionFeedbackFigure != null) {
 				removeFeedback(selectionFeedbackFigure);
 				getHostFigure().removeFigureListener(getHostPositionListener());
 				selectionFeedbackFigure = null;
@@ -89,8 +89,8 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	 */
 	@Override
 	protected void showFocus() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setFocus(true);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setFocus(true);
 		} else {
 			hideFocus();
 			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
@@ -103,10 +103,10 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	 */
 	@Override
 	protected void hideFocus() {
-		if(getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getHostFigure()).setFocus(false);
+		if (getHostFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getHostFigure()).setFocus(false);
 		} else {
-			if(focusFeedbackFigure != null) {
+			if (focusFeedbackFigure != null) {
 				removeFeedback(focusFeedbackFigure);
 				focusFeedbackFigure = null;
 			}
@@ -115,8 +115,8 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 
 	protected Rectangle getFeedbackBounds() {
 		Rectangle bounds;
-		if(getHostFigure() instanceof Label) {
-			bounds = ((Label)getHostFigure()).getTextBounds();
+		if (getHostFigure() instanceof Label) {
+			bounds = ((Label) getHostFigure()).getTextBounds();
 			bounds.intersect(getHostFigure().getBounds());
 		} else {
 			bounds = getHostFigure().getBounds().getCopy();
@@ -127,7 +127,7 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	}
 
 	protected IFigure createSelectionFeedbackFigure() {
-		if(getHostFigure() instanceof Label) {
+		if (getHostFigure() instanceof Label) {
 			Label feedbackFigure = new Label();
 			feedbackFigure.setOpaque(true);
 			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);
@@ -143,6 +143,7 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	protected IFigure createFocusFeedbackFigure() {
 		return new Figure() {
 
+			@Override
 			protected void paintFigure(Graphics graphics) {
 				graphics.drawFocus(getBounds().getResized(-1, -1));
 			}
@@ -150,16 +151,16 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	}
 
 	protected void updateLabel(Label target) {
-		Label source = (Label)getHostFigure();
+		Label source = (Label) getHostFigure();
 		target.setText(source.getText());
 		target.setTextAlignment(source.getTextAlignment());
 		target.setFont(source.getFont());
 	}
 
 	protected void refreshSelectionFeedback() {
-		if(selectionFeedbackFigure != null) {
-			if(selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label)selectionFeedbackFigure);
+		if (selectionFeedbackFigure != null) {
+			if (selectionFeedbackFigure instanceof Label) {
+				updateLabel((Label) selectionFeedbackFigure);
 				selectionFeedbackFigure.setBounds(getFeedbackBounds());
 			} else {
 				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));
@@ -168,7 +169,7 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	}
 
 	protected void refreshFocusFeedback() {
-		if(focusFeedbackFigure != null) {
+		if (focusFeedbackFigure != null) {
 			focusFeedbackFigure.setBounds(getFeedbackBounds());
 		}
 	}
@@ -179,9 +180,10 @@ public class TextSelectionEditPolicy extends SelectionEditPolicy {
 	}
 
 	private FigureListener getHostPositionListener() {
-		if(hostPositionListener == null) {
+		if (hostPositionListener == null) {
 			hostPositionListener = new FigureListener() {
 
+				@Override
 				public void figureMoved(IFigure source) {
 					refreshFeedback();
 				}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AbstractLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AbstractLabelViewFactory.java
index c968ccd23d4..3ba18900adb 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AbstractLabelViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AbstractLabelViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,8 +24,8 @@ public abstract class AbstractLabelViewFactory extends DecorationNodeViewFactory
 
 	@Override
 	protected void initializeFromPreferences(View view) {
-		//Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
-		if(ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
+		// Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
+		if (ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
 			super.initializeFromPreferences(view);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AffixedLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AffixedLabelViewFactory.java
index 22f46d1feab..1a458a7c7c8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AffixedLabelViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AffixedLabelViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -41,8 +41,8 @@ public class AffixedLabelViewFactory extends AbstractLabelViewFactory {
 
 		super.initializeFromPreferences(view);
 
-		IPreferenceStore store = (IPreferenceStore)getPreferencesHint().getPreferenceStore();
-		if(store == null) {
+		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
+		if (store == null) {
 			return;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentListViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentListViewFactory.java
index 221da6fb557..cd231398b00 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentListViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentListViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentShapeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentShapeViewFactory.java
index 584658f4138..9fd448a1a0a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentShapeViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentShapeViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorLabelViewFactory.java
index 965660e57bb..eb1e0ea9e60 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorLabelViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorLabelViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -41,8 +41,8 @@ public class ConnectorLabelViewFactory extends AbstractLabelViewFactory {
 
 		super.initializeFromPreferences(view);
 
-		IPreferenceStore store = (IPreferenceStore)getPreferencesHint().getPreferenceStore();
-		if(store == null) {
+		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
+		if (store == null) {
 			return;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorViewFactory.java
index 8584e18bd81..7386f3f82c4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -33,7 +33,7 @@ public class ConnectorViewFactory extends org.eclipse.gmf.runtime.diagram.ui.vie
 	 */
 	@Override
 	protected List createStyles(View view) {
-		return Arrays.asList(new Style[]{ NotationFactory.eINSTANCE.createFontStyle() });
+		return Arrays.asList(new Style[] { NotationFactory.eINSTANCE.createFontStyle() });
 	}
 
 	/**
@@ -41,17 +41,17 @@ public class ConnectorViewFactory extends org.eclipse.gmf.runtime.diagram.ui.vie
 	 */
 	@Override
 	protected void initializeFromPreferences(View view) {
-		//Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
-		if(ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
+		// Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
+		if (ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
 			super.initializeFromPreferences(view);
 		}
 
-		IPreferenceStore store = (IPreferenceStore)getPreferencesHint().getPreferenceStore();
-		if(store == null) {
+		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
+		if (store == null) {
 			return;
 		}
 
-		//The PreferenceInitializerForElementHelper already checks for usePreferenceInitializer() (When required)
+		// The PreferenceInitializerForElementHelper already checks for usePreferenceInitializer() (When required)
 		String elementName = view.getType();
 		PreferenceInitializerForElementHelper.initForegroundFromPrefs(view, store, elementName);
 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(view, store, elementName);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/InnerLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/InnerLabelViewFactory.java
index 5f160a0325a..c4d0a29492b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/InnerLabelViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/InnerLabelViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeChildLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeChildLabelViewFactory.java
index 4dc2596b2e0..3a2c5a7da35 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeChildLabelViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeChildLabelViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -39,17 +39,17 @@ public class ShapeChildLabelViewFactory extends AbstractShapeViewFactory {
 	 */
 	@Override
 	protected void initializeFromPreferences(View view) {
-		//Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
-		if(ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
+		// Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
+		if (ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
 			super.initializeFromPreferences(view);
 		}
 
-		IPreferenceStore store = (IPreferenceStore)getPreferencesHint().getPreferenceStore();
-		if(store == null) {
+		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
+		if (store == null) {
 			return;
 		}
 
-		//The PreferenceInitializerForElementHelper already checks for usePreferenceInitializer() (When required)
+		// The PreferenceInitializerForElementHelper already checks for usePreferenceInitializer() (When required)
 		String preferenceKey = view.getType();
 		PreferenceInitializerForElementHelper.initForegroundFromPrefs(view, store, preferenceKey);
 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(view, store, preferenceKey);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeViewFactory.java
index a40f27caa39..78669c3ce1e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -38,17 +38,17 @@ public class ShapeViewFactory extends org.eclipse.gmf.runtime.diagram.ui.view.fa
 	 */
 	@Override
 	protected void initializeFromPreferences(View view) {
-		//Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
-		if(ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
+		// Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
+		if (ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
 			super.initializeFromPreferences(view);
 		}
 
-		IPreferenceStore store = (IPreferenceStore)getPreferencesHint().getPreferenceStore();
-		if(store == null) {
+		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
+		if (store == null) {
 			return;
 		}
 
-		//The PreferenceInitializerForElementHelper already checks for usePreferenceInitializer() (When required)
+		// The PreferenceInitializerForElementHelper already checks for usePreferenceInitializer() (When required)
 		String elementName = view.getType();
 		PreferenceInitializerForElementHelper.initForegroundFromPrefs(view, store, elementName);
 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(view, store, elementName);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/CellEditorLocatorUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/CellEditorLocatorUtil.java
index bad38357e77..f057c8cf0b4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/CellEditorLocatorUtil.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/CellEditorLocatorUtil.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -25,12 +25,12 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigu
 public class CellEditorLocatorUtil {
 
 	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {
-		if(source.getFigure() instanceof IMultilineEditableFigure)
-			return new MultilineCellEditorLocator((IMultilineEditableFigure)source.getFigure());
-		else if(source.getFigure() instanceof WrappingLabel)
-			return new TextCellEditorLocator((WrappingLabel)source.getFigure());
-		else {
-			return new LabelCellEditorLocator((Label)source.getFigure());
+		if (source.getFigure() instanceof IMultilineEditableFigure) {
+			return new MultilineCellEditorLocator((IMultilineEditableFigure) source.getFigure());
+		} else if (source.getFigure() instanceof WrappingLabel) {
+			return new TextCellEditorLocator((WrappingLabel) source.getFigure());
+		} else {
+			return new LabelCellEditorLocator((Label) source.getFigure());
 		}
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/LabelCellEditorLocator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/LabelCellEditorLocator.java
index 1d2ca010a3b..410406f59e2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/LabelCellEditorLocator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/LabelCellEditorLocator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -37,15 +37,16 @@ public class LabelCellEditorLocator implements CellEditorLocator {
 		return label;
 	}
 
+	@Override
 	public void relocate(CellEditor celleditor) {
-		Text text = (Text)celleditor.getControl();
+		Text text = (Text) celleditor.getControl();
 		Rectangle rect = getLabel().getTextBounds().getCopy();
 		getLabel().translateToAbsolute(rect);
-		if(!text.getFont().isDisposed()) {
+		if (!text.getFont().isDisposed()) {
 			int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();
 			rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));
 		}
-		if(!rect.equals(new Rectangle(text.getBounds()))) {
+		if (!rect.equals(new Rectangle(text.getBounds()))) {
 			text.setBounds(rect.x, rect.y, rect.width, rect.height);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/MultilineCellEditorLocator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/MultilineCellEditorLocator.java
index 74f283090b6..c3cb6a6040e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/MultilineCellEditorLocator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/MultilineCellEditorLocator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,16 +36,17 @@ public class MultilineCellEditorLocator implements CellEditorLocator {
 		return multilineEditableFigure;
 	}
 
+	@Override
 	public void relocate(CellEditor celleditor) {
-		Text text = (Text)celleditor.getControl();
+		Text text = (Text) celleditor.getControl();
 		Rectangle rect = getMultilineEditableFigure().getBounds().getCopy();
 		rect.x = getMultilineEditableFigure().getEditionLocation().x;
 		rect.y = getMultilineEditableFigure().getEditionLocation().y;
 		getMultilineEditableFigure().translateToAbsolute(rect);
-		if(getMultilineEditableFigure().getText().length() > 0) {
+		if (getMultilineEditableFigure().getText().length() > 0) {
 			rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));
 		}
-		if(!rect.equals(new Rectangle(text.getBounds()))) {
+		if (!rect.equals(new Rectangle(text.getBounds()))) {
 			text.setBounds(rect.x, rect.y, rect.width, rect.height);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/TextCellEditorLocator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/TextCellEditorLocator.java
index 80e988c45a9..1a4a7d56fc8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/TextCellEditorLocator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/TextCellEditorLocator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -37,19 +37,20 @@ public class TextCellEditorLocator implements CellEditorLocator {
 		return wrapLabel;
 	}
 
+	@Override
 	public void relocate(CellEditor celleditor) {
-		Text text = (Text)celleditor.getControl();
+		Text text = (Text) celleditor.getControl();
 		Rectangle rect = getWrapLabel().getTextBounds().getCopy();
 		getWrapLabel().translateToAbsolute(rect);
-		if(!text.getFont().isDisposed()) {
-			if(getWrapLabel().isTextWrapOn() && getWrapLabel().getText().length() > 0) {
+		if (!text.getFont().isDisposed()) {
+			if (getWrapLabel().isTextWrapOn() && getWrapLabel().getText().length() > 0) {
 				rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));
 			} else {
 				int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();
 				rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));
 			}
 		}
-		if(!rect.equals(new Rectangle(text.getBounds()))) {
+		if (!rect.equals(new Rectangle(text.getBounds()))) {
 			text.setBounds(rect.x, rect.y, rect.width, rect.height);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/AbstractViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/AbstractViewProvider.java
index eaf4527c314..3c3d811738a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/AbstractViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/AbstractViewProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -60,12 +60,13 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 		static final long serialVersionUID = 1;
 
 		public void addMethod(Class clazz, Method method) {
-			if(get(clazz) == null)
+			if (get(clazz) == null) {
 				put(clazz, method);
+			}
 		}
 
 		public Method getCreationMethod(Class clazz) {
-			return (Method)get(clazz);
+			return (Method) get(clazz);
 		}
 	}
 
@@ -75,63 +76,71 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 	 * Determines whether this view provider can provide for the required
 	 * operation It inspects the type of view operation and calls the
 	 * corresponding <code>provides</code> method.
-	 * 
+	 *
 	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(IOperation)
 	 */
+	@Override
 	public final boolean provides(IOperation operation) {
 		/* if this is the CreateViewForKindOperation operation */
-		if(operation instanceof CreateViewForKindOperation)
-			return provides((CreateViewForKindOperation)operation);
+		if (operation instanceof CreateViewForKindOperation) {
+			return provides((CreateViewForKindOperation) operation);
+		}
 
 		/* Make sure it is a view operation */
 		assert operation instanceof CreateViewOperation : "operation is not CreateViewOperation in AbstractViewProvider";//$NON-NLS-1$
 
 		/* call the specific provides method */
-		if(operation instanceof CreateDiagramViewOperation)
-			return provides((CreateDiagramViewOperation)operation);
-		else if(operation instanceof CreateEdgeViewOperation)
-			return provides((CreateEdgeViewOperation)operation);
-		else if(operation instanceof CreateNodeViewOperation)
-			return provides((CreateNodeViewOperation)operation);
+		if (operation instanceof CreateDiagramViewOperation) {
+			return provides((CreateDiagramViewOperation) operation);
+		} else if (operation instanceof CreateEdgeViewOperation) {
+			return provides((CreateEdgeViewOperation) operation);
+		} else if (operation instanceof CreateNodeViewOperation) {
+			return provides((CreateNodeViewOperation) operation);
+		}
 		return false;
 	}
 
+	@Override
 	public final Diagram createDiagram(IAdaptable contextElement, String diagramKind, PreferencesHint preferencesHint) {
-		return (Diagram)createNewView(getDiagramViewClass(contextElement, diagramKind), new Object[]{ contextElement, diagramKind, preferencesHint });
+		return (Diagram) createNewView(getDiagramViewClass(contextElement, diagramKind), new Object[] { contextElement, diagramKind, preferencesHint });
 	}
 
 	// Papyrus - final statement removed
+	@Override
 	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
 
-		return (Edge)createNewView(getEdgeViewClass(semanticAdapter, containerView, semanticHint), new Object[]{ semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });
+		return (Edge) createNewView(getEdgeViewClass(semanticAdapter, containerView, semanticHint), new Object[] { semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });
 	}
 
 	// Papyrus - final statement removed
+	@Override
 	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
 
-		return (Node)createNewView(getNodeViewClass(semanticAdapter, containerView, semanticHint), new Object[]{ semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });
+		return (Node) createNewView(getNodeViewClass(semanticAdapter, containerView, semanticHint), new Object[] { semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });
 	}
 
 	/**
 	 * Determines whether this provider can provide for the specified view
 	 * creation operation
-	 * 
+	 *
 	 * @param operation
-	 *        Contains a semantic kind and a containerView
+	 *            Contains a semantic kind and a containerView
 	 * @return boolean
 	 */
 	protected boolean provides(CreateViewForKindOperation op) {
-		if(op.getViewKind() == Node.class)
+		if (op.getViewKind() == Node.class) {
 			return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
-		if(op.getViewKind() == Edge.class)
+		}
+		if (op.getViewKind() == Edge.class) {
 			return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
+		}
 		return true;
 	}
 
 	/**
 	 * Determines whether this provider can provide for the specified diagram
 	 * view operation
-	 * 
+	 *
 	 * @param operation
 	 * @return boolean
 	 */
@@ -142,7 +151,7 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 	/**
 	 * Determines whether this provider can provide for the specified edge view
 	 * operation
-	 * 
+	 *
 	 * @param operation
 	 * @return boolean
 	 */
@@ -153,7 +162,7 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 	/**
 	 * Determines whether this provider can provide for the specified node view
 	 * operation
-	 * 
+	 *
 	 * @param operation
 	 * @return boolean
 	 */
@@ -163,9 +172,9 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 
 	/**
 	 * Returns the diagram view class to instantiate based on the passed params
-	 * 
+	 *
 	 * @param semanticAdapter
-	 *        TODO
+	 *            TODO
 	 * @param semanticAdapter
 	 * @return Class
 	 */
@@ -175,7 +184,7 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 
 	/**
 	 * Returns the edge view class to instantiate based on the passed params
-	 * 
+	 *
 	 * @param semanticAdapter
 	 * @param containerView
 	 * @param semanticHint
@@ -187,7 +196,7 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 
 	/**
 	 * Returns the node view class to instantiate based on the passed params
-	 * 
+	 *
 	 * @param semanticAdapter
 	 * @param containerView
 	 * @param semanticHint
@@ -199,28 +208,28 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 
 	/**
 	 * creates a view instance via reflection.
-	 * 
+	 *
 	 * @param constructorParams
-	 *        the view's constructor parameters.
+	 *            the view's constructor parameters.
 	 */
 	private View createNewView(Class viewClass, Object[] constructorParams) {
 		try {
-			assert null != viewClass : "Null viewClass in AbstractProvider";//$NON-NLS-1$			
+			assert null != viewClass : "Null viewClass in AbstractProvider";//$NON-NLS-1$
 			assert null != constructorParams : "Null constructorParams in AbstractProvider";//$NON-NLS-1$
 
 			Constructor constructor = getFactoryConstructor(viewClass);
-			if(constructor == null) {
+			if (constructor == null) {
 				Log.error(DiagramPlugin.getInstance(), DiagramStatusCodes.SERVICE_FAILURE, "View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$
 				return null;
 			}
 
-			Object factory = constructor.newInstance(new Object[]{});
+			Object factory = constructor.newInstance(new Object[] {});
 			Method method = getCreationMethod(viewClass, constructorParams);
-			if(method == null) {
+			if (method == null) {
 				Log.error(DiagramPlugin.getInstance(), DiagramStatusCodes.SERVICE_FAILURE, "View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$
 				return null;
 			}
-			return (View)method.invoke(factory, constructorParams);
+			return (View) method.invoke(factory, constructorParams);
 		} catch (Throwable e) {
 			String eMsg = NLS.bind(DiagramCoreMessages.AbstractViewProvider_create_view_failed_ERROR_, viewClass.getName());
 			Log.warning(DiagramPlugin.getInstance(), IStatus.WARNING, eMsg, e);
@@ -229,10 +238,10 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 	}
 
 	private Constructor getFactoryConstructor(Class viewClass) {
-		if(viewClass != null) {
+		if (viewClass != null) {
 			Constructor[] ctors = viewClass.getConstructors();
-			for(int i = 0; i < ctors.length; i++) {
-				if(ctors[i].getParameterTypes().length == 0) {
+			for (int i = 0; i < ctors.length; i++) {
+				if (ctors[i].getParameterTypes().length == 0) {
 					return ctors[i];
 				}
 			}
@@ -242,16 +251,17 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 
 	/** Return the <i>creation</i> constructor for the cached view class. */
 	private Method getCreationMethod(Class viewClass, Object[] params) {
-		if(viewClass != null) {
+		if (viewClass != null) {
 			Method method = classToCreateMethod.getCreationMethod(viewClass);
-			if(method != null)
+			if (method != null) {
 				return method;
+			}
 
 			Method[] methods = viewClass.getMethods();
-			for(int i = 0; i < methods.length; i++) {
+			for (int i = 0; i < methods.length; i++) {
 				method = methods[i];
 				String methodName = method.getName();
-				if(methodName.equals(viewCreationMethodName) || methodName.equals(diagramCreationMethodName)) {
+				if (methodName.equals(viewCreationMethodName) || methodName.equals(diagramCreationMethodName)) {
 					classToCreateMethod.addMethod(viewClass, method);
 					return method;
 				}
@@ -262,49 +272,56 @@ public class AbstractViewProvider extends AbstractProvider implements IViewProvi
 
 	/**
 	 * Returns the EClass associated with the semantic adapter
-	 * 
+	 *
 	 * @param semanticAdapter
 	 * @return EClass
 	 */
 	protected EClass getSemanticEClass(IAdaptable semanticAdapter) {
-		if(semanticAdapter == null)
+		if (semanticAdapter == null) {
 			return null;
-		EObject eObject = (EObject)semanticAdapter.getAdapter(EObject.class);
-		if(eObject != null)
+		}
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
 			return EMFCoreUtil.getProxyClass(eObject);
-		IElementType type = (IElementType)semanticAdapter.getAdapter(IElementType.class);
-		if(type != null)
+		}
+		IElementType type = (IElementType) semanticAdapter.getAdapter(IElementType.class);
+		if (type != null) {
 			return type.getEClass();
+		}
 		return null;
 	}
 
 	/**
 	 * Returns the semantic element associated with the semantic adapter
-	 * 
+	 *
 	 * @param semanticAdapter
 	 * @return EClass
 	 */
 	protected EObject getSemanticElement(IAdaptable semanticAdapter) {
-		if(semanticAdapter == null)// TODO which MEditingDomain to use?
+		if (semanticAdapter == null) {
 			return null;
-		EObject eObject = (EObject)semanticAdapter.getAdapter(EObject.class);
-		if(eObject != null)
+		}
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
 			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);
+		}
 		return null;
 	}
 
 	/**
 	 * Returns the semantic element associated with the semantic adapter
-	 * 
+	 *
 	 * @param semanticAdapter
 	 * @return EClass
 	 */
 	protected EObject getSemanticElement(IAdaptable semanticAdapter, TransactionalEditingDomain domain) {
-		if(semanticAdapter == null)
+		if (semanticAdapter == null) {
 			return null;
-		EObject eObject = (EObject)semanticAdapter.getAdapter(EObject.class);
-		if(eObject != null)
+		}
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
 			return EMFCoreUtil.resolve(domain, eObject);
+		}
 		return null;
 	}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractEditPartProvider.java
index 41a3cc8031b..11042c0f5e4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractEditPartProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -32,10 +32,10 @@ public abstract class CustomAbstractEditPartProvider extends AbstractEditPartPro
 	 */
 	@Override
 	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			String currentDiagramType = ((IEditPartOperation)operation).getView().getDiagram().getType();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			String currentDiagramType = ((IEditPartOperation) operation).getView().getDiagram().getType();
 
-			if((diagramType == null) || (!diagramType.equals(currentDiagramType))) {
+			if ((diagramType == null) || (!diagramType.equals(currentDiagramType))) {
 				return false;
 			}
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractViewProvider.java
index a30ee718df8..79374db59fa 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractViewProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -59,24 +59,24 @@ public abstract class CustomAbstractViewProvider extends AbstractViewProvider {
 	 */
 	@Override
 	protected boolean provides(CreateViewForKindOperation op) {
-		
+
 		// This method should generally not be called (https://bugs.eclipse.org/bugs/show_bug.cgi?id=346739).
 
-		if((diagramType == null) || (!diagramType.equals(op.getContainerView().getDiagram().getType()))) {
+		if ((diagramType == null) || (!diagramType.equals(op.getContainerView().getDiagram().getType()))) {
 			return false;
 		}
 
-//		if(op.getViewKind() == Node.class) {
-//			String graphicalType = getNodeGraphicalType(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint());
-//			return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), graphicalType) != null;
-//		}
-//
-//		if(op.getViewKind() == Edge.class) {
-//			String graphicalType = getEdgeGraphicalType(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint());
-//			return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), graphicalType) != null;
-//		}
-
-		throw new UnsupportedOperationException("Should never be called by the "+diagramType+" diagram.");
+		// if(op.getViewKind() == Node.class) {
+		// String graphicalType = getNodeGraphicalType(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint());
+		// return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), graphicalType) != null;
+		// }
+		//
+		// if(op.getViewKind() == Edge.class) {
+		// String graphicalType = getEdgeGraphicalType(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint());
+		// return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), graphicalType) != null;
+		// }
+
+		throw new UnsupportedOperationException("Should never be called by the " + diagramType + " diagram.");
 	}
 
 	/**
@@ -85,7 +85,7 @@ public abstract class CustomAbstractViewProvider extends AbstractViewProvider {
 	@Override
 	protected boolean provides(CreateEdgeViewOperation operation) {
 
-		if((diagramType == null) || (!diagramType.equals(operation.getContainerView().getDiagram().getType()))) {
+		if ((diagramType == null) || (!diagramType.equals(operation.getContainerView().getDiagram().getType()))) {
 			return false;
 		}
 
@@ -99,7 +99,7 @@ public abstract class CustomAbstractViewProvider extends AbstractViewProvider {
 	@Override
 	protected boolean provides(CreateNodeViewOperation operation) {
 
-		if((diagramType == null) || (!diagramType.equals(operation.getContainerView().getDiagram().getType()))) {
+		if ((diagramType == null) || (!diagramType.equals(operation.getContainerView().getDiagram().getType()))) {
 			return false;
 		}
 
@@ -109,20 +109,20 @@ public abstract class CustomAbstractViewProvider extends AbstractViewProvider {
 
 	private String getNodeGraphicalType(IAdaptable semanticAdapter, View containerView, String semanticHint) {
 		String graphicalType = null;
-		
+
 		// Some ViewDescriptor constructors initialize unspecified semanticHint with ""
-		if((semanticHint != null) && (! "".equals(semanticHint))) {
+		if ((semanticHint != null) && (!"".equals(semanticHint))) {
 			graphicalType = registry.getNodeGraphicalType(semanticHint, containerView.getType());
 
 		} else {
 
-			EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
-			if(domainElement != null) {
+			EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
+			if (domainElement != null) {
 				graphicalType = registry.getNodeGraphicalType(domainElement, containerView.getType());
 			}
 
-			IElementType elementType = (IElementType)semanticAdapter.getAdapter(IElementType.class);
-			if(elementType != null) {
+			IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
+			if (elementType != null) {
 				graphicalType = registry.getNodeGraphicalType(elementType, containerView.getType());
 
 			}
@@ -133,18 +133,18 @@ public abstract class CustomAbstractViewProvider extends AbstractViewProvider {
 	private String getEdgeGraphicalType(IAdaptable semanticAdapter, View containerView, String semanticHint) {
 		String graphicalType = null;
 		// Some ViewDescriptor constructors initialize unspecified semanticHint with ""
-		if((semanticHint != null) && (! "".equals(semanticHint))) {
+		if ((semanticHint != null) && (!"".equals(semanticHint))) {
 			graphicalType = registry.getEdgeGraphicalType(semanticHint);
 
 		} else {
 
-			EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
-			if(domainElement != null) {
+			EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
+			if (domainElement != null) {
 				graphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
 
-			IElementType elementType = (IElementType)semanticAdapter.getAdapter(IElementType.class);
-			if(elementType != null) {
+			IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
+			if (elementType != null) {
 				graphicalType = registry.getEdgeGraphicalType(elementType);
 
 			}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/DiagramEditorUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/DiagramEditorUtil.java
index e7a68cd2469..948e40ffabd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/DiagramEditorUtil.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/DiagramEditorUtil.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -28,15 +28,15 @@ public class DiagramEditorUtil {
 		diagramPart.getDiagramGraphicalViewer().deselectAll();
 
 		EditPart firstPrimary = null;
-		for(EditPart nextPart : editParts) {
+		for (EditPart nextPart : editParts) {
 			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);
-			if(firstPrimary == null && nextPart instanceof IPrimaryEditPart) {
+			if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) {
 				firstPrimary = nextPart;
 			}
 		}
 
-		if(!editParts.isEmpty()) {
-			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart)editParts.get(0));
+		if (!editParts.isEmpty()) {
+			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));
 		}
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/ElementTypeLabelProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/ElementTypeLabelProvider.java
index 57f320d7777..421bcc182e7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/ElementTypeLabelProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/ElementTypeLabelProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -20,7 +20,7 @@ import org.eclipse.swt.graphics.Image;
 
 /**
  * A label provider that provides the name and image for <code>IElementType</code> objects.
- * 
+ *
  * @author cmahoney
  */
 public class ElementTypeLabelProvider extends LabelProvider {
@@ -28,24 +28,26 @@ public class ElementTypeLabelProvider extends LabelProvider {
 	/**
 	 * Retrieves the image for <code>IElementType</code> objects using
 	 * the <code>IconService</code>.
-	 * 
+	 *
 	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
 	 */
+	@Override
 	public Image getImage(Object object) {
-		if(object instanceof IElementType) {
-			return IconService.getInstance().getIcon((IElementType)object);
+		if (object instanceof IElementType) {
+			return IconService.getInstance().getIcon((IElementType) object);
 		}
 		return null;
 	}
 
 	/**
 	 * Uses <code>IElementType.getDisplayName()</code> for the text.
-	 * 
+	 *
 	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
 	 */
+	@Override
 	public String getText(Object object) {
-		if(object instanceof IElementType) {
-			return ((IElementType)object).getDisplayName();
+		if (object instanceof IElementType) {
+			return ((IElementType) object).getDisplayName();
 		} else {
 			return object.toString();
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/IGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/IGraphicalTypeRegistry.java
index c719b140edf..4f7b043b64b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/IGraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/IGraphicalTypeRegistry.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -20,89 +20,89 @@ package org.eclipse.papyrus.gmf.diagram.common.provider;
  */
 public interface IGraphicalTypeRegistry extends org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry {
 
-//	/** Constant for undefined graphical type */
-//	public static final String UNDEFINED_TYPE = "undefined_type";
-//
-//	/**
-//	 * Get a valid edge graphical type for the domain element.
-//	 * 
-//	 * @param domainElement
-//	 *        the domain element.
-//	 * @return the domain element graphical type.
-//	 */
-//	public String getEdgeGraphicalType(EObject domainElement);
-//
-//	/**
-//	 * Get a valid edge graphical type for the element type.
-//	 * 
-//	 * @param elementType
-//	 *        the element type.
-//	 * @param containerType
-//	 *        the type of the graphical owner of the domain element.
-//	 * @return the domain element graphical type.
-//	 */
-//	public String getEdgeGraphicalType(IElementType elementType);
-//
-//	/**
-//	 * Get a valid edge graphical type for the proposed type.
-//	 * 
-//	 * @param proposedType
-//	 *        the proposed type.
-//	 * @param containerType
-//	 *        the type of the graphical owner of the domain element.
-//	 * @return the domain element graphical type.
-//	 */
-//	public String getEdgeGraphicalType(String proposedType);
-//
-//	/**
-//	 * Get a valid node graphical type for the domain element.
-//	 * 
-//	 * @param domainElement
-//	 *        the domain element.
-//	 * @param containerType
-//	 *        the type of the graphical owner of the domain element.
-//	 * @return the domain element graphical type.
-//	 */
-//	public String getNodeGraphicalType(EObject domainElement, String containerType);
-//
-//	/**
-//	 * Get a valid node graphical type for the element type.
-//	 * 
-//	 * @param elementType
-//	 *        the element type.
-//	 * @param containerType
-//	 *        the type of the graphical owner of the domain element.
-//	 * @return the domain element graphical type.
-//	 */
-//	public String getNodeGraphicalType(IElementType elementType, String containerType);
-//
-//	/**
-//	 * Get a valid node graphical type for the proposed type.
-//	 * 
-//	 * @param proposedType
-//	 *        the proposed type.
-//	 * @param containerType
-//	 *        the type of the graphical owner of the domain element.
-//	 * @return the domain element graphical type.
-//	 */
-//	public String getNodeGraphicalType(String proposedType, String containerType);
-//
-//	/**
-//	 * Test if the type is a known edge graphical type in this diagram
-//	 * 
-//	 * @param type
-//	 *        the type to test
-//	 * @return true if the type is known
-//	 */
-//	public boolean isKnownEdgeType(String type);
-//
-//	/**
-//	 * Test if the type is a known node graphical type in this diagram
-//	 * 
-//	 * @param type
-//	 *        the type to test
-//	 * @return true if the type is known
-//	 */
-//	public boolean isKnownNodeType(String type);
+	// /** Constant for undefined graphical type */
+	// public static final String UNDEFINED_TYPE = "undefined_type";
+	//
+	// /**
+	// * Get a valid edge graphical type for the domain element.
+	// *
+	// * @param domainElement
+	// * the domain element.
+	// * @return the domain element graphical type.
+	// */
+	// public String getEdgeGraphicalType(EObject domainElement);
+	//
+	// /**
+	// * Get a valid edge graphical type for the element type.
+	// *
+	// * @param elementType
+	// * the element type.
+	// * @param containerType
+	// * the type of the graphical owner of the domain element.
+	// * @return the domain element graphical type.
+	// */
+	// public String getEdgeGraphicalType(IElementType elementType);
+	//
+	// /**
+	// * Get a valid edge graphical type for the proposed type.
+	// *
+	// * @param proposedType
+	// * the proposed type.
+	// * @param containerType
+	// * the type of the graphical owner of the domain element.
+	// * @return the domain element graphical type.
+	// */
+	// public String getEdgeGraphicalType(String proposedType);
+	//
+	// /**
+	// * Get a valid node graphical type for the domain element.
+	// *
+	// * @param domainElement
+	// * the domain element.
+	// * @param containerType
+	// * the type of the graphical owner of the domain element.
+	// * @return the domain element graphical type.
+	// */
+	// public String getNodeGraphicalType(EObject domainElement, String containerType);
+	//
+	// /**
+	// * Get a valid node graphical type for the element type.
+	// *
+	// * @param elementType
+	// * the element type.
+	// * @param containerType
+	// * the type of the graphical owner of the domain element.
+	// * @return the domain element graphical type.
+	// */
+	// public String getNodeGraphicalType(IElementType elementType, String containerType);
+	//
+	// /**
+	// * Get a valid node graphical type for the proposed type.
+	// *
+	// * @param proposedType
+	// * the proposed type.
+	// * @param containerType
+	// * the type of the graphical owner of the domain element.
+	// * @return the domain element graphical type.
+	// */
+	// public String getNodeGraphicalType(String proposedType, String containerType);
+	//
+	// /**
+	// * Test if the type is a known edge graphical type in this diagram
+	// *
+	// * @param type
+	// * the type to test
+	// * @return true if the type is known
+	// */
+	// public boolean isKnownEdgeType(String type);
+	//
+	// /**
+	// * Test if the type is a known node graphical type in this diagram
+	// *
+	// * @param type
+	// * the type to test
+	// * @return true if the type is known
+	// */
+	// public boolean isKnownNodeType(String type);
 
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/MarkerNavigationProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/MarkerNavigationProvider.java
index 969c80b1550..8ad96a32158 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/MarkerNavigationProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/MarkerNavigationProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -40,18 +40,18 @@ public class MarkerNavigationProvider extends AbstractModelMarkerNavigationProvi
 	@Override
 	protected void doGotoMarker(IMarker marker) {
 		String elementId = marker.getAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, null);
-		if(elementId == null || !(getEditor() instanceof DiagramEditor)) {
+		if (elementId == null || !(getEditor() instanceof DiagramEditor)) {
 			return;
 		}
-		DiagramEditor editor = (DiagramEditor)getEditor();
+		DiagramEditor editor = (DiagramEditor) getEditor();
 		Map editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry();
 		EObject targetView = editor.getDiagram().eResource().getEObject(elementId);
-		if(targetView == null) {
+		if (targetView == null) {
 			return;
 		}
-		EditPart targetEditPart = (EditPart)editPartRegistry.get(targetView);
-		if(targetEditPart != null) {
-			DiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[]{ targetEditPart }));
+		EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView);
+		if (targetEditPart != null) {
+			DiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[] { targetEditPart }));
 		}
 	}
 
@@ -75,11 +75,11 @@ public class MarkerNavigationProvider extends AbstractModelMarkerNavigationProvi
 			marker = file.createMarker(MARKER_TYPE);
 			marker.setAttribute(IMarker.MESSAGE, message);
 			marker.setAttribute(IMarker.LOCATION, location);
-			marker.setAttribute(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID, elementId);
+			marker.setAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, elementId);
 			int markerSeverity = IMarker.SEVERITY_INFO;
-			if(statusSeverity == IStatus.WARNING) {
+			if (statusSeverity == IStatus.WARNING) {
 				markerSeverity = IMarker.SEVERITY_WARNING;
-			} else if(statusSeverity == IStatus.ERROR || statusSeverity == IStatus.CANCEL) {
+			} else if (statusSeverity == IStatus.ERROR || statusSeverity == IStatus.CANCEL) {
 				markerSeverity = IMarker.SEVERITY_ERROR;
 			}
 			marker.setAttribute(IMarker.SEVERITY, markerSeverity);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/ConstraintExtendedDirectEditionDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/ConstraintExtendedDirectEditionDialog.java
index 2d34a52f720..828b17e4c63 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/ConstraintExtendedDirectEditionDialog.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/ConstraintExtendedDirectEditionDialog.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateActorPartWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateActorPartWithTypeConfigureCommandFactory.java
index 59ac04ad23e..149116b6c6d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateActorPartWithTypeConfigureCommandFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateActorPartWithTypeConfigureCommandFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -21,6 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
 import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
 import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectActorPartTypeDialog;
@@ -38,24 +39,25 @@ public class CreateActorPartWithTypeConfigureCommandFactory extends AbstractConf
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public ICommand create(ConfigureRequest request) {
 
 		ICommand configureCommand = null;
 
 		Shell shell = Display.getDefault().getActiveShell();
 		// Start dialog to identify the new part type
-		Property part = (Property)request.getElementToConfigure();
+		Property part = (Property) request.getElementToConfigure();
 		Package partPkg = part.getNearestPackage();
 
 		CreateOrSelectActorPartTypeDialog dialog = new CreateOrSelectActorPartTypeDialog(shell, partPkg);
 		dialog.open();
-		if(dialog.getReturnCode() == CreateOrSelectActorPartTypeDialog.OK) {
+		if (dialog.getReturnCode() == Window.OK) {
 
 			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type actorPartType = (Type)dialog.getExistingType();
+			final Type actorPartType = (Type) dialog.getExistingType();
 
 			// Abort if type creation command exists but is not executable
-			if((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
+			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
 				return cancelCommand(request);
 			} else {
 				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
@@ -67,14 +69,14 @@ public class CreateActorPartWithTypeConfigureCommandFactory extends AbstractConf
 				@Override
 				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 
-					Property actorPart = (Property)getElementToEdit();
-					if(actorPartType != null) {
+					Property actorPart = (Property) getElementToEdit();
+					if (actorPartType != null) {
 						actorPart.setType(actorPartType);
 					} else {
-						Type newType = (Type)GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
+						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
 						actorPart.setType(newType);
 					}
-					
+
 					return CommandResult.newOKCommandResult(actorPart);
 				}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java
index 716a7f4954e..27fa06ed5f1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -22,6 +22,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
 import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
@@ -45,24 +46,25 @@ public class CreateConstraintPropertyWithTypeConfigureCommandFactory extends Abs
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public ICommand create(ConfigureRequest request) {
 
 		ICommand configureCommand = null;
 
 		Shell shell = Display.getDefault().getActiveShell();
 		// Start dialog to identify the new part type
-		Property part = (Property)request.getElementToConfigure();
+		Property part = (Property) request.getElementToConfigure();
 		Package partPkg = part.getNearestPackage();
 
 		CreateOrSelectConstraintPropertyTypeDialog dialog = new CreateOrSelectConstraintPropertyTypeDialog(shell, partPkg);
 		dialog.open();
-		if(dialog.getReturnCode() == CreateOrSelectConstraintPropertyTypeDialog.OK) {
+		if (dialog.getReturnCode() == Window.OK) {
 
 			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type partType = (Type)dialog.getExistingType();
+			final Type partType = (Type) dialog.getExistingType();
 
 			// Abort if type creation command exists but is not executable
-			if((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
+			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
 				return cancelCommand(request);
 			} else {
 				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
@@ -74,23 +76,23 @@ public class CreateConstraintPropertyWithTypeConfigureCommandFactory extends Abs
 				@Override
 				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 
-					Property part = (Property)getElementToEdit();
-					if(partType != null) {
+					Property part = (Property) getElementToEdit();
+					if (partType != null) {
 						part.setType(partType);
 					} else {
-						Type newType = (Type)GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
+						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
 						createConstraintBlockConstraint(newType, monitor, info);
 						part.setType(newType);
 					}
 					return CommandResult.newOKCommandResult(part);
 				}
 
-				private void createConstraintBlockConstraint(Type newType, IProgressMonitor monitor, IAdaptable info)  throws ExecutionException {
+				private void createConstraintBlockConstraint(Type newType, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 					// Create the constraint attached to the ConstraintBlock
 					IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(newType);
-					if(commandService != null) {
+					if (commandService != null) {
 						CreateElementRequest createTypeRequest = new CreateElementRequest(newType, UMLElementTypes.CONSTRAINT);
-						createTypeRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, 
+						createTypeRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID,
 								new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), newType.getName() + "Specification"));
 						ICommand newConstraintCreateCommand = commandService.getEditCommand(createTypeRequest);
 						if (newConstraintCreateCommand.canExecute()) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateFlowPortWithFlowSpecificationConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateFlowPortWithFlowSpecificationConfigureCommandFactory.java
index ac62e065270..afb8cff0a8f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateFlowPortWithFlowSpecificationConfigureCommandFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateFlowPortWithFlowSpecificationConfigureCommandFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -21,6 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
 import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
 import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectNonAtomicFlowPortTypeDialog;
@@ -38,24 +39,25 @@ public class CreateFlowPortWithFlowSpecificationConfigureCommandFactory extends
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public ICommand create(ConfigureRequest request) {
 
 		ICommand configureCommand = null;
 
 		Shell shell = Display.getDefault().getActiveShell();
 		// Start dialog to identify the new port type
-		Port port = (Port)request.getElementToConfigure();
+		Port port = (Port) request.getElementToConfigure();
 		Package partPkg = port.getNearestPackage();
 
 		CreateOrSelectNonAtomicFlowPortTypeDialog dialog = new CreateOrSelectNonAtomicFlowPortTypeDialog(shell, partPkg);
 		dialog.open();
-		if(dialog.getReturnCode() == CreateOrSelectNonAtomicFlowPortTypeDialog.OK) {
+		if (dialog.getReturnCode() == Window.OK) {
 
 			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type portType = (Type)dialog.getExistingType();
+			final Type portType = (Type) dialog.getExistingType();
 
 			// Abort if type creation command exists but is not executable
-			if((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
+			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
 				return cancelCommand(request);
 			} else {
 				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
@@ -67,11 +69,11 @@ public class CreateFlowPortWithFlowSpecificationConfigureCommandFactory extends
 				@Override
 				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 
-					Port port = (Port)getElementToEdit();
-					if(portType != null) {
+					Port port = (Port) getElementToEdit();
+					if (portType != null) {
 						port.setType(portType);
 					} else {
-						Type newType = (Type)GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
+						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
 						port.setType(newType);
 					}
 					return CommandResult.newOKCommandResult(port);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreatePartWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreatePartWithTypeConfigureCommandFactory.java
index 2bd53e7f3dd..f0d0c85cdbe 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreatePartWithTypeConfigureCommandFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreatePartWithTypeConfigureCommandFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -21,6 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
 import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
 import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectBlockPropertyTypeDialog;
@@ -38,24 +39,25 @@ public class CreatePartWithTypeConfigureCommandFactory extends AbstractConfigure
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public ICommand create(ConfigureRequest request) {
 
 		ICommand configureCommand = null;
 
 		Shell shell = Display.getDefault().getActiveShell();
 		// Start dialog to identify the new part type
-		Property part = (Property)request.getElementToConfigure();
+		Property part = (Property) request.getElementToConfigure();
 		Package partPkg = part.getNearestPackage();
 
 		CreateOrSelectBlockPropertyTypeDialog dialog = new CreateOrSelectBlockPropertyTypeDialog(shell, partPkg);
 		dialog.open();
-		if(dialog.getReturnCode() == CreateOrSelectBlockPropertyTypeDialog.OK) {
+		if (dialog.getReturnCode() == Window.OK) {
 
 			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type partType = (Type)dialog.getExistingType();
+			final Type partType = (Type) dialog.getExistingType();
 
 			// Abort if type creation command exists but is not executable
-			if((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
+			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
 				return cancelCommand(request);
 			} else {
 				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
@@ -67,11 +69,11 @@ public class CreatePartWithTypeConfigureCommandFactory extends AbstractConfigure
 				@Override
 				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 
-					Property part = (Property)getElementToEdit();
-					if(partType != null) {
+					Property part = (Property) getElementToEdit();
+					if (partType != null) {
 						part.setType(partType);
 					} else {
-						Type newType = (Type)GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
+						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
 						part.setType(newType);
 					}
 					return CommandResult.newOKCommandResult(part);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateReferenceWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateReferenceWithTypeConfigureCommandFactory.java
index 50b7889349d..646689f789a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateReferenceWithTypeConfigureCommandFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateReferenceWithTypeConfigureCommandFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -21,6 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
 import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
 import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectBlockPropertyTypeDialog;
@@ -38,24 +39,25 @@ public class CreateReferenceWithTypeConfigureCommandFactory extends AbstractConf
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public ICommand create(ConfigureRequest request) {
 
 		ICommand configureCommand = null;
 
 		Shell shell = Display.getDefault().getActiveShell();
 		// Start dialog to identify the new part type
-		Property part = (Property)request.getElementToConfigure();
+		Property part = (Property) request.getElementToConfigure();
 		Package partPkg = part.getNearestPackage();
 
 		CreateOrSelectBlockPropertyTypeDialog dialog = new CreateOrSelectBlockPropertyTypeDialog(shell, partPkg);
 		dialog.open();
-		if(dialog.getReturnCode() == CreateOrSelectBlockPropertyTypeDialog.OK) {
+		if (dialog.getReturnCode() == Window.OK) {
 
 			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type partType = (Type)dialog.getExistingType();
+			final Type partType = (Type) dialog.getExistingType();
 
 			// Abort if type creation command exists but is not executable
-			if((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
+			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
 				return cancelCommand(request);
 			} else {
 				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
@@ -67,11 +69,11 @@ public class CreateReferenceWithTypeConfigureCommandFactory extends AbstractConf
 				@Override
 				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 
-					Property part = (Property)getElementToEdit();
-					if(partType != null) {
+					Property part = (Property) getElementToEdit();
+					if (partType != null) {
 						part.setType(partType);
 					} else {
-						Type newType = (Type)GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
+						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
 						part.setType(newType);
 					}
 					return CommandResult.newOKCommandResult(part);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateValueWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateValueWithTypeConfigureCommandFactory.java
index fc21e248d3f..46a2c3db47c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateValueWithTypeConfigureCommandFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateValueWithTypeConfigureCommandFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -21,6 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
 import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
 import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectValuePropertyTypeDialog;
@@ -38,24 +39,25 @@ public class CreateValueWithTypeConfigureCommandFactory extends AbstractConfigur
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public ICommand create(ConfigureRequest request) {
 
 		ICommand configureCommand = null;
 
 		Shell shell = Display.getDefault().getActiveShell();
 		// Start dialog to identify the new part type
-		Property part = (Property)request.getElementToConfigure();
+		Property part = (Property) request.getElementToConfigure();
 		Package partPkg = part.getNearestPackage();
 
 		CreateOrSelectValuePropertyTypeDialog dialog = new CreateOrSelectValuePropertyTypeDialog(shell, partPkg);
 		dialog.open();
-		if(dialog.getReturnCode() == CreateOrSelectValuePropertyTypeDialog.OK) {
+		if (dialog.getReturnCode() == Window.OK) {
 
 			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type partType = (Type)dialog.getExistingType();
+			final Type partType = (Type) dialog.getExistingType();
 
 			// Abort if type creation command exists but is not executable
-			if((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
+			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
 				return cancelCommand(request);
 			} else {
 				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
@@ -67,11 +69,11 @@ public class CreateValueWithTypeConfigureCommandFactory extends AbstractConfigur
 				@Override
 				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 
-					Property part = (Property)getElementToEdit();
-					if(partType != null) {
+					Property part = (Property) getElementToEdit();
+					if (partType != null) {
 						part.setType(partType);
 					} else {
-						Type newType = (Type)GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
+						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
 						part.setType(newType);
 					}
 					return CommandResult.newOKCommandResult(part);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectActorPartTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectActorPartTypeDialog.java
index 32f0812b92c..8e0340d194b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectActorPartTypeDialog.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectActorPartTypeDialog.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectBlockPropertyTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectBlockPropertyTypeDialog.java
index 277b43c19c7..c9c8cb663f0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectBlockPropertyTypeDialog.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectBlockPropertyTypeDialog.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,10 +36,11 @@ public class CreateOrSelectBlockPropertyTypeDialog extends CreateOrSelectTypeDia
 	public CreateOrSelectBlockPropertyTypeDialog(Shell shell, NamedElement owner) {
 		super(shell, owner, SysMLElementTypes.BLOCK, UMLPackage.eINSTANCE.getTypedElement_Type(), BlocksPackage.eINSTANCE.getBlock(), UMLElementTypes.PACKAGE, UMLPackage.eINSTANCE.getPackage_PackagedElement(), null, getConstraintBlockAsStereotype());
 	}
-	
+
 	/**
 	 * If we create a Part type by a ConstraintBlock, thisPart will become a ConstraintProperty and representation will immediately disappear.
-	 * So we filter ConstraintBlock type => Only strict Block are allowed 
+	 * So we filter ConstraintBlock type => Only strict Block are allowed
+	 * 
 	 * @return
 	 */
 	@SuppressWarnings("deprecation")
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectConstraintPropertyTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectConstraintPropertyTypeDialog.java
index 8e80820c06b..48f950103ee 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectConstraintPropertyTypeDialog.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectConstraintPropertyTypeDialog.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -118,5 +118,5 @@ public class CreateOrSelectConstraintPropertyTypeDialog extends CreateOrSelectTy
 	protected String getTypeDialogMessage() {
 		return Messages.CreateOrSelectConstraintPropertyTypeDialog_SelectTypeDialogMessage;
 	}
-	
+
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectNonAtomicFlowPortTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectNonAtomicFlowPortTypeDialog.java
index 6976905cf7f..50fa0e189d7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectNonAtomicFlowPortTypeDialog.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectNonAtomicFlowPortTypeDialog.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectTypeDialog.java
index 67970e01766..58305d53862 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectTypeDialog.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectTypeDialog.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -54,6 +54,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.FormDialog;
 import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
@@ -107,11 +108,11 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	/**
 	 * Create a new dialog to initialize an ActivityParameterNode.
-	 * 
+	 *
 	 * @param shell
-	 *        parent shell
+	 *            parent shell
 	 * @param owner
-	 *        the activity that owns the action
+	 *            the activity that owns the action
 	 */
 	public CreateOrSelectTypeDialog(Shell shell, EObject defaultContainer, IElementType elementType, EStructuralFeature editedFeature, EClass elementEClass, IElementType containerType, EStructuralFeature containerFeature, EClass containerEClass) {
 		super(shell);
@@ -129,12 +130,14 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 	/**
 	 * Create a new dialog to initialize an ActivityParameterNode.
 	 * This dialog will filter certain Stereotypes
+	 * 
 	 * @param shell
-	 *        parent shell
+	 *            parent shell
 	 * @param owner
-	 *        the activity that owns the action
+	 *            the activity that owns the action
 	 */
-	public CreateOrSelectTypeDialog(Shell shell, EObject defaultContainer, IElementType elementType, EStructuralFeature editedFeature, EClass elementEClass, IElementType containerType, EStructuralFeature containerFeature, EClass containerEClass, List<?> notWantedMetaclasses) {
+	public CreateOrSelectTypeDialog(Shell shell, EObject defaultContainer, IElementType elementType, EStructuralFeature editedFeature, EClass elementEClass, IElementType containerType, EStructuralFeature containerFeature, EClass containerEClass,
+			List<?> notWantedMetaclasses) {
 		this(shell, defaultContainer, elementType, editedFeature, elementEClass, containerType, containerFeature, containerEClass);
 		this.notWantedMetaclasses = notWantedMetaclasses;
 	}
@@ -185,9 +188,9 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	/**
 	 * Create the form to :
-	 * 
+	 *
 	 * - ask the user to choose or create an existing element.
-	 * 
+	 *
 	 * @see org.eclipse.ui.forms.FormDialog#createFormContent(org.eclipse.ui.forms.IManagedForm)
 	 */
 	@Override
@@ -212,9 +215,9 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	/**
 	 * Adds buttons to this dialog's button bar.
-	 * 
+	 *
 	 * @param parent
-	 *        the button bar composite
+	 *            the button bar composite
 	 */
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
@@ -224,18 +227,18 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	/**
 	 * Create the section to ask the user to choose an existing element.
-	 * 
+	 *
 	 * @param pParent
-	 *        the section's parent widget
+	 *            the section's parent widget
 	 * @param pToolkit
-	 *        the form toolkit
+	 *            the form toolkit
 	 */
 	protected void createFormSelectionSection(Composite pParent, FormToolkit pToolkit) {
 		// create the section
 		String lSectionTitle = getSelectionSectionTitle();
-		Section lSection = pToolkit.createSection(pParent, Section.EXPANDED | Section.TITLE_BAR);
+		Section lSection = pToolkit.createSection(pParent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);
 		lSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		if(lSectionTitle != null) {
+		if (lSectionTitle != null) {
 			lSection.setText(lSectionTitle);
 		}
 
@@ -259,7 +262,7 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 		existingTypeButton = pToolkit.createButton(lBody, "...", SWT.FLAT);
 
 		Image image = Activator.getInstance().getImage(elementType.getEClass());
-		if(elementEClass != null) {
+		if (elementEClass != null) {
 			image = Activator.getInstance().getImage(elementEClass);
 		}
 
@@ -272,18 +275,18 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	/**
 	 * Create the section to ask the user to create an invoked element.
-	 * 
+	 *
 	 * @param pParent
-	 *        the section's parent widget
+	 *            the section's parent widget
 	 * @param pToolkit
-	 *        the form toolkit
+	 *            the form toolkit
 	 */
 	protected void createFormCreationSection(Composite pParent, FormToolkit pToolkit) {
 		// create the section
 		String lSectionTitle = getCreationSectionTitle();
-		Section lSection = pToolkit.createSection(pParent, Section.EXPANDED | Section.TITLE_BAR);
+		Section lSection = pToolkit.createSection(pParent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);
 		lSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		if(lSectionTitle != null) {
+		if (lSectionTitle != null) {
 			lSection.setText(lSectionTitle);
 		}
 
@@ -311,7 +314,7 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 		newTypeContainerNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		newTypeContainerButton = pToolkit.createButton(lBody, "...", SWT.FLAT);
 		Image image = Activator.getInstance().getImage(containerType.getEClass());
-		if(containerEClass != null) {
+		if (containerEClass != null) {
 			image = Activator.getInstance().getImage(containerEClass);
 		}
 		newTypeContainerButton.setImage(image);
@@ -327,7 +330,7 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 		// Build type creation command if needed
 		boolean isSelectionMode = selectionRadio.getSelection();
-		if(!isSelectionMode) {
+		if (!isSelectionMode) {
 			// Creation mode - Prepare type creation command and set existing type to null.
 			existingType = null;
 			buildNewTypeCreateCommand();
@@ -343,7 +346,7 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 	protected void buildNewTypeCreateCommand() {
 		// The new element is expected to be a NamedElement.
 		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(newTypeContainer);
-		if(commandService != null) {
+		if (commandService != null) {
 			CreateElementRequest createTypeRequest = new CreateElementRequest(newTypeContainer, elementType);
 			createTypeRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), newTypeNameText.getText()));
 			newTypeCreateCommand = commandService.getEditCommand(createTypeRequest);
@@ -374,7 +377,7 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 			 */
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if(creationRadio.equals(e.getSource())) {
+				if (creationRadio.equals(e.getSource())) {
 					refreshSectionsEnable(false);
 				} else {
 					refreshSectionsEnable(true);
@@ -405,6 +408,7 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 			/**
 			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
 			 */
+			@Override
 			public void modifyText(ModifyEvent e) {
 				setNewTypeName(existingTypeNameText.getText());
 			}
@@ -421,7 +425,7 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 			public void widgetSelected(SelectionEvent e) {
 				handleChooseNewTypeContainer();
 				// reset name if not set
-				if(newTypeName == null) {
+				if (newTypeName == null) {
 					setNewTypeName(null);
 				}
 				refreshOkButton();
@@ -435,6 +439,7 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 			/**
 			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
 			 */
+			@Override
 			public void modifyText(ModifyEvent e) {
 				validateNewTypeName();
 				refreshOkButton();
@@ -445,15 +450,15 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	/**
 	 * Set the name of the new type
-	 * 
+	 *
 	 * @param text
-	 *        the text string or null for auto-initialization
+	 *            the text string or null for auto-initialization
 	 */
 	protected void setNewTypeName(String text) {
 		String name = text;
-		if(text == null) {
+		if (text == null) {
 			name = NamedElementUtil.getDefaultNameWithIncrementFromBase(elementType.getEClass().getName(), newTypeContainer.eContents());
-			if(elementEClass != null) {
+			if (elementEClass != null) {
 				name = NamedElementUtil.getDefaultNameWithIncrementFromBase(elementEClass.getName(), newTypeContainer.eContents());
 			}
 			newTypeNameText.setText(name);
@@ -468,7 +473,7 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 	}
 
 	protected void validateNewTypeName() {
-		if(isValidName(newTypeContainer, newTypeNameText.getText())) {
+		if (isValidName(newTypeContainer, newTypeNameText.getText())) {
 			Color black = newTypeNameText.getDisplay().getSystemColor(SWT.COLOR_BLACK);
 			newTypeNameText.setForeground(black);
 
@@ -480,8 +485,8 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	protected boolean isValidName(EObject container, String newName) {
 		boolean isValid = true;
-		if(container instanceof Namespace) {
-			if(((Namespace)container).getOwnedMember(newName) != null) {
+		if (container instanceof Namespace) {
+			if (((Namespace) container).getOwnedMember(newName) != null) {
 				isValid = false;
 			}
 		}
@@ -503,15 +508,15 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 		dialog.setContentProvider(provider);
 		dialog.setLabelProvider(labelProvider);
-		
-		if(dialog.open() == Window.OK) {
+
+		if (dialog.open() == Window.OK) {
 			Object result = dialog.getResult()[0];
-			if(result instanceof IAdaptable) {
+			if (result instanceof IAdaptable) {
 				result = EMFHelper.getEObject(result);
 			}
 
-			if(result instanceof EObject) {
-				setExistingTypeSelection((EObject)result);
+			if (result instanceof EObject) {
+				setExistingTypeSelection((EObject) result);
 			} else {
 				setExistingTypeSelection(null);
 			}
@@ -520,12 +525,12 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	/**
 	 * Set the existing type selected (if selection mode is chosen)
-	 * 
+	 *
 	 * @param invokedElement
-	 *        the selected element
+	 *            the selected element
 	 */
 	protected void setExistingTypeSelection(EObject type) {
-		if(type == null) {
+		if (type == null) {
 			existingTypeNameText.setText("");
 		} else {
 			existingType = type;
@@ -546,14 +551,14 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 		dialog.setContentProvider(provider);
 		dialog.setLabelProvider(labelProvider);
 
-		if(dialog.open() == Window.OK) {
+		if (dialog.open() == Window.OK) {
 			Object result = dialog.getResult()[0];
-			if(result instanceof IAdaptable) {
+			if (result instanceof IAdaptable) {
 				result = EMFHelper.getEObject(result);
 			}
 
-			if(result instanceof EObject) {
-				setNewTypeContainer((EObject)result);
+			if (result instanceof EObject) {
+				setNewTypeContainer((EObject) result);
 			} else {
 				setNewTypeContainer(null);
 			}
@@ -562,17 +567,17 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	/**
 	 * Define the type of the object that will be created (if creation mode is chosen)
-	 * 
+	 *
 	 * @param the
-	 *        selected parent
+	 *            selected parent
 	 */
 	protected void setNewTypeContainer(EObject container) {
 
-		if((containerType instanceof ISpecializationType) && ((ISpecializationType)containerType).getMatcher().matches(container)) {
+		if ((containerType instanceof ISpecializationType) && ((ISpecializationType) containerType).getMatcher().matches(container)) {
 			newTypeContainer = container;
 			newTypeContainerNameText.setText(labelProvider.getText(newTypeContainer));
 
-		} else if(containerType.getEClass().isInstance(container)) {
+		} else if (containerType.getEClass().isInstance(container)) {
 			newTypeContainer = container;
 			newTypeContainerNameText.setText(labelProvider.getText(newTypeContainer));
 
@@ -584,20 +589,20 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 
 	/**
 	 * Refresh the enabled and disabled elements in various sections
-	 * 
+	 *
 	 * @param isSelectionSelected
-	 *        true if we choose to select an existing element, false if we choose to create an element
+	 *            true if we choose to select an existing element, false if we choose to create an element
 	 */
 	private void refreshSectionsEnable(boolean isSelectionSelected) {
 		// handle radio button value
-		if(isSelectionSelected) {
+		if (isSelectionSelected) {
 			creationRadio.setSelection(false);
-			if(!selectionRadio.getSelection()) {
+			if (!selectionRadio.getSelection()) {
 				selectionRadio.setSelection(true);
 			}
 		} else {
 			selectionRadio.setSelection(false);
-			if(!creationRadio.getSelection()) {
+			if (!creationRadio.getSelection()) {
 				creationRadio.setSelection(true);
 			}
 		}
@@ -614,8 +619,8 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 	/** Refresh the OK button activation */
 	protected void refreshOkButton() {
 		boolean isSelectionSelected = selectionRadio.getSelection();
-		if(getButton(IDialogConstants.OK_ID) != null && !getButton(IDialogConstants.OK_ID).isDisposed()) {
-			if(isSelectionSelected) {
+		if (getButton(IDialogConstants.OK_ID) != null && !getButton(IDialogConstants.OK_ID).isDisposed()) {
+			if (isSelectionSelected) {
 				getButton(IDialogConstants.OK_ID).setEnabled(existingType != null);
 			} else {
 				getButton(IDialogConstants.OK_ID).setEnabled((newTypeContainer != null) && (isValidName(newTypeContainer, newTypeNameText.getText())));
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectValuePropertyTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectValuePropertyTypeDialog.java
index de014aa97a1..16503d2da56 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectValuePropertyTypeDialog.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectValuePropertyTypeDialog.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -38,6 +38,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
@@ -69,9 +70,9 @@ public class CreateOrSelectValuePropertyTypeDialog extends CreateOrSelectTypeDia
 	protected void createFormCreationSection(Composite pParent, FormToolkit pToolkit) {
 		// create the section
 		String lSectionTitle = getCreationSectionTitle();
-		Section lSection = pToolkit.createSection(pParent, Section.EXPANDED | Section.TITLE_BAR);
+		Section lSection = pToolkit.createSection(pParent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);
 		lSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		if(lSectionTitle != null) {
+		if (lSectionTitle != null) {
 			lSection.setText(lSectionTitle);
 		}
 
@@ -99,7 +100,7 @@ public class CreateOrSelectValuePropertyTypeDialog extends CreateOrSelectTypeDia
 		newTypeContainerNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		newTypeContainerButton = pToolkit.createButton(lBody, "...", SWT.FLAT);
 		Image image = Activator.getInstance().getImage(containerType.getEClass());
-		if(containerEClass != null) {
+		if (containerEClass != null) {
 			image = Activator.getInstance().getImage(containerEClass);
 		}
 		newTypeContainerButton.setImage(image);
@@ -125,7 +126,7 @@ public class CreateOrSelectValuePropertyTypeDialog extends CreateOrSelectTypeDia
 	protected void buildNewTypeCreateCommand() {
 		// The new element is expected to be a NamedElement.
 		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(newTypeContainer);
-		if(commandService != null) {
+		if (commandService != null) {
 			CreateElementRequest createTypeRequest = new CreateElementRequest(newTypeContainer, newTypeKind);
 			createTypeRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), newTypeNameText.getText()));
 			newTypeCreateCommand = commandService.getEditCommand(createTypeRequest);
@@ -145,12 +146,13 @@ public class CreateOrSelectValuePropertyTypeDialog extends CreateOrSelectTypeDia
 			/**
 			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
 			 */
+			@Override
 			public void modifyText(ModifyEvent e) {
 				ISelection sel = newTypeKindComboViewer.getSelection();
-				if(sel instanceof StructuredSelection) {
-					Object type = ((StructuredSelection)sel).getFirstElement();
-					if(type instanceof IElementType) {
-						newTypeKind = (IElementType)type;
+				if (sel instanceof StructuredSelection) {
+					Object type = ((StructuredSelection) sel).getFirstElement();
+					if (type instanceof IElementType) {
+						newTypeKind = (IElementType) type;
 					} else {
 						newTypeKind = null;
 					}
@@ -169,9 +171,9 @@ public class CreateOrSelectValuePropertyTypeDialog extends CreateOrSelectTypeDia
 	@Override
 	protected void setNewTypeName(String text) {
 		String name = text;
-		if(text == null) {
+		if (text == null) {
 			name = NamedElementUtil.getDefaultNameWithIncrementFromBase(newTypeKind.getEClass().getName(), newTypeContainer.eContents());
-			if(newTypeKind == SysMLElementTypes.VALUE_TYPE) {
+			if (newTypeKind == SysMLElementTypes.VALUE_TYPE) {
 				name = NamedElementUtil.getDefaultNameWithIncrementFromBase(BlocksPackage.eINSTANCE.getValueType().getName(), newTypeContainer.eContents());
 			}
 			newTypeNameText.setText(name);
@@ -235,7 +237,7 @@ public class CreateOrSelectValuePropertyTypeDialog extends CreateOrSelectTypeDia
 
 	/**
 	 * Get the newTypeKind label.
-	 * 
+	 *
 	 * @return the label
 	 */
 	protected String getNewTypeKindLabel() {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/ServiceEditContentProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/ServiceEditContentProvider.java
index a7df7258007..e0d41388e80 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/ServiceEditContentProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/ServiceEditContentProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -37,6 +37,6 @@ public class ServiceEditContentProvider extends SemanticUMLContentProvider {
 
 	@Override
 	public boolean isValidValue(Object element) {
-		return super.isValidValue(element) && validator.validate(new Object[]{ getAdaptedValue(element) }).isOK();
+		return super.isValidValue(element) && validator.validate(new Object[] { getAdaptedValue(element) }).isOK();
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/AssociationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/AssociationEditPart.java
index 15789bf4d23..722cb4bd6a6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/AssociationEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/AssociationEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -59,17 +59,17 @@ public class AssociationEditPart extends AbstractElementLinkEditPart {
 	 */
 	protected void addAssociationEndListeners() {
 		EObject semanticElement = resolveSemanticElement();
-		if(semanticElement instanceof Association) {
+		if (semanticElement instanceof Association) {
 
-			Association association = (Association)semanticElement;
+			Association association = (Association) semanticElement;
 
-			if(association.getMemberEnds().size() >= 2) {
+			if (association.getMemberEnds().size() >= 2) {
 
 				EObject sourceEnd = AssociationViewUtils.getSourceSemanticEnd(getNotationView());
 				EObject targetEnd = AssociationViewUtils.getTargetSemanticEnd(getNotationView());
 
-				addListenerFilter(ASSOCIATION_END_LISTENERS_SOURCE, this, sourceEnd); //$NON-NLS-1$
-				addListenerFilter(ASSOCIATION_END_LISTENERS_TARGET, this, targetEnd); //$NON-NLS-1$
+				addListenerFilter(ASSOCIATION_END_LISTENERS_SOURCE, this, sourceEnd);
+				addListenerFilter(ASSOCIATION_END_LISTENERS_TARGET, this, targetEnd);
 
 			}
 		}
@@ -92,7 +92,7 @@ public class AssociationEditPart extends AbstractElementLinkEditPart {
 		super.handleNotificationEvent(event);
 
 		// Set association ends appearance (aggregation diamond, navigable arrow, etc...)
-		if(resolveSemanticElement() != null) {
+		if (resolveSemanticElement() != null) {
 			refreshVisuals();
 		}
 	}
@@ -104,64 +104,66 @@ public class AssociationEditPart extends AbstractElementLinkEditPart {
 	protected void refreshVisuals() {
 		super.refreshVisuals();
 
-		if(resolveSemanticElement() != null) {
-			if(getSource() == null || getTarget() == null) {
+		if (resolveSemanticElement() != null) {
+			if (getSource() == null || getTarget() == null) {
 				return;
 			}
-			if(((GraphicalEditPart)getSource()).resolveSemanticElement() == null || ((GraphicalEditPart)getTarget()).resolveSemanticElement() == null) {
+			if (((GraphicalEditPart) getSource()).resolveSemanticElement() == null || ((GraphicalEditPart) getTarget()).resolveSemanticElement() == null) {
 				return;
 			}
 
 			Property source = AssociationViewUtils.getSourceSemanticEnd(getNotationView());
 			Property target = AssociationViewUtils.getTargetSemanticEnd(getNotationView());
-			if(source == null || target == null) {
+			if (source == null || target == null) {
 				return;
 			}
-			
+
 			// Get the association
 			Element umlElement = getUMLElement();
-			if(umlElement instanceof Association) {
-				Association association = (Association)getUMLElement();
+			if (umlElement instanceof Association) {
+				Association association = (Association) getUMLElement();
 
 				// Show navigable arrow if either source or target is navigable
 				// not when both are navigable.
-				if(isNavigable(association, source) && isNavigable(association, target)) {
+				if (isNavigable(association, source) && isNavigable(association, target)) {
 
 					// No navigable mark shown on figure.
-					if(source.getAggregation() == AggregationKind.NONE_LITERAL) {
+					if (source.getAggregation() == AggregationKind.NONE_LITERAL) {
 						setArrowSource(getArrowDecoration(EdgeDecorationType.NONE));
 					}
-					if(target.getAggregation() == AggregationKind.NONE_LITERAL) {
+					if (target.getAggregation() == AggregationKind.NONE_LITERAL) {
 						setArrowTarget(getArrowDecoration(EdgeDecorationType.NONE));
 					}
 
 				} else {
 
-					if(isNavigable(association, source)) {
+					if (isNavigable(association, source)) {
 						setArrowTarget(getArrowDecoration(EdgeDecorationType.OPEN_ARROW));
-						if(source.getAggregation() == AggregationKind.NONE_LITERAL) {
+						if (source.getAggregation() == AggregationKind.NONE_LITERAL) {
 							setArrowSource(getArrowDecoration(EdgeDecorationType.NONE));
-						}					}
+						}
+					}
 
-					if(isNavigable(association, target)) {
+					if (isNavigable(association, target)) {
 						setArrowSource(getArrowDecoration(EdgeDecorationType.OPEN_ARROW));
-						if(target.getAggregation() == AggregationKind.NONE_LITERAL) {
+						if (target.getAggregation() == AggregationKind.NONE_LITERAL) {
 							setArrowTarget(getArrowDecoration(EdgeDecorationType.NONE));
-						}					}
+						}
+					}
 
 				}
-				
-				if(source.getAggregation() == AggregationKind.SHARED_LITERAL) {
+
+				if (source.getAggregation() == AggregationKind.SHARED_LITERAL) {
 					setArrowSource(getArrowDecoration(EdgeDecorationType.SOLID_DIAMOND_EMPTY));
 				}
-				if(target.getAggregation() == AggregationKind.SHARED_LITERAL) {
+				if (target.getAggregation() == AggregationKind.SHARED_LITERAL) {
 					setArrowTarget(getArrowDecoration(EdgeDecorationType.SOLID_DIAMOND_EMPTY));
 				}
 
-				if(source.getAggregation() == AggregationKind.COMPOSITE_LITERAL) {
+				if (source.getAggregation() == AggregationKind.COMPOSITE_LITERAL) {
 					setArrowSource(getArrowDecoration(EdgeDecorationType.SOLID_DIAMOND_FILLED));
 				}
-				if(target.getAggregation() == AggregationKind.COMPOSITE_LITERAL) {
+				if (target.getAggregation() == AggregationKind.COMPOSITE_LITERAL) {
 					setArrowTarget(getArrowDecoration(EdgeDecorationType.SOLID_DIAMOND_FILLED));
 				}
 
@@ -171,14 +173,14 @@ public class AssociationEditPart extends AbstractElementLinkEditPart {
 
 	/**
 	 * SysML implementation for isNavigable.
-	 * 
+	 *
 	 * @param end
 	 * @return
 	 */
 	private boolean isNavigable(Association association, Property end) {
 		boolean isNavigable = false;
 
-		if(association.getOwnedEnds().contains(end)) {
+		if (association.getOwnedEnds().contains(end)) {
 			isNavigable = false;
 		} else {
 			isNavigable = true;
@@ -209,7 +211,7 @@ public class AssociationEditPart extends AbstractElementLinkEditPart {
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		// Start of user code custom policies	
+		// Start of user code custom policies
 		// End of user code
 	}
 
@@ -218,24 +220,24 @@ public class AssociationEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			((NamedElementLinkLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
+			((NamedElementLinkLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof AssociationLinkLabelSourceRoleEditPart) {
-			((AssociationLinkLabelSourceRoleEditPart)childEditPart).setLabel(getPrimaryShape().getSourceRoleLabel());
+		if (childEditPart instanceof AssociationLinkLabelSourceRoleEditPart) {
+			((AssociationLinkLabelSourceRoleEditPart) childEditPart).setLabel(getPrimaryShape().getSourceRoleLabel());
 			return true;
 		}
-		if(childEditPart instanceof AssociationLinkLabelSourceMultiplicityEditPart) {
-			((AssociationLinkLabelSourceMultiplicityEditPart)childEditPart).setLabel(getPrimaryShape().getSourceMultiplicityLabel());
+		if (childEditPart instanceof AssociationLinkLabelSourceMultiplicityEditPart) {
+			((AssociationLinkLabelSourceMultiplicityEditPart) childEditPart).setLabel(getPrimaryShape().getSourceMultiplicityLabel());
 			return true;
 		}
-		if(childEditPart instanceof AssociationLinkLabelTargetRoleEditPart) {
-			((AssociationLinkLabelTargetRoleEditPart)childEditPart).setLabel(getPrimaryShape().getTargetRoleLabel());
+		if (childEditPart instanceof AssociationLinkLabelTargetRoleEditPart) {
+			((AssociationLinkLabelTargetRoleEditPart) childEditPart).setLabel(getPrimaryShape().getTargetRoleLabel());
 			return true;
 		}
-		if(childEditPart instanceof AssociationLinkLabelTargetMultiplicityEditPart) {
-			((AssociationLinkLabelTargetMultiplicityEditPart)childEditPart).setLabel(getPrimaryShape().getTargetMultiplicityLabel());
+		if (childEditPart instanceof AssociationLinkLabelTargetMultiplicityEditPart) {
+			((AssociationLinkLabelTargetMultiplicityEditPart) childEditPart).setLabel(getPrimaryShape().getTargetMultiplicityLabel());
 			return true;
 		}
 		return super.addFixedChild(childEditPart);
@@ -246,19 +248,19 @@ public class AssociationEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementLinkLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof AssociationLinkLabelSourceRoleEditPart) {
+		if (childEditPart instanceof AssociationLinkLabelSourceRoleEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof AssociationLinkLabelSourceMultiplicityEditPart) {
+		if (childEditPart instanceof AssociationLinkLabelSourceMultiplicityEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof AssociationLinkLabelTargetRoleEditPart) {
+		if (childEditPart instanceof AssociationLinkLabelTargetRoleEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof AssociationLinkLabelTargetMultiplicityEditPart) {
+		if (childEditPart instanceof AssociationLinkLabelTargetMultiplicityEditPart) {
 			return true;
 		}
 		return super.removeFixedChild(childEditPart);
@@ -267,6 +269,7 @@ public class AssociationEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates figure for this edit part.
 	 */
+	@Override
 	protected Connection createConnectionFigure() {
 		return new AssociationFigure();
 	}
@@ -274,8 +277,9 @@ public class AssociationEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates primary shape for this edit part.
 	 */
+	@Override
 	public AssociationFigure getPrimaryShape() {
-		return (AssociationFigure)getFigure();
+		return (AssociationFigure) getFigure();
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompositeEditPart.java
index c2763588410..27e22dfc9e3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompositeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompositeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -202,7 +202,7 @@ public class BlockPropertyCompositeEditPart extends AbstractElementEditPart {
 
 	/**
 	 * <pre>
-	 * 
+	 *
 	 * {@inheritDoc}
 	 * </pre>
 	 */
@@ -234,7 +234,7 @@ public class BlockPropertyCompositeEditPart extends AbstractElementEditPart {
 
 	/**
 	 * <pre>
-	 * 
+	 *
 	 * {@inheritDoc}
 	 * </pre>
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockPropertyCompositeEditPart.java
index a8bfa2e966a..56f04e795ad 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockPropertyCompositeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockPropertyCompositeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -122,12 +122,12 @@ public class ConstraintBlockPropertyCompositeEditPart extends AbstractElementEdi
 			return true;
 		}
 		if (childEditPart instanceof ConstraintNodeLabelEditPart) {
-			((ConstraintNodeLabelEditPart) childEditPart).setLabel(((ConstraintBlockPropertyCompositeFigure) getPrimaryShape()).getConstraintLabel());
+			((ConstraintNodeLabelEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintLabel());
 			return true;
 		}
 
 		if (childEditPart instanceof ConstraintParameterAffixedNodeEditPart) {
-			FullInsidePortPositionLocator locator = new FullInsidePortPositionLocator(getMainFigure(), PositionConstants.NONE, ((ConstraintBlockPropertyCompositeFigure) getPrimaryShape()).getCorner());
+			FullInsidePortPositionLocator locator = new FullInsidePortPositionLocator(getMainFigure(), PositionConstants.NONE, getPrimaryShape().getCorner());
 			constraintParameter2FullInsidePortPositionLocator.put(childEditPart, locator); // register the locator in order to reset the corner when changing ConstraintProeprty representation
 			getBorderedFigure().getBorderItemContainer().add(((ConstraintParameterAffixedNodeEditPart) childEditPart).getFigure(), locator);
 			return true;
@@ -243,7 +243,7 @@ public class ConstraintBlockPropertyCompositeEditPart extends AbstractElementEdi
 
 	/**
 	 * <pre>
-	 * 
+	 *
 	 * {@inheritDoc}
 	 * </pre>
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintPropertyChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintPropertyChildLabelEditPart.java
index 5200ba8e85f..9e4da913e46 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintPropertyChildLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintPropertyChildLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -34,23 +34,23 @@ public class ConstraintPropertyChildLabelEditPart extends AbstractElementChildLa
 		super.createDefaultEditPolicies();
 	}
 
-	//	/**
-	//	 * {@inheritDoc}
-	//	 */
-	//	@Override
-	//	protected Image getLabelIcon() {
-	//		EObject parserElement = getParserElement();
-	//		if(parserElement == null) {
-	//			return null;
-	//		}
+	// /**
+	// * {@inheritDoc}
+	// */
+	// @Override
+	// protected Image getLabelIcon() {
+	// EObject parserElement = getParserElement();
+	// if(parserElement == null) {
+	// return null;
+	// }
 	//
-	//		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-	//		for(View view : views) {
-	//			if(NameLabelIconHelper.showLabelIcon(view)) {
-	//				return Activator.getInstance().getLabelProvider().getImage(parserElement);
-	//			}
-	//		}
+	// List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
+	// for(View view : views) {
+	// if(NameLabelIconHelper.showLabelIcon(view)) {
+	// return Activator.getInstance().getLabelProvider().getImage(parserElement);
+	// }
+	// }
 	//
-	//		return null;
-	//	}
+	// return null;
+	// }
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java
index 4b1bfeaffc7..9f110deddce 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -53,21 +53,22 @@ public class FlowPortAffixedLabelNameEditPart extends AbstractElementLabelEditPa
 		super.createDefaultEditPolicies();
 	}
 
+	@Override
 	public IBorderItemLocator getBorderItemLocator() {
 		IFigure parentFigure = getFigure().getParent();
-		if(parentFigure != null && parentFigure.getLayoutManager() != null) {
+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator)constraint;
+			return (IBorderItemLocator) constraint;
 		}
 		return null;
 	}
 
 	@Override
 	public void refreshBounds() {
-		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
 
 		// Update locator constraint
 		IBorderItemLocator locator = getBorderItemLocator();
@@ -83,13 +84,13 @@ public class FlowPortAffixedLabelNameEditPart extends AbstractElementLabelEditPa
 	@Override
 	protected Image getLabelIcon() {
 		EObject parserElement = getParserElement();
-		if(parserElement == null) {
+		if (parserElement == null) {
 			return null;
 		}
 
 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for(View view : views) {
-			if(NameLabelIconHelper.showLabelIcon(view)) {
+		for (View view : views) {
+			if (NameLabelIconHelper.showLabelIcon(view)) {
 				return labelProvider.getImage(parserElement);
 			}
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedNodeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedNodeEditPart.java
index 5a9aec1f8f6..12c8ac88647 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedNodeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedNodeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -61,6 +61,7 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 		super(view);
 	}
 
+	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy() {
@@ -75,11 +76,11 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 			 */
 			@Override
 			protected void refreshStereotypeDisplay() {
-				if(getHost() instanceof IPapyrusEditPart) {
-					IFigure figure = ((IPapyrusEditPart)getHost()).getPrimaryShape();
+				if (getHost() instanceof IPapyrusEditPart) {
+					IFigure figure = ((IPapyrusEditPart) getHost()).getPrimaryShape();
 
-					if((figure instanceof IPapyrusUMLElementFigure) && (stereotypeIconToDisplay() != null)) {
-						((IPapyrusUMLElementFigure)figure).setStereotypeDisplay(null, stereotypeIconToDisplay());
+					if ((figure instanceof IPapyrusUMLElementFigure) && (stereotypeIconToDisplay() != null)) {
+						((IPapyrusUMLElementFigure) figure).setStereotypeDisplay(null, stereotypeIconToDisplay());
 					} else {
 						refreshVisuals();
 					}
@@ -95,13 +96,15 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 	protected LayoutEditPolicy createLayoutEditPolicy() {
 		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
 
+			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if(child instanceof IBorderItemEditPart) { // External labels
+				if (child instanceof IBorderItemEditPart) { // External labels
 					return new ExternalLabelPrimaryDragRoleEditPolicy() {
 
+						@Override
 						@SuppressWarnings("rawtypes")
 						protected List createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());
+							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
 							mh.setBorder(null);
 							return Collections.singletonList(mh);
 						}
@@ -109,16 +112,18 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 				}
 
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
 			}
 
+			@Override
 			protected Command getMoveChildrenCommand(Request request) {
 				return null;
 			}
 
+			@Override
 			protected Command getCreateCommand(CreateRequest request) {
 				return null;
 			}
@@ -138,12 +143,13 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 		return getChildBySemanticHint(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID);
 	}
 
+	@Override
 	protected void addSemanticListeners() {
 
-		if(resolveSemanticElement() != null) {
+		if (resolveSemanticElement() != null) {
 
-			FlowPort flowPort = UMLUtil.getStereotypeApplication((Element)resolveSemanticElement(), FlowPort.class);
-			if(flowPort != null) {
+			FlowPort flowPort = UMLUtil.getStereotypeApplication((Element) resolveSemanticElement(), FlowPort.class);
+			if (flowPort != null) {
 				addListenerFilter("FlowPort", this, flowPort); //$NON-NLS-1$
 			}
 		}
@@ -151,6 +157,7 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 		super.addSemanticListeners();
 	}
 
+	@Override
 	protected void removeSemanticListeners() {
 		removeListenerFilter("FlowPort"); //$NON-NLS-1$
 		super.removeSemanticListeners();
@@ -158,7 +165,7 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 
 	/**
 	 * <pre>
-	 * Calls the figure refresh when a change event is detected on 
+	 * Calls the figure refresh when a change event is detected on
 	 * UMLPackage.eINSTANCE.getProperty_Aggregation().
 	 * 
 	 * {@inheritDoc}
@@ -169,26 +176,26 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 
 		// When the flow port position changes, its position on parent side may change and requires a visual refresh.
 		Object feature = event.getFeature();
-		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
 			refreshVisuals();
 		}
 
 		// A visual refresh may also be needed when the following properties are changing : isAtomic (depend on the type), direction, isConjugated.
-		if(resolveSemanticElement() != null) {
-			Element element = (Element)resolveSemanticElement();
+		if (resolveSemanticElement() != null) {
+			Element element = (Element) resolveSemanticElement();
 			FlowPort flowPort = UMLUtil.getStereotypeApplication(element, FlowPort.class);
 
-			if((flowPort != null) && (flowPort.equals(event.getNotifier()))) {
-				if(PortandflowsPackage.eINSTANCE.getFlowPort_Direction().equals(event.getFeature())
-				//|| PortandflowsPackage.eINSTANCE.getFlowPort_IsAtomic().equals(event.getFeature())
-				|| PortandflowsPackage.eINSTANCE.getFlowPort_IsConjugated().equals(event.getFeature())) {
+			if ((flowPort != null) && (flowPort.equals(event.getNotifier()))) {
+				if (PortandflowsPackage.eINSTANCE.getFlowPort_Direction().equals(event.getFeature())
+						// || PortandflowsPackage.eINSTANCE.getFlowPort_IsAtomic().equals(event.getFeature())
+						|| PortandflowsPackage.eINSTANCE.getFlowPort_IsConjugated().equals(event.getFeature())) {
 					refreshVisuals();
 				}
 			}
 
 			// IsAtomic change is triggered by a type change
-			if(resolveSemanticElement().equals(event.getNotifier())) {
-				if(UMLPackage.eINSTANCE.getTypedElement_Type().equals(event.getFeature())) {
+			if (resolveSemanticElement().equals(event.getNotifier())) {
+				if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(event.getFeature())) {
 					refreshVisuals();
 				}
 			}
@@ -210,7 +217,7 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 	 */
 	@Override
 	public FlowPortFigure getPrimaryShape() {
-		return (FlowPortFigure)primaryShape;
+		return (FlowPortFigure) primaryShape;
 	}
 
 	/**
@@ -229,7 +236,7 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 			getBorderItemLocator().getCurrentSideOfParent();
 		}
 
-		Element element = (Element)resolveSemanticElement();
+		Element element = (Element) resolveSemanticElement();
 		FlowPort flowPort = UMLUtil.getStereotypeApplication(element, FlowPort.class);
 
 		Image image = Activator.getInstance().getFlowPortImage(flowPort, side);
@@ -255,7 +262,7 @@ public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 			@Override
 			public void postLayout(IFigure container) {
 				refreshVisuals();
-				//getBorderedFigure().getBorderItemContainer().removeLayoutListener(layoutInitializationListener);
+				// getBorderedFigure().getBorderItemContainer().removeLayoutListener(layoutInitializationListener);
 				layoutInitializationListener = null;
 			}
 		};
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortChildLabelEditPart.java
index 5e0de40aa63..b1e182c765c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortChildLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortChildLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -34,23 +34,23 @@ public class FlowPortChildLabelEditPart extends AbstractElementChildLabelEditPar
 		super.createDefaultEditPolicies();
 	}
 
-	//	/**
-	//	 * {@inheritDoc}
-	//	 */
-	//	@Override
-	//	protected Image getLabelIcon() {
-	//		EObject parserElement = getParserElement();
-	//		if(parserElement == null) {
-	//			return null;
-	//		}
+	// /**
+	// * {@inheritDoc}
+	// */
+	// @Override
+	// protected Image getLabelIcon() {
+	// EObject parserElement = getParserElement();
+	// if(parserElement == null) {
+	// return null;
+	// }
 	//
-	//		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-	//		for(View view : views) {
-	//			if(NameLabelIconHelper.showLabelIcon(view)) {
-	//				return labelProvider.getImage(parserElement);
-	//			}
-	//		}
+	// List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
+	// for(View view : views) {
+	// if(NameLabelIconHelper.showLabelIcon(view)) {
+	// return labelProvider.getImage(parserElement);
+	// }
+	// }
 	//
-	//		return null;
-	//	}
+	// return null;
+	// }
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyChildLabelEditPart.java
index a4dd8ede7fa..97fc4a4403c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyChildLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyChildLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -34,23 +34,23 @@ public class FlowPropertyChildLabelEditPart extends AbstractElementChildLabelEdi
 		super.createDefaultEditPolicies();
 	}
 
-	//	/**
-	//	 * {@inheritDoc}
-	//	 */
-	//	@Override
-	//	protected Image getLabelIcon() {
-	//		EObject parserElement = getParserElement();
-	//		if(parserElement == null) {
-	//			return null;
-	//		}
+	// /**
+	// * {@inheritDoc}
+	// */
+	// @Override
+	// protected Image getLabelIcon() {
+	// EObject parserElement = getParserElement();
+	// if(parserElement == null) {
+	// return null;
+	// }
 	//
-	//		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-	//		for(View view : views) {
-	//			if(NameLabelIconHelper.showLabelIcon(view)) {
-	//				return labelProvider.getImage(parserElement);
-	//			}
-	//		}
+	// List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
+	// for(View view : views) {
+	// if(NameLabelIconHelper.showLabelIcon(view)) {
+	// return labelProvider.getImage(parserElement);
+	// }
+	// }
 	//
-	//		return null;
-	//	}
+	// return null;
+	// }
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/NestedBlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/NestedBlockPropertyCompositeEditPart.java
index 839cb910174..366ca2198c6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/NestedBlockPropertyCompositeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/NestedBlockPropertyCompositeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -189,7 +189,7 @@ public class NestedBlockPropertyCompositeEditPart extends AbstractElementEditPar
 
 	/**
 	 * <pre>
-	 * 
+	 *
 	 * {@inheritDoc}
 	 * </pre>
 	 */
@@ -221,7 +221,7 @@ public class NestedBlockPropertyCompositeEditPart extends AbstractElementEditPar
 
 	/**
 	 * <pre>
-	 * 
+	 *
 	 * {@inheritDoc}
 	 * </pre>
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
index 811efd555bb..0ef7d5f727c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -39,18 +39,18 @@ public class BlockCompositeSemanticEditPolicy extends CompartmentSemanticEditPol
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		//if extended type, retrieve the sysml closest element element type
-		if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+		// if extended type, retrieve the sysml closest element element type
+		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if(superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
+			if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
 				baseType = SysMLElementTypes.FLOW_PORT_NA;
-			} 
+			}
 		}
-		
-		if(SysMLElementTypes.FLOW_PORT_NA == baseType) {
+
+		if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
 		}
-		
+
 		return super.getCreateCommand(req);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
index 7bacaff00ba..100a8926f3b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -41,50 +41,50 @@ public class BlockPropertyCompositeSemanticEditPolicy extends DefaultSemanticEdi
 	@Override
 	protected Command getCreateCommand(CreateElementRequest req) {
 
-		// Port - FlowPort creation is allowed if the semantic element is 
+		// Port - FlowPort creation is allowed if the semantic element is
 		// a Property typed by a Block, the new Port - FlowPort is created on this Block.
 		EObject eObject = req.getContainer();
 		if ((eObject != null) && (eObject instanceof Property)) {
 			Type type = ((Property) eObject).getType();
-			if ((type != null) && (((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(type))) {
+			if ((type != null) && (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type))) {
 
 				IElementType elementTypeToCreate = req.getElementType();
 				IElementType baseType = elementTypeToCreate;
-				//if extended type, retrieve the sysml closest element element type
-				if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+				// if extended type, retrieve the sysml closest element element type
+				if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 					List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-					if(superTypes.contains(SysMLElementTypes.FLOW_PORT)) {
+					if (superTypes.contains(SysMLElementTypes.FLOW_PORT)) {
 						baseType = SysMLElementTypes.FLOW_PORT;
-					} else if(superTypes.contains(SysMLElementTypes.FLOW_PORT_IN)) {
+					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN)) {
 						baseType = SysMLElementTypes.FLOW_PORT_IN;
-					} else if(superTypes.contains(SysMLElementTypes.FLOW_PORT_OUT)) {
+					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_OUT)) {
 						baseType = SysMLElementTypes.FLOW_PORT_OUT;
-					} else if(superTypes.contains(SysMLElementTypes.FLOW_PORT_IN_OUT)) {
+					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN_OUT)) {
 						baseType = SysMLElementTypes.FLOW_PORT_IN_OUT;
-					} else if(superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
+					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
 						baseType = SysMLElementTypes.FLOW_PORT_NA;
-					}  else if(superTypes.contains(UMLElementTypes.PORT )) {
-						baseType = UMLElementTypes.PORT ;
-					} 
+					} else if (superTypes.contains(UMLElementTypes.PORT)) {
+						baseType = UMLElementTypes.PORT;
+					}
 				}
-				
-				
-				if((SysMLElementTypes.FLOW_PORT == baseType)
-					|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
-					|| (SysMLElementTypes.FLOW_PORT_OUT == baseType)
-					|| (SysMLElementTypes.FLOW_PORT_IN_OUT == baseType)
-					|| (SysMLElementTypes.FLOW_PORT_NA == baseType)
-					|| (UMLElementTypes.PORT == baseType)) {
-					
+
+
+				if ((SysMLElementTypes.FLOW_PORT == baseType)
+						|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
+						|| (SysMLElementTypes.FLOW_PORT_OUT == baseType)
+						|| (SysMLElementTypes.FLOW_PORT_IN_OUT == baseType)
+						|| (SysMLElementTypes.FLOW_PORT_NA == baseType)
+						|| (UMLElementTypes.PORT == baseType)) {
+
 					req.setContainer(type);
 				}
-				
-				if(SysMLElementTypes.FLOW_PORT_NA == baseType) {
+
+				if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
 					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
 				}
 			}
 		}
-		
+
 		return super.getCreateCommand(req);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
index 03360fa02c5..c1fa49c05dc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -46,59 +46,59 @@ public class BlockPropertyStructureCompartmentSemanticEditPolicy extends Compart
 	@Override
 	protected Command getCreateCommand(CreateElementRequest req) {
 
-		// Property (and variants) creation is allowed if the semantic element is 
+		// Property (and variants) creation is allowed if the semantic element is
 		// a Property typed by a Block, the Property is created on this Block.
 		EObject eObject = req.getContainer();
 		if ((eObject != null) && (eObject instanceof Property)) {
 			Type type = ((Property) eObject).getType();
-			if ((type != null) && (((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(type))) {
-				
+			if ((type != null) && (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type))) {
+
 				IElementType elementTypeToCreate = req.getElementType();
 				IElementType baseType = elementTypeToCreate;
-				//if extended type, retrieve the sysml closest element element type
-				if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+				// if extended type, retrieve the sysml closest element element type
+				if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 					List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-					
-					if(superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
+
+					if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
 						baseType = SysMLElementTypes.PART_PROPERTY;
-					} else if(superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
+					} else if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
 						baseType = SysMLElementTypes.REFERENCE_PROPERTY;
-					} else if(superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
+					} else if (superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
 						baseType = SysMLElementTypes.ACTOR_PART_PROPERTY;
-					} else if(superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
+					} else if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
 						baseType = SysMLElementTypes.VALUE_PROPERTY;
-					} else if(superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
+					} else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
 						baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
-					} else if(superTypes.contains(UMLElementTypes.PROPERTY)) {
+					} else if (superTypes.contains(UMLElementTypes.PROPERTY)) {
 						baseType = UMLElementTypes.PROPERTY;
-					} 
+					}
 
 				}
-				
-				if(SysMLElementTypes.PART_PROPERTY == baseType) {
+
+				if (SysMLElementTypes.PART_PROPERTY == baseType) {
 					req.setContainer(type);
 					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
-				} else if(SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
+				} else if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
 					req.setContainer(type);
 					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
-				} else if(SysMLElementTypes.ACTOR_PART_PROPERTY == baseType) {
+				} else if (SysMLElementTypes.ACTOR_PART_PROPERTY == baseType) {
 					req.setContainer(type);
 					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateActorPartWithTypeConfigureCommandFactory());
-				}else if(SysMLElementTypes.VALUE_PROPERTY == baseType) {
+				} else if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
 					req.setContainer(type);
 					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
-				} else if(UMLElementTypes.PROPERTY == baseType) {
+				} else if (UMLElementTypes.PROPERTY == baseType) {
 					req.setContainer(type);
-				} else if(SysMLElementTypes.CONSTRAINT_PROPERTY == req.getElementType()) {
+				} else if (SysMLElementTypes.CONSTRAINT_PROPERTY == req.getElementType()) {
 					req.setContainer(type);
 					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateConstraintPropertyWithTypeConfigureCommandFactory());
 				}
-			} else if ((UMLElementTypes.PROPERTY == req.getElementType()) || (Arrays.asList(req.getElementType().getAllSuperTypes()).contains(UMLElementTypes.PROPERTY))) { 
+			} else if ((UMLElementTypes.PROPERTY == req.getElementType()) || (Arrays.asList(req.getElementType().getAllSuperTypes()).contains(UMLElementTypes.PROPERTY))) {
 				// Forbid Property::qualifier creation
 				return UnexecutableCommand.INSTANCE;
 			}
 		}
-		
+
 		return super.getCreateCommand(req);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
index 57b7574e813..a6d2a8e2790 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -41,15 +41,15 @@ public class ConstraintParameterCompartmentSemanticEditPolicy extends Compartmen
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		//if extended type, retrieve the sysml closest element element type
-		if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+		// if extended type, retrieve the sysml closest element element type
+		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if(superTypes.contains(UMLElementTypes.PROPERTY)) {
+			if (superTypes.contains(UMLElementTypes.PROPERTY)) {
 				baseType = UMLElementTypes.PROPERTY;
-			} 
+			}
 		}
-		
-		if(UMLElementTypes.PROPERTY == baseType) {
+
+		if (UMLElementTypes.PROPERTY == baseType) {
 			String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", req.getContainer().eContents()); //$NON-NLS-1$
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), name));
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/CustomDuplicatePasteEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/CustomDuplicatePasteEditPolicy.java
index a65f4599b49..3bf2936c14f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/CustomDuplicatePasteEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/CustomDuplicatePasteEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -27,31 +27,30 @@ import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
 
 /**
- * Specific edit policy for compartment, to forbid the duplication of ports as affixed children. 
+ * Specific edit policy for compartment, to forbid the duplication of ports as affixed children.
+ * 
  * @see bug 375041
  */
 public class CustomDuplicatePasteEditPolicy extends DuplicatePasteEditPolicy {
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected Command constructDuplicationCommand(List notationViewsToDuplicate, Set elementsToDuplicate, DuplicateRequest request, TransactionalEditingDomain editingDomain) {
-		if(notationViewsToDuplicate !=null && !notationViewsToDuplicate.isEmpty()) {
-			for(Object o : notationViewsToDuplicate) {
-				if(o instanceof View) {
-					String type = ((View)o).getType();
-					if(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(type) || UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(type)) {
+		if (notationViewsToDuplicate != null && !notationViewsToDuplicate.isEmpty()) {
+			for (Object o : notationViewsToDuplicate) {
+				if (o instanceof View) {
+					String type = ((View) o).getType();
+					if (SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(type) || UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(type)) {
 						return UnexecutableCommand.INSTANCE;
 					}
 				}
 			}
 		}
-		
-		
+
+
 		return super.constructDuplicationCommand(notationViewsToDuplicate, elementsToDuplicate, request, editingDomain);
 	}
-	
-}
 
-	 
\ No newline at end of file
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
index e1d81eb1ef0..21165368ddd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -38,18 +38,18 @@ public class FlowPortCompartmentSemanticEditPolicy extends CompartmentSemanticEd
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		//if extended type, retrieve the sysml closest element element type
-		if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+		// if extended type, retrieve the sysml closest element element type
+		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if(superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
+			if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
 				baseType = SysMLElementTypes.FLOW_PORT_NA;
-			} 
+			}
 		}
-		
-		if(SysMLElementTypes.FLOW_PORT_NA == baseType) {
+
+		if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
 		}
-		
+
 		return super.getCreateCommand(req);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
index d35d901294f..a1d8acdbca3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -42,50 +42,50 @@ public class NestedBlockPropertyCompositeSemanticEditPolicy extends DefaultSeman
 	@Override
 	protected Command getCreateCommand(CreateElementRequest req) {
 
-		// Port - FlowPort creation is allowed if the semantic element is 
+		// Port - FlowPort creation is allowed if the semantic element is
 		// a Property typed by a Block, the new Port - FlowPort is created on this Block.
 		EObject eObject = req.getContainer();
 		if ((eObject != null) && (eObject instanceof Property)) {
 			Type type = ((Property) eObject).getType();
-			if ((type != null) && (((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(type))) {
-				
+			if ((type != null) && (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type))) {
+
 
 				IElementType elementTypeToCreate = req.getElementType();
 				IElementType baseType = elementTypeToCreate;
-				//if extended type, retrieve the sysml closest element element type
-				if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+				// if extended type, retrieve the sysml closest element element type
+				if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 					List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-					if(superTypes.contains(SysMLElementTypes.FLOW_PORT)) {
+					if (superTypes.contains(SysMLElementTypes.FLOW_PORT)) {
 						baseType = SysMLElementTypes.FLOW_PORT;
-					} else if(superTypes.contains(SysMLElementTypes.FLOW_PORT_IN)) {
+					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN)) {
 						baseType = SysMLElementTypes.FLOW_PORT_IN;
-					} else if(superTypes.contains(SysMLElementTypes.FLOW_PORT_OUT)) {
+					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_OUT)) {
 						baseType = SysMLElementTypes.FLOW_PORT_OUT;
-					} else if(superTypes.contains(SysMLElementTypes.FLOW_PORT_IN_OUT)) {
+					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN_OUT)) {
 						baseType = SysMLElementTypes.FLOW_PORT_IN_OUT;
-					} else if(superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
+					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
 						baseType = SysMLElementTypes.FLOW_PORT_NA;
-					}  else if(superTypes.contains(UMLElementTypes.PORT )) {
-						baseType = UMLElementTypes.PORT ;
-					} 
+					} else if (superTypes.contains(UMLElementTypes.PORT)) {
+						baseType = UMLElementTypes.PORT;
+					}
 				}
-				
-				if((SysMLElementTypes.FLOW_PORT == baseType)
-					|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
-					|| (SysMLElementTypes.FLOW_PORT_OUT == baseType)
-					|| (SysMLElementTypes.FLOW_PORT_IN_OUT == baseType)
-					|| (SysMLElementTypes.FLOW_PORT_NA == baseType)
-					|| (UMLElementTypes.PORT == baseType)) {
-					
+
+				if ((SysMLElementTypes.FLOW_PORT == baseType)
+						|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
+						|| (SysMLElementTypes.FLOW_PORT_OUT == baseType)
+						|| (SysMLElementTypes.FLOW_PORT_IN_OUT == baseType)
+						|| (SysMLElementTypes.FLOW_PORT_NA == baseType)
+						|| (UMLElementTypes.PORT == baseType)) {
+
 					req.setContainer(type);
 				}
-				
-				if(SysMLElementTypes.FLOW_PORT_NA == baseType) {
+
+				if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
 					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
 				}
 			}
 		}
-		
+
 		return super.getCreateCommand(req);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
index d9e20429fa0..f2d6d7fa163 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -40,22 +40,22 @@ public class PartCompartmentSemanticEditPolicy extends CompartmentSemanticEditPo
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		//if extended type, retrieve the sysml closest element element type
-		if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+		// if extended type, retrieve the sysml closest element element type
+		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if(superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
+			if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
 				baseType = SysMLElementTypes.PART_PROPERTY;
-			} else if(superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
+			} else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
 				baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
 			}
 		}
-		
-		
-		if(SysMLElementTypes.PART_PROPERTY == baseType) {
+
+
+		if (SysMLElementTypes.PART_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
 		}
 
-		if(SysMLElementTypes.CONSTRAINT_PROPERTY == baseType) {
+		if (SysMLElementTypes.CONSTRAINT_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateConstraintPropertyWithTypeConfigureCommandFactory());
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
index 270a2a27c7b..91a2fa47c94 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -43,41 +43,41 @@ public class PropertyCompartmentSemanticEditPolicy extends CompartmentSemanticEd
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		//if extended type, retrieve the sysml closest element element type
-		if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+		// if extended type, retrieve the sysml closest element element type
+		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if(superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
+			if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
 				baseType = SysMLElementTypes.PART_PROPERTY;
-			} else if(superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
+			} else if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
 				baseType = SysMLElementTypes.REFERENCE_PROPERTY;
-			} else if(superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
+			} else if (superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
 				baseType = SysMLElementTypes.ACTOR_PART_PROPERTY;
-			} else if(superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
+			} else if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
 				baseType = SysMLElementTypes.VALUE_PROPERTY;
-			} else if(superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
+			} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
 				baseType = SysMLElementTypes.FLOW_PORT_NA;
-			} else if(superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
+			} else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
 				baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
 			}
 		}
-		
-		
-		if(SysMLElementTypes.PART_PROPERTY == baseType) {
+
+
+		if (SysMLElementTypes.PART_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
 		}
-		if(SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
+		if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
 		}
-		if(SysMLElementTypes.ACTOR_PART_PROPERTY ==baseType) {
+		if (SysMLElementTypes.ACTOR_PART_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateActorPartWithTypeConfigureCommandFactory());
 		}
-		if(SysMLElementTypes.VALUE_PROPERTY == baseType) {
+		if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
 		}
-		if(SysMLElementTypes.FLOW_PORT_NA == baseType) {
+		if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
 		}
-		if(SysMLElementTypes.CONSTRAINT_PROPERTY == baseType) {
+		if (SysMLElementTypes.CONSTRAINT_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateConstraintPropertyWithTypeConfigureCommandFactory());
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
index b1a0317456f..b3a3f0b66b1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -38,15 +38,15 @@ public class ReferenceCompartmentSemanticEditPolicy extends CompartmentSemanticE
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		//if extended type, retrieve the sysml closest element element type
-		if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+		// if extended type, retrieve the sysml closest element element type
+		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if(superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
+			if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
 				baseType = SysMLElementTypes.REFERENCE_PROPERTY;
-			} 
+			}
 		}
-		
-		if(SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
+
+		if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
index d162be9e9c6..32054ced1f4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -42,39 +42,39 @@ public class StructureCompartmentSemanticEditPolicy extends CompartmentSemanticE
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		//if extended type, retrieve the sysml closest element element type
-		if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+		// if extended type, retrieve the sysml closest element element type
+		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if(superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
+			if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
 				baseType = SysMLElementTypes.PART_PROPERTY;
-			} else if(superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
+			} else if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
 				baseType = SysMLElementTypes.REFERENCE_PROPERTY;
-			} else if(superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
+			} else if (superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
 				baseType = SysMLElementTypes.ACTOR_PART_PROPERTY;
-			} else if(superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
+			} else if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
 				baseType = SysMLElementTypes.VALUE_PROPERTY;
-			} else if(superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
+			} else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
 				baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
 			}
 		}
-		
-		if(SysMLElementTypes.PART_PROPERTY == baseType) {
+
+		if (SysMLElementTypes.PART_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
 		}
 
-		if(SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
+		if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
 		}
 
-		if(SysMLElementTypes.ACTOR_PART_PROPERTY == baseType) {
+		if (SysMLElementTypes.ACTOR_PART_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateActorPartWithTypeConfigureCommandFactory());
 		}
 
-		if(SysMLElementTypes.VALUE_PROPERTY == baseType) {
+		if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
 		}
 
-		if(SysMLElementTypes.CONSTRAINT_PROPERTY == baseType) {
+		if (SysMLElementTypes.CONSTRAINT_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateConstraintPropertyWithTypeConfigureCommandFactory());
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
index bd61d2b09be..3fe4e94ef6d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -38,15 +38,15 @@ public class ValueCompartmentSemanticEditPolicy extends CompartmentSemanticEditP
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		//if extended type, retrieve the sysml closest element element type
-		if(elementTypeToCreate instanceof IExtendedHintedElementType) {
+		// if extended type, retrieve the sysml closest element element type
+		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
 			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-		    if(superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
+			if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
 				baseType = SysMLElementTypes.VALUE_PROPERTY;
 			}
 		}
-		
-		if(SysMLElementTypes.VALUE_PROPERTY == baseType) {
+
+		if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java
index d134b4f7183..7ea9e69ac80 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/FlowPortFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/FlowPortFigure.java
index 8748a9c778f..f26fbec1536 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/FlowPortFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/FlowPortFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,9 +24,9 @@ public class FlowPortFigure extends AffixedNamedElementFigure {
 
 	/**
 	 * Set the image in FlowPort figure.
-	 * 
+	 *
 	 * @param image
-	 *        the image to show in the FlowPort
+	 *            the image to show in the FlowPort
 	 */
 	public void setImage(Image image) {
 		setIcon(image);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/Messages.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/Messages.java
index da28833808a..2f69592839b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/Messages.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/Messages.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -150,7 +150,7 @@ public class Messages extends NLS {
 	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_SelectNewTypeContainerDialogTitle;
 
 	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_SelectNewTypeContainerDialogMessage;
-	
+
 	static {
 		NLS.initializeMessages("org.eclipse.papyrus.sysml.diagram.common.messages.messages", Messages.class); //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java
index 074dcd63565..63c9bc1314d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.sysml.portandflows.FlowPort;
 import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
 import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
 import org.eclipse.papyrus.uml.diagram.common.parser.PropertyLabelParser;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
 import org.eclipse.uml2.uml.InstanceValue;
 import org.eclipse.uml2.uml.Port;
@@ -58,24 +59,24 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = "";
 		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof Port)) {
+		if ((eObject != null) && (eObject instanceof Port)) {
 
-			Property property = (Property)eObject;
+			Property property = (Property) eObject;
 
 			FlowPort flowPort = UMLUtil.getStereotypeApplication(property, FlowPort.class);
-			if(flowPort != null) {
+			if (flowPort != null) {
 
 				// manage direction only if the FlowPort is type and type is not a FlowSpecification
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_DIRECTION)) {
+				if (maskValues.contains(ICustomAppearance.DISP_DIRECTION)) {
 					String direction;
-					switch(flowPort.getDirection().getValue()) {
+					switch (flowPort.getDirection().getValue()) {
 					case FlowDirection.IN_VALUE:
 						direction = "in";
 						break;
@@ -91,16 +92,16 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 					}
 
 					// manage direction only if the FlowPort is not a FlowSpecification
-					if((property.getType() == null) || ((property.getType() != null) && (UMLUtil.getStereotypeApplication(property.getType(), FlowSpecification.class) == null))) {
+					if ((property.getType() == null) || ((property.getType() != null) && (UMLUtil.getStereotypeApplication(property.getType(), FlowSpecification.class) == null))) {
 						result = String.format(DIRECTION_FORMAT, direction, result);
 					}
 				}
 			}
 
 			// manage visibility
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_VISIBILITY)) {
+			if (maskValues.contains(ICustomAppearance.DISP_VISIBILITY)) {
 				String visibility;
-				switch(property.getVisibility().getValue()) {
+				switch (property.getVisibility().getValue()) {
 				case VisibilityKind.PACKAGE:
 					visibility = "~";
 					break;
@@ -121,27 +122,27 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 			}
 
 			// manage derived modifier
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_DERIVE)) && (property.isDerived())) {
+			if ((maskValues.contains(ICustomAppearance.DISP_DERIVE)) && (property.isDerived())) {
 				result = String.format(DERIVED_FORMAT, result);
 			}
 
 			// manage name
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_NAME)) && (property.isSetName())) {
+			if ((maskValues.contains(ICustomAppearance.DISP_NAME)) && (property.isSetName())) {
 				String name = property.getName();
 				result = String.format(NAME_FORMAT, result, name);
 			}
 
 			// manage type and conjugated property
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_TYPE))) {
+			if ((maskValues.contains(ICustomAppearance.DISP_TYPE))) {
 
 				String type = "<Undefined>";
-				if(property.getType() != null) {
+				if (property.getType() != null) {
 					type = property.getType().getName();
 				}
 
 				// If type is undefined only show "<Undefined>" when explicitly asked.
-				if((maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE)) || (!"<Undefined>".equals(type))) {
-					if((flowPort != null) && (flowPort.isConjugated())) {
+				if ((maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE)) || (!"<Undefined>".equals(type))) {
+					if ((flowPort != null) && (flowPort.isConjugated())) {
 						type = String.format(CONJUGATED_FORMAT, type);
 					}
 					result = String.format(TYPE_FORMAT, result, type);
@@ -149,15 +150,15 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 			}
 
 			// manage multiplicity
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_MULTIPLICITY))) {
+			if ((maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY))) {
 
 				// If multiplicity is [1] (SysML default), only show when explicitly asked.
 				// TODO : add a case for default with multiplicity not set.
 				String lower = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getLowerValue()) : "1";
 				String upper = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getUpperValue()) : "1";
-				if((maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY)) || !("1".equals(lower) && "1".equals(upper))) {
+				if ((maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY)) || !("1".equals(lower) && "1".equals(upper))) {
 
-					if(lower.equals(upper)) {
+					if (lower.equals(upper)) {
 						result = String.format(MULTIPLICITY_FORMAT_ALT, result, lower, upper);
 					} else {
 						result = String.format(MULTIPLICITY_FORMAT, result, lower, upper);
@@ -166,35 +167,35 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 			}
 
 			// manage default value
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_VALUE)) && ((property.getDefaultValue() != null))) {
+			if ((maskValues.contains(ICustomAppearance.DISP_DEFAULT_VALUE)) && ((property.getDefaultValue() != null))) {
 				ValueSpecification valueSpecification = property.getDefaultValue();
-				if(valueSpecification instanceof InstanceValue && property.getType().equals(valueSpecification.getType())) {
+				if (valueSpecification instanceof InstanceValue && property.getType().equals(valueSpecification.getType())) {
 					result = String.format(DEFAULT_VALUE_FORMAT, result, ValueSpecificationUtil.getSpecificationValue(valueSpecification));
 				}
 			}
 
 			// manage modifier
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_MODIFIERS)) {
+			if (maskValues.contains(ICustomAppearance.DISP_MODIFIERS)) {
 				StringBuffer sb = new StringBuffer();
-				if(property.isReadOnly()) {
+				if (property.isReadOnly()) {
 					sb.append(sb.length() == 0 ? "readOnly" : ", readOnly");
 				}
-				if(property.isOrdered()) {
+				if (property.isOrdered()) {
 					sb.append(sb.length() == 0 ? "ordered" : ", ordered");
 				}
-				if(property.isUnique()) {
+				if (property.isUnique()) {
 					sb.append(sb.length() == 0 ? "unique" : ", unique");
 				}
-				if(property.isDerivedUnion()) {
+				if (property.isDerivedUnion()) {
 					sb.append(sb.length() == 0 ? "union" : ", union");
 				}
 				EList<Property> redefinedProperties = property.getRedefinedProperties();
-				if(redefinedProperties != null && !redefinedProperties.isEmpty()) {
-					for(Property p : redefinedProperties) {
+				if (redefinedProperties != null && !redefinedProperties.isEmpty()) {
+					for (Property p : redefinedProperties) {
 						sb.append(sb.length() == 0 ? p.getName() : ", redefines " + p.getName());
 					}
 				}
-				if(sb.length() != 0) {
+				if (sb.length() != 0) {
 					result = String.format(MODIFIER_FORMAT, result, sb.toString());
 				}
 			}
@@ -209,9 +210,9 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
 				return PortandflowsPackage.eINSTANCE.getFlowPort_Direction().equals(feature) || PortandflowsPackage.eINSTANCE.getFlowPort_IsConjugated().equals(feature) || super.isAffectingEvent(event, flags);
 			}
 		}
@@ -226,11 +227,11 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = super.getSemanticElementsBeingParsed(element);
 
-		if((element != null) && (element instanceof Port)) {
-			Port semElement = (Port)element;
+		if ((element != null) && (element instanceof Port)) {
+			Port semElement = (Port) element;
 
 			FlowPort flowPort = UMLUtil.getStereotypeApplication(semElement, FlowPort.class);
-			if(flowPort != null) {
+			if (flowPort != null) {
 				semanticElementsBeingParsed.add(flowPort);
 			}
 		}
@@ -240,21 +241,21 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ILabelPreferenceConstants.DISP_DIRECTION, "Direction");
-		masks.put(ILabelPreferenceConstants.DISP_VISIBILITY, "Visibility");
-		masks.put(ILabelPreferenceConstants.DISP_DERIVE, "Is Derived");
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_TYPE, "Type");
+		masks.put(ICustomAppearance.DISP_DIRECTION, "Direction");
+		masks.put(ICustomAppearance.DISP_VISIBILITY, "Visibility");
+		masks.put(ICustomAppearance.DISP_DERIVE, "Is Derived");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_TYPE, "Type");
 		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
-		masks.put(ILabelPreferenceConstants.DISP_MULTIPLICITY, "Multiplicity");
+		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
 		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY, "Show default multiplicity");
-		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_VALUE, "Default Value");
-		masks.put(ILabelPreferenceConstants.DISP_MODIFIERS, "Modifiers");
+		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default Value");
+		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
 		return masks;
 	}
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_DIRECTION, ILabelPreferenceConstants.DISP_NAME, ILabelPreferenceConstants.DISP_TYPE, ILabelPreferenceConstants.DISP_UNDEFINED_TYPE);
+		return Arrays.asList(ICustomAppearance.DISP_DIRECTION, ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE, ILabelPreferenceConstants.DISP_UNDEFINED_TYPE);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPropertyLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPropertyLabelParser.java
index a21692e2a96..5c6240773ba 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPropertyLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPropertyLabelParser.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
 import org.eclipse.papyrus.sysml.portandflows.FlowProperty;
 import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
 import org.eclipse.papyrus.uml.diagram.common.parser.PropertyLabelParser;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
@@ -48,23 +49,23 @@ public class FlowPropertyLabelParser extends PropertyLabelParser {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = super.getPrintString(element, flags);
 
 		EObject eObject = EMFHelper.getEObject(element);
-		if((eObject != null) && (eObject instanceof Property)) {
+		if ((eObject != null) && (eObject instanceof Property)) {
 
-			Property property = (Property)eObject;
+			Property property = (Property) eObject;
 			FlowProperty flowProperty = UMLUtil.getStereotypeApplication(property, FlowProperty.class);
-			if(flowProperty != null) {
+			if (flowProperty != null) {
 
 				// manage direction
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_DIRECTION)) {
+				if (maskValues.contains(ICustomAppearance.DISP_DIRECTION)) {
 					String direction;
-					switch(flowProperty.getDirection().getValue()) {
+					switch (flowProperty.getDirection().getValue()) {
 					case FlowDirection.IN_VALUE:
 						direction = "in";
 						break;
@@ -92,9 +93,9 @@ public class FlowPropertyLabelParser extends PropertyLabelParser {
 	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
 				return PortandflowsPackage.eINSTANCE.getFlowProperty_Direction().equals(feature) || super.isAffectingEvent(event, flags);
 			}
 		}
@@ -109,11 +110,11 @@ public class FlowPropertyLabelParser extends PropertyLabelParser {
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = super.getSemanticElementsBeingParsed(element);
 
-		if((element != null) && (element instanceof Property)) {
-			Property semElement = (Property)element;
+		if ((element != null) && (element instanceof Property)) {
+			Property semElement = (Property) element;
 
 			FlowProperty flowProperty = UMLUtil.getStereotypeApplication(semElement, FlowProperty.class);
-			if(flowProperty != null) {
+			if (flowProperty != null) {
 				semanticElementsBeingParsed.add(flowProperty);
 			}
 		}
@@ -123,21 +124,21 @@ public class FlowPropertyLabelParser extends PropertyLabelParser {
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>(10);
-		masks.put(ILabelPreferenceConstants.DISP_DIRECTION, "Direction");
-		masks.put(ILabelPreferenceConstants.DISP_VISIBILITY, "Visibility");
-		masks.put(ILabelPreferenceConstants.DISP_DERIVE, "Is Derived");
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_TYPE, "Type");
+		masks.put(ICustomAppearance.DISP_DIRECTION, "Direction");
+		masks.put(ICustomAppearance.DISP_VISIBILITY, "Visibility");
+		masks.put(ICustomAppearance.DISP_DERIVE, "Is Derived");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_TYPE, "Type");
 		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
-		masks.put(ILabelPreferenceConstants.DISP_MULTIPLICITY, "Multiplicity");
+		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
 		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY, "Show default multiplicity");
-		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_VALUE, "Default Value");
-		masks.put(ILabelPreferenceConstants.DISP_MODIFIERS, "Modifiers");
+		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default Value");
+		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
 		return masks;
 	}
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_DIRECTION, ILabelPreferenceConstants.DISP_NAME, ILabelPreferenceConstants.DISP_TYPE, ILabelPreferenceConstants.DISP_UNDEFINED_TYPE);
+		return Arrays.asList(ICustomAppearance.DISP_DIRECTION, ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE, ILabelPreferenceConstants.DISP_UNDEFINED_TYPE);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/RequirementLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/RequirementLabelParser.java
index c9665eb6cf8..548984a5c1f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/RequirementLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/RequirementLabelParser.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.requirements.Requirement;
 import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
@@ -48,29 +49,29 @@ public class RequirementLabelParser extends NamedElementLabelParser {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = "";
-		EObject eObject =EMFHelper.getEObject(element);
+		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof Class)) {
+		if ((eObject != null) && (eObject instanceof Class)) {
 
-			Class clazz = (Class)eObject;
+			Class clazz = (Class) eObject;
 			Requirement requirement = UMLUtil.getStereotypeApplication(clazz, Requirement.class);
 
 			// manage name
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_NAME)) {
+			if (maskValues.contains(ICustomAppearance.DISP_NAME)) {
 				String name = clazz.getName();
 				result = String.format(NAME_FORMAT, name);
 			}
 
 
-			if(requirement != null) {
+			if (requirement != null) {
 
 				// manage id
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_ID)) {
+				if (maskValues.contains(ILabelPreferenceConstants.DISP_ID)) {
 					String id = requirement.getId();
 					result = String.format(ID_FORMAT, result, id);
 				}
@@ -87,13 +88,13 @@ public class RequirementLabelParser extends NamedElementLabelParser {
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 
-		if((element != null) && (element instanceof Class)) {
-			Class semElement = (Class)element;
+		if ((element != null) && (element instanceof Class)) {
+			Class semElement = (Class) element;
 
 			semanticElementsBeingParsed.add(semElement);
 
 			Requirement requirement = UMLUtil.getStereotypeApplication(semElement, Requirement.class);
-			if(requirement != null) {
+			if (requirement != null) {
 				semanticElementsBeingParsed.add(requirement);
 			}
 		}
@@ -103,13 +104,13 @@ public class RequirementLabelParser extends NamedElementLabelParser {
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
 		masks.put(ILabelPreferenceConstants.DISP_ID, "Id");
 		return masks;
 	}
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_NAME, ILabelPreferenceConstants.DISP_ID);
+		return Arrays.asList(ICustomAppearance.DISP_NAME, ILabelPreferenceConstants.DISP_ID);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/UnitLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/UnitLabelParser.java
index 7b15a33dff8..041a725ad39 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/UnitLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/UnitLabelParser.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.sysml.blocks.Dimension;
 import org.eclipse.papyrus.sysml.blocks.Unit;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
@@ -52,31 +53,31 @@ public class UnitLabelParser extends NamedElementLabelParser {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = "";
 		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof InstanceSpecification)) {
+		if ((eObject != null) && (eObject instanceof InstanceSpecification)) {
 
-			InstanceSpecification iSpec = (InstanceSpecification)eObject;
+			InstanceSpecification iSpec = (InstanceSpecification) eObject;
 
 			Unit unit = UMLUtil.getStereotypeApplication(iSpec, Unit.class);
 
 			// manage name
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_NAME)) && (iSpec.isSetName())) {
+			if ((maskValues.contains(ICustomAppearance.DISP_NAME)) && (iSpec.isSetName())) {
 				String name = iSpec.getName();
 				result = String.format(NAME_FORMAT, name);
 			}
 
 			// manage dimension
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_DIMENSION))) {
+			if ((maskValues.contains(ILabelPreferenceConstants.DISP_DIMENSION))) {
 				String dimensionName = "<Undefined>";
-				if((unit != null) && (unit.getDimension() != null)) {
+				if ((unit != null) && (unit.getDimension() != null)) {
 					Dimension dim = unit.getDimension();
-					if((dim.getBase_InstanceSpecification() != null) && (dim.getBase_InstanceSpecification().isSetName())) {
+					if ((dim.getBase_InstanceSpecification() != null) && (dim.getBase_InstanceSpecification().isSetName())) {
 						dimensionName = dim.getBase_InstanceSpecification().getName();
 					}
 				}
@@ -94,9 +95,9 @@ public class UnitLabelParser extends NamedElementLabelParser {
 	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
 				return BlocksPackage.eINSTANCE.getUnit_Dimension().equals(feature) || super.isAffectingEvent(event, flags);
 			}
 		}
@@ -111,13 +112,13 @@ public class UnitLabelParser extends NamedElementLabelParser {
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 
-		if((element != null) && (element instanceof InstanceSpecification)) {
-			InstanceSpecification semElement = (InstanceSpecification)element;
+		if ((element != null) && (element instanceof InstanceSpecification)) {
+			InstanceSpecification semElement = (InstanceSpecification) element;
 
 			semanticElementsBeingParsed.add(semElement);
 
 			Unit unit = UMLUtil.getStereotypeApplication(semElement, Unit.class);
-			if(unit != null) {
+			if (unit != null) {
 				semanticElementsBeingParsed.add(unit);
 			}
 		}
@@ -128,13 +129,13 @@ public class UnitLabelParser extends NamedElementLabelParser {
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
 		masks.put(ILabelPreferenceConstants.DISP_DIMENSION, "Dimension");
 		return masks;
 	}
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_NAME, ILabelPreferenceConstants.DISP_DIMENSION);
+		return Arrays.asList(ICustomAppearance.DISP_NAME, ILabelPreferenceConstants.DISP_DIMENSION);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/LabelPreferenceHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/LabelPreferenceHelper.java
index b748bc77fe8..82cc7dd3ec7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/LabelPreferenceHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/LabelPreferenceHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -20,15 +20,15 @@ public class LabelPreferenceHelper {
 
 	/**
 	 * Create the preference constant for a label view.
-	 * 
+	 *
 	 * @param diagramType
-	 *        the type of diagram
+	 *            the type of diagram
 	 * @param viewType
-	 *        the type of the view
+	 *            the type of the view
 	 * @param constantPreferenceKey
-	 *        the constant key of the preference to retrieve
+	 *            the constant key of the preference to retrieve
 	 * @return the complete preference key
-	 * @deprecated see https://bugs.eclipse.org/bugs/show_bug.cgi?id=353193 
+	 * @deprecated see https://bugs.eclipse.org/bugs/show_bug.cgi?id=353193
 	 */
 	@Deprecated
 	public static String getPreferenceConstant(String diagramType, String viewType, String constantPreferenceKey) {
@@ -37,11 +37,11 @@ public class LabelPreferenceHelper {
 
 	/**
 	 * Create the preference constant for a label view.
-	 * 
+	 *
 	 * @param elementkey
-	 *        the element key (including diagram hint)
+	 *            the element key (including diagram hint)
 	 * @param constantPreferenceKey
-	 *        the constant key of the preference to retrieve
+	 *            the constant key of the preference to retrieve
 	 * @return the complete preference key
 	 */
 	public static String getPreferenceConstant(String elementkey, String constantPreferenceKey) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/dnd/helper/LinkMappingHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/dnd/helper/LinkMappingHelper.java
index 77b035429e7..0f4f2fca2a9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/dnd/helper/LinkMappingHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/dnd/helper/LinkMappingHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -31,6 +31,7 @@ public class LinkMappingHelper implements ILinkMappingHelper {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public Collection<?> getSource(Element link) {
 		CommonSourceUMLSwitch umlSwitch = new CommonSourceUMLSwitch();
 		return umlSwitch.doSwitch(link);
@@ -39,6 +40,7 @@ public class LinkMappingHelper implements ILinkMappingHelper {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public Collection<?> getTarget(Element link) {
 		CommonTargetUMLSwitch umlSwitch = new CommonTargetUMLSwitch();
 		return umlSwitch.doSwitch(link);
@@ -46,7 +48,7 @@ public class LinkMappingHelper implements ILinkMappingHelper {
 
 	/**
 	 * Contains diagrams common behavior that need to be redefined
-	 * 
+	 *
 	 * @author eperico
 	 */
 	public static class CommonSourceUMLSwitch extends UMLSwitch<Collection<?>> {
@@ -102,7 +104,7 @@ public class LinkMappingHelper implements ILinkMappingHelper {
 
 	/**
 	 * Contains diagrams common behavior that need to be redefined
-	 * 
+	 *
 	 * @author eperico
 	 */
 	public static class CommonTargetUMLSwitch extends UMLSwitch<Collection<?>> {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java
index c71b4be9683..7b5545c6e91 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -59,6 +59,7 @@ public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPa
 		super(view);
 	}
 
+	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
@@ -72,8 +73,9 @@ public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPa
 		return primaryShape = new AffixedNamedElementFigure();
 	}
 
+	@Override
 	public AffixedNamedElementFigure getPrimaryShape() {
-		return (AffixedNamedElementFigure)primaryShape;
+		return (AffixedNamedElementFigure) primaryShape;
 	}
 
 	/**
@@ -82,9 +84,9 @@ public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPa
 	@Override
 	public IBorderItemLocator getBorderItemLocator() {
 		IFigure parentFigure = getFigure().getParent();
-		if(parentFigure != null && parentFigure.getLayoutManager() != null) {
+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator)constraint;
+			return (IBorderItemLocator) constraint;
 		}
 		return null;
 	}
@@ -98,17 +100,17 @@ public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPa
 		// edit part from the registry. Once removed from the registry the visibility cannot be set back to visible.
 
 		// Copied from generated code for Affixed nodes to fix:
-		//		366504: [SysML Block Definition Diagram] Cannot make masked labels of border items (Port) visible
-		//		https://bugs.eclipse.org/bugs/show_bug.cgi?id=366504
-		//		366503: [SysML Internal Block Diagram] Cannot make masked labels of border items (Port) visible
-		//		https://bugs.eclipse.org/bugs/show_bug.cgi?id=366503
+		// 366504: [SysML Block Definition Diagram] Cannot make masked labels of border items (Port) visible
+		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=366504
+		// 366503: [SysML Internal Block Diagram] Cannot make masked labels of border items (Port) visible
+		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=366503
 
 		// (this sounds strange as the "Show all labels" manages to get labels back without trouble...).
-		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
+		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
 			Object notifier = event.getNotifier();
-			List<?> modelChildren = ((View)getModel()).getChildren();
-			if(!(notifier instanceof Edge)) {
-				if(modelChildren.contains(event.getNotifier())) {
+			List<?> modelChildren = ((View) getModel()).getChildren();
+			if (!(notifier instanceof Edge)) {
+				if (modelChildren.contains(event.getNotifier())) {
 					return;
 				}
 			}
@@ -121,13 +123,13 @@ public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPa
 	 */
 	@Override
 	protected void refreshBounds() {
-		if(getBorderItemLocator() != null) {
-			int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-			int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+		if (getBorderItemLocator() != null) {
+			int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+			int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
 			Point loc = new Point(x, y);
 
-			int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-			int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+			int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+			int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
 			Dimension size = new Dimension(width, height);
 
 			// Update locator constraint
@@ -149,11 +151,12 @@ public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPa
 		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
 
-		//FIXME: workaround for #154536
+		// FIXME: workaround for #154536
 		result.getBounds().setSize(result.getPreferredSize());
 		return result;
 	}
 
+	@Override
 	protected NodeFigure createMainFigure() {
 		NodeFigure figure = createNodePlate();
 		figure.setLayoutManager(new StackLayout());
@@ -170,57 +173,60 @@ public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPa
 	/**
 	 * @generated
 	 */
+	@Override
 	public IFigure getContentPane() {
-		if(contentPane != null) {
+		if (contentPane != null) {
 			return contentPane;
 		}
 		return super.getContentPane();
 	}
 
+	@Override
 	protected void setForegroundColor(Color color) {
-		if(primaryShape != null) {
+		if (primaryShape != null) {
 			primaryShape.setForegroundColor(color);
 		}
 	}
 
+	@Override
 	public abstract EditPart getPrimaryChildEditPart();
 
 	@Override
 	public Object getPreferredValue(EStructuralFeature feature) {
 		String prefKey = getNotationView().getType();
 
-		IPreferenceStore store = (IPreferenceStore)getDiagramPreferencesHint().getPreferenceStore();
+		IPreferenceStore store = (IPreferenceStore) getDiagramPreferencesHint().getPreferenceStore();
 		Object result = null;
 
-		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
+		if (feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
 
 			String prefColor = null;
-			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
+			if (feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
 				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_LINE);
 
-			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
+			} else if (feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
 				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FONT);
 
-			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
+			} else if (feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
 				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FILL);
 
 			}
-			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)store, prefColor));
+			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(store, prefColor));
 
-		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
+		} else if (feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
 
 			String prefGradient = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_GRADIENT);
 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(prefGradient));
-			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
+			if (feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
 				result = new Integer(gradientPreferenceConverter.getTransparency());
 
-			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
+			} else if (feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
 				result = gradientPreferenceConverter.getGradientData();
 
 			}
 		}
 
-		if(result == null) {
+		if (result == null) {
 			result = getStructuralFeatureValue(feature);
 		}
 		return result;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementChildLabelEditPart.java
index 86f26591e1b..6ce09923fa3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementChildLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementChildLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -134,10 +134,10 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 
 	@Override
 	public DragTracker getDragTracker(Request request) {
-		if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {
+		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
 			return null;
 		}
-		//return new DragEditPartsTrackerEx(this);
+		// return new DragEditPartsTrackerEx(this);
 		// Disable current child label DnD as this is not correctly handled by Papyrus.
 		return new SelectEditPartTracker(this);
 	}
@@ -154,42 +154,42 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	}
 
 	protected String getLabelTextHelper(IFigure figure) {
-		if(figure instanceof WrappingLabel) {
-			return ((WrappingLabel)figure).getText();
-		} else if(figure instanceof ILabelFigure) {
-			return ((ILabelFigure)figure).getText();
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
 		} else {
-			return ((Label)figure).getText();
+			return ((Label) figure).getText();
 		}
 	}
 
 	protected void setLabelTextHelper(IFigure figure, String text) {
-		if(figure instanceof WrappingLabel) {
-			((WrappingLabel)figure).setText(text);
-		} else if(figure instanceof ILabelFigure) {
-			((ILabelFigure)figure).setText(text);
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
 		} else {
-			((Label)figure).setText(text);
+			((Label) figure).setText(text);
 		}
 	}
 
 	protected Image getLabelIconHelper(IFigure figure) {
-		if(figure instanceof WrappingLabel) {
-			return ((WrappingLabel)figure).getIcon();
-		} else if(figure instanceof ILabelFigure) {
-			return ((ILabelFigure)figure).getIcon();
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
 		} else {
-			return ((Label)figure).getIcon();
+			return ((Label) figure).getIcon();
 		}
 	}
 
 	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if(figure instanceof WrappingLabel) {
-			((WrappingLabel)figure).setIcon(icon);
-		} else if(figure instanceof ILabelFigure) {
-			((ILabelFigure)figure).setIcon(icon);
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
 		} else {
-			((Label)figure).setIcon(icon);
+			((Label) figure).setIcon(icon);
 		}
 	}
 
@@ -211,19 +211,20 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 		return null;
 	}
 
+	@Override
 	public EObject getParserElement() {
 		return resolveSemanticElement();
 	}
 
 	protected Image getLabelIcon() {
 		EObject parserElement = getParserElement();
-		if(parserElement == null) {
+		if (parserElement == null) {
 			return null;
 		}
 
 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for(View view : views) {
-			if(NameLabelIconHelper.showLabelIcon(view)) {
+		for (View view : views) {
+			if (NameLabelIconHelper.showLabelIcon(view)) {
 				return Activator.getInstance().getLabelProvider().getImage(parserElement);
 			}
 		}
@@ -234,29 +235,31 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	protected String getLabelText() {
 		String text = null;
 		EObject parserElement = getParserElement();
-		if(parserElement != null && getParser() != null) {
+		if (parserElement != null && getParser() != null) {
 			text = getParser().getPrintString(new SemanticAdapter(parserElement, getNotationView()), getParserOptions().intValue());
 		}
-		if(text == null || text.length() == 0) {
+		if (text == null || text.length() == 0) {
 			text = defaultText;
 		}
 		return text;
 	}
 
+	@Override
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if(pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if(sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
 		}
 	}
 
+	@Override
 	public String getEditText() {
-		if(getParserElement() == null || getParser() == null) {
+		if (getParserElement() == null || getParser() == null) {
 			return ""; //$NON-NLS-1$
 		}
 		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
@@ -266,21 +269,24 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 		return getParser() != null;
 	}
 
+	@Override
 	public ICellEditorValidator getEditTextValidator() {
 		return new ICellEditorValidator() {
 
+			@Override
 			public String isValid(final Object value) {
-				if(value instanceof String) {
+				if (value instanceof String) {
 					final EObject element = getParserElement();
 					final IParser parser = getParser();
 					try {
-						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
 
+							@Override
 							public void run() {
-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));
+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
 							}
 						});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
 					} catch (InterruptedException ie) {
 						ie.printStackTrace();
 					}
@@ -292,22 +298,24 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 		};
 	}
 
+	@Override
 	public IContentAssistProcessor getCompletionProcessor() {
-		if(getParserElement() == null || getParser() == null) {
+		if (getParserElement() == null || getParser() == null) {
 			return null;
 		}
 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
 	}
 
+	@Override
 	public ParserOptions getParserOptions() {
-		if(getNotationView() == null || getNotationView().getDiagram() == null) {
+		if (getNotationView() == null || getNotationView().getDiagram() == null) {
 			return ParserOptions.NONE;
 		}
 
-		//		int displayOptions = AppearanceHelper.getLabelDisplay(getNotationView());
+		// int displayOptions = AppearanceHelper.getLabelDisplay(getNotationView());
 
 		EAnnotation display = getNotationView().getEAnnotation(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION);
-		if(display == null) {
+		if (display == null) {
 			return getDefaultParserOptions();
 		}
 
@@ -316,30 +324,32 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 		return new ParserOptions(displayOptions);
 	}
 
+	@Override
 	public ParserOptions getDefaultParserOptions() {
 
-		if(getNotationView() == null || getNotationView().getDiagram() == null) {
+		if (getNotationView() == null || getNotationView().getDiagram() == null) {
 			return ParserOptions.NONE;
 		}
 
 		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
 		int displayOptions = store.getInt(LabelPreferenceHelper.getPreferenceConstant(getLabelPreferenceKey(), ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE));
-		if(displayOptions == 0) {
+		if (displayOptions == 0) {
 			return ParserOptions.NONE;
 		}
 
 		return new ParserOptions(displayOptions);
 	}
 
+	@Override
 	public IParser getParser() {
-		if(parser == null) {
+		if (parser == null) {
 			parser = ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), resolveSemanticElement(), getNotationView().getType()));
 		}
 		return parser;
 	}
 
 	protected DirectEditManager getManager() {
-		if(manager == null) {
+		if (manager == null) {
 			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), CellEditorLocatorUtil.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -363,8 +373,8 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	 * @generated
 	 */
 	protected void performDirectEdit(Point eventLocation) {
-		if(getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
 		}
 	}
 
@@ -372,8 +382,8 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	 * @generated
 	 */
 	private void performDirectEdit(char initialCharacter) {
-		if(getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager)getManager()).show(initialCharacter);
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
 		} else {
 			performDirectEdit();
 		}
@@ -387,40 +397,40 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 
 		final Request theRequest = request;
 
-		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
 			directEditionMode = getDirectEditionType();
 		}
-		switch(directEditionMode) {
+		switch (directEditionMode) {
 		case IDirectEdition.NO_DIRECT_EDITION:
 			// no direct edition mode => does nothing
 			return;
 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
 			updateExtendedEditorConfiguration();
-			if(configuration == null || configuration.getLanguage() == null) {
+			if (configuration == null || configuration.getLanguage() == null) {
 				performDefaultDirectEditorEdit(theRequest);
 			} else {
 				configuration.preEditAction(resolveSemanticElement());
 				Dialog dialog = null;
-				if(configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);
+				if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
 					helper.showEditor();
 					return;
-				} else if(configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if(configuration instanceof IDirectEditorConfiguration) {
+				} else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
 					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
 				} else {
 					return;
 				}
 				final Dialog finalDialog = dialog;
 
-				if(Window.OK == dialog.open()) {
+				if (Window.OK == dialog.open()) {
 					TransactionalEditingDomain domain = getEditingDomain();
 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
 
 						@Override
 						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
 
 						}
 					};
@@ -434,13 +444,14 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 			try {
 				getEditingDomain().runExclusive(new Runnable() {
 
+					@Override
 					public void run() {
-						if(isActive() && isEditable()) {
-							if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-								Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+						if (isActive() && isEditable()) {
+							if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+								Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
 								performDirectEdit(initialChar.charValue());
-							} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-								DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+							} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+								DirectEditRequest editRequest = (DirectEditRequest) theRequest;
 								performDirectEdit(editRequest.getLocation());
 							} else {
 								performDirectEdit();
@@ -473,33 +484,33 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 		setLabelIconHelper(getFigure(), getLabelIcon());
 
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if(pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if(sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
 		}
 	}
 
 	protected void refreshUnderline() {
-		FontStyle style = (FontStyle)getView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());
+		FontStyle style = (FontStyle) getView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
 		}
 	}
 
 	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle)getView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		FontStyle style = (FontStyle) getView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
 		}
 	}
 
 	@Override
 	protected void refreshFont() {
-		FontStyle style = (FontStyle)getView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null) {
+		FontStyle style = (FontStyle) getView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
 			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
 			setFont(fontData);
 		}
@@ -512,11 +523,11 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 
 	@Override
 	protected void addSemanticListeners() {
-		if(getParser() instanceof ISemanticParser) {
+		if (getParser() instanceof ISemanticParser) {
 			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);
-			for(int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
 			}
 		} else {
 			super.addSemanticListeners();
@@ -525,8 +536,8 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 
 	@Override
 	protected void removeSemanticListeners() {
-		if(parserElements != null) {
-			for(int i = 0; i < parserElements.size(); i++) {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
 			}
 		} else {
@@ -536,7 +547,7 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 
 	@Override
 	protected AccessibleEditPart getAccessibleEditPart() {
-		if(accessibleEP == null) {
+		if (accessibleEP == null) {
 			accessibleEP = new AccessibleGraphicalEditPart() {
 
 				@Override
@@ -549,15 +560,15 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	}
 
 	private View getView() {
-		return (View)getModel();
+		return (View) getModel();
 	}
 
 	public int getDirectEditionType() {
-		if(checkExtendedEditor()) {
+		if (checkExtendedEditor()) {
 			initExtendedEditorConfiguration();
 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
 		}
-		if(checkDefaultEdition()) {
+		if (checkDefaultEdition()) {
 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
 		}
 
@@ -566,7 +577,7 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	}
 
 	protected boolean checkExtendedEditor() {
-		if(resolveSemanticElement() != null) {
+		if (resolveSemanticElement() != null) {
 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
 		}
 		return false;
@@ -577,9 +588,9 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	}
 
 	protected void initExtendedEditorConfiguration() {
-		if(configuration == null) {
+		if (configuration == null) {
 			final String languagePreferred = Activator.getInstance().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if(languagePreferred != null && !languagePreferred.equals("")) {
+			if (languagePreferred != null && !languagePreferred.equals("")) {
 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
 			} else {
 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
@@ -589,9 +600,9 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 
 	protected void updateExtendedEditorConfiguration() {
 		String languagePreferred = Activator.getInstance().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
+		if (languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
 			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
 			configuration = null;
 		}
 	}
@@ -601,13 +612,14 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 		try {
 			getEditingDomain().runExclusive(new Runnable() {
 
+				@Override
 				public void run() {
-					if(isActive() && isEditable()) {
-						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
 							performDirectEdit(initialChar.charValue());
-						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
 							performDirectEdit(editRequest.getLocation());
 						} else {
 							performDirectEdit();
@@ -635,28 +647,29 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	@Override
 	protected void handleNotificationEvent(Notification event) {
 		Object feature = event.getFeature();
-		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer)event.getNewValue();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
 			refreshUnderline();
-		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
 			refreshStrikeThrough();
-		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
 			refreshFont();
-		} else if(NotationPackage.eINSTANCE.getView_SourceEdges().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getView_SourceEdges().equals(feature)) {
 			refreshSourceConnections();
-		} else if(NotationPackage.eINSTANCE.getView_TargetEdges().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getView_TargetEdges().equals(feature)) {
 			refreshTargetConnections();
 		} else {
-			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
 				refreshLabel();
 			}
-			if(getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser)getParser();
-				if(modelParser.areSemanticElementsAffected(null, event)) {
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser = (ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
 					removeSemanticListeners();
-					if(resolveSemanticElement() != null) {
+					if (resolveSemanticElement() != null) {
 						addSemanticListeners();
 					}
 					refreshLabel();
@@ -696,42 +709,44 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	/*
 	 * (non-Javadoc)
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getModelSourceConnections()
-	 *
+	 * 
 	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelSourceConnections()
 	 */
 	@Override
 	protected List getModelSourceConnections() {
-		return ViewUtil.getSourceConnectionsConnectingVisibleViews((View)getModel());
+		return ViewUtil.getSourceConnectionsConnectingVisibleViews((View) getModel());
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getModelTargetConnections()
-	 *
+	 * 
 	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelTargetConnections()
 	 */
 	@Override
 	protected List getModelTargetConnections() {
-		return ViewUtil.getTargetConnectionsConnectingVisibleViews((View)getModel());
+		return ViewUtil.getTargetConnectionsConnectingVisibleViews((View) getModel());
 	}
 
 
 	/*
 	 * (non-Javadoc)
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getSourceConnectionAnchor()
-	 *
+	 * 
 	 * @see org.eclipse.gef.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
 	 */
+	@Override
 	public ConnectionAnchor getSourceConnectionAnchor(org.eclipse.gef.ConnectionEditPart connEditPart) {
-		final org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart connection = (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart)connEditPart;
+		final org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart connection = (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart) connEditPart;
 		String t = ""; //$NON-NLS-1$
 		try {
-			t = (String)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
+			t = (String) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
 
+				@Override
 				public void run() {
-					Anchor a = ((Edge)connection.getModel()).getSourceAnchor();
-					if(a instanceof IdentityAnchor) {
-						setResult(((IdentityAnchor)a).getId());
+					Anchor a = ((Edge) connection.getModel()).getSourceAnchor();
+					if (a instanceof IdentityAnchor) {
+						setResult(((IdentityAnchor) a).getId());
 					} else {
 						setResult(""); //$NON-NLS-1$
 					}
@@ -747,13 +762,13 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	/*
 	 * (non-Javadoc)
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getAnchorableFigure()
-	 *
+	 * 
 	 * @see org.eclipse.gef.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.Request)
 	 */
 	protected IAnchorableFigure getAnchorableFigure() {
 		IFigure myFigure = getFigure();
-		if(myFigure instanceof IAnchorableFigure) {
-			return (IAnchorableFigure)myFigure;
+		if (myFigure instanceof IAnchorableFigure) {
+			return (IAnchorableFigure) myFigure;
 		}
 		throw new RuntimeException("The figure of this element should be an IAnchorable Figure");//
 	}
@@ -762,18 +777,19 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	/*
 	 * (non-Javadoc)
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getSourceConnectionAnchor()
-	 *
+	 * 
 	 * @see org.eclipse.gef.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.Request)
 	 */
+	@Override
 	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-		if(request instanceof ReconnectRequest) {
-			if(((DropRequest)request).getLocation() == null) {
+		if (request instanceof ReconnectRequest) {
+			if (((DropRequest) request).getLocation() == null) {
 				return getAnchorableFigure().getSourceConnectionAnchorAt(null);
 			}
-			Point pt = ((DropRequest)request).getLocation().getCopy();
+			Point pt = ((DropRequest) request).getLocation().getCopy();
 			return getAnchorableFigure().getSourceConnectionAnchorAt(pt);
-		} else if(request instanceof DropRequest) {
-			return getAnchorableFigure().getSourceConnectionAnchorAt(((DropRequest)request).getLocation());
+		} else if (request instanceof DropRequest) {
+			return getAnchorableFigure().getSourceConnectionAnchorAt(((DropRequest) request).getLocation());
 		}
 		return getAnchorableFigure().getSourceConnectionAnchorAt(null);
 	}
@@ -782,20 +798,22 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	/*
 	 * (non-Javadoc)
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getTargetConnectionAnchor()
-	 *
+	 * 
 	 * @see org.eclipse.gef.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
 	 */
+	@Override
 	public ConnectionAnchor getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart connEditPart) {
-		final org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart connection = (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart)connEditPart;
+		final org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart connection = (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart) connEditPart;
 
 		String t = ""; //$NON-NLS-1$
 		try {
-			t = (String)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
+			t = (String) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
 
+				@Override
 				public void run() {
-					Anchor a = ((Edge)connection.getModel()).getTargetAnchor();
-					if(a instanceof IdentityAnchor) {
-						setResult(((IdentityAnchor)a).getId());
+					Anchor a = ((Edge) connection.getModel()).getTargetAnchor();
+					if (a instanceof IdentityAnchor) {
+						setResult(((IdentityAnchor) a).getId());
 					} else {
 						setResult(""); //$NON-NLS-1$
 					}
@@ -815,18 +833,19 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	/*
 	 * (non-Javadoc)
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getTargetConnectionAnchor()
-	 *
+	 * 
 	 * @see org.eclipse.gef.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.Request)
 	 */
+	@Override
 	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-		if(request instanceof ReconnectRequest) {
-			if(((DropRequest)request).getLocation() == null) {
+		if (request instanceof ReconnectRequest) {
+			if (((DropRequest) request).getLocation() == null) {
 				return getAnchorableFigure().getTargetConnectionAnchorAt(null);
 			}
-			Point pt = ((DropRequest)request).getLocation().getCopy();
+			Point pt = ((DropRequest) request).getLocation().getCopy();
 			return getAnchorableFigure().getTargetConnectionAnchorAt(pt);
-		} else if(request instanceof DropRequest) {
-			return getAnchorableFigure().getTargetConnectionAnchorAt(((DropRequest)request).getLocation());
+		} else if (request instanceof DropRequest) {
+			return getAnchorableFigure().getTargetConnectionAnchorAt(((DropRequest) request).getLocation());
 		}
 		return getAnchorableFigure().getTargetConnectionAnchorAt(null);
 	}
@@ -835,9 +854,10 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	/*
 	 * (non-Javadoc)
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#mapConnectionAnchorToTerminal()
-	 *
+	 * 
 	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart#mapConnectionAnchorToTerminal(org.eclipse.draw2d.ConnectionAnchor)
 	 */
+	@Override
 	final public String mapConnectionAnchorToTerminal(ConnectionAnchor c) {
 		return getAnchorableFigure().getConnectionAnchorTerminal(c);
 	}
@@ -845,9 +865,10 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 	/*
 	 * (non-Javadoc)
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#mapTerminalToConnectionAnchor()
-	 *
+	 * 
 	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart#mapTerminalToConnectionAnchor(java.lang.String)
 	 */
+	@Override
 	final public ConnectionAnchor mapTerminalToConnectionAnchor(String terminal) {
 		return getAnchorableFigure().getConnectionAnchor(terminal);
 	}
@@ -855,10 +876,11 @@ public class AbstractElementChildLabelEditPart extends GraphicalEditPart impleme
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INotableEditPart#canAttachNote()
 	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#canAttachNote()
 	 */
+	@Override
 	public boolean canAttachNote() {
 		return true;
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java
index 4ecb09dba5a..4b7d280fa1b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java
@@ -7,14 +7,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.edit.part;
 
 import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;
@@ -57,6 +56,7 @@ public abstract class AbstractElementEditPart extends NamedElementEditPart {
 		setCompartmentLayoutHelper(BasicClassifierCompartmentLayoutHelper.getInstances());
 	}
 
+	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
@@ -65,35 +65,41 @@ public abstract class AbstractElementEditPart extends NamedElementEditPart {
 
 	protected abstract LayoutEditPolicy createLayoutEditPolicy();
 
+	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new ClassifierFigure();
 	}
 
+	@Override
 	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure)primaryShape;
+		return (NodeNamedElementFigure) primaryShape;
 	}
 
 	protected abstract boolean addFixedChild(EditPart childEditPart);
 
 	protected abstract boolean removeFixedChild(EditPart childEditPart);
 
+	@Override
 	protected void addChildVisual(EditPart childEditPart, int index) {
-		if(addFixedChild(childEditPart)) {
+		if (addFixedChild(childEditPart)) {
 			return;
 		}
 		super.addChildVisual(childEditPart, -1);
 	}
 
+	@Override
 	protected void removeChildVisual(EditPart childEditPart) {
-		if(removeFixedChild(childEditPart)) {
+		if (removeFixedChild(childEditPart)) {
 			return;
 		}
 		super.removeChildVisual(childEditPart);
 	}
 
+	@Override
 	protected abstract IFigure getContentPaneFor(IGraphicalEditPart editPart);
 
-	
+
+	@Override
 	protected NodeFigure createNodePlate() {
 		String prefElementId = getNotationView().getType();
 		IPreferenceStore store = Activator.getInstance().getPreferenceStore();
@@ -104,12 +110,14 @@ public abstract class AbstractElementEditPart extends NamedElementEditPart {
 		return result;
 	}
 
+	@Override
 	protected NodeFigure createMainFigure() {
 		return createMainFigureWithSVG();
 	}
 
+	@Override
 	protected IFigure setupContentPane(IFigure nodeShape) {
-		if(nodeShape.getLayoutManager() == null) {
+		if (nodeShape.getLayoutManager() == null) {
 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
 			layout.setSpacing(5);
 			nodeShape.setLayoutManager(layout);
@@ -117,21 +125,25 @@ public abstract class AbstractElementEditPart extends NamedElementEditPart {
 		return nodeShape; // use nodeShape itself as contentPane
 	}
 
+	@Override
 	public IFigure getContentPane() {
-		if(contentPane != null) {
+		if (contentPane != null) {
 			return contentPane;
 		}
 		return super.getContentPane();
 	}
 
+	@Override
 	protected void setForegroundColor(Color color) {
-		if(primaryShape != null) {
+		if (primaryShape != null) {
 			primaryShape.setForegroundColor(color);
 		}
 	}
 
+	@Override
 	public abstract EditPart getPrimaryChildEditPart();
 
+	@Override
 	public EditPart getTargetEditPart(Request request) {
 		return super.getTargetEditPart(request);
 	}
@@ -140,38 +152,38 @@ public abstract class AbstractElementEditPart extends NamedElementEditPart {
 	public Object getPreferredValue(EStructuralFeature feature) {
 		String prefKey = getNotationView().getType();
 
-		IPreferenceStore store = (IPreferenceStore)getDiagramPreferencesHint().getPreferenceStore();
+		IPreferenceStore store = (IPreferenceStore) getDiagramPreferencesHint().getPreferenceStore();
 		Object result = null;
 
-		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
+		if (feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
 
 			String prefColor = null;
-			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
+			if (feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
 				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_LINE);
 
-			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
+			} else if (feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
 				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FONT);
 
-			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
+			} else if (feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
 				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FILL);
 
 			}
-			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)store, prefColor));
+			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(store, prefColor));
 
-		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
+		} else if (feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
 
 			String prefGradient = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_GRADIENT);
 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(prefGradient));
-			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
+			if (feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
 				result = new Integer(gradientPreferenceConverter.getTransparency());
 
-			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
+			} else if (feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
 				result = gradientPreferenceConverter.getGradientData();
 
 			}
 		}
 
-		if(result == null) {
+		if (result == null) {
 			result = getStructuralFeatureValue(feature);
 		}
 		return result;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
index 93bd6729a22..e71e82f75a9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
@@ -139,42 +139,42 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 	}
 
 	protected String getLabelTextHelper(IFigure figure) {
-		if(figure instanceof WrappingLabel) {
-			return ((WrappingLabel)figure).getText();
-		} else if(figure instanceof ILabelFigure) {
-			return ((ILabelFigure)figure).getText();
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
 		} else {
-			return ((Label)figure).getText();
+			return ((Label) figure).getText();
 		}
 	}
 
 	protected void setLabelTextHelper(IFigure figure, String text) {
-		if(figure instanceof WrappingLabel) {
-			((WrappingLabel)figure).setText(text);
-		} else if(figure instanceof ILabelFigure) {
-			((ILabelFigure)figure).setText(text);
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
 		} else {
-			((Label)figure).setText(text);
+			((Label) figure).setText(text);
 		}
 	}
 
 	protected Image getLabelIconHelper(IFigure figure) {
-		if(figure instanceof WrappingLabel) {
-			return ((WrappingLabel)figure).getIcon();
-		} else if(figure instanceof ILabelFigure) {
-			return ((ILabelFigure)figure).getIcon();
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
 		} else {
-			return ((Label)figure).getIcon();
+			return ((Label) figure).getIcon();
 		}
 	}
 
 	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if(figure instanceof WrappingLabel) {
-			((WrappingLabel)figure).setIcon(icon);
-		} else if(figure instanceof ILabelFigure) {
-			((ILabelFigure)figure).setIcon(icon);
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
 		} else {
-			((Label)figure).setIcon(icon);
+			((Label) figure).setIcon(icon);
 		}
 	}
 
@@ -196,6 +196,7 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 		return null;
 	}
 
+	@Override
 	public EObject getParserElement() {
 		return resolveSemanticElement();
 	}
@@ -207,29 +208,31 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 	protected String getLabelText() {
 		String text = null;
 		EObject parserElement = getParserElement();
-		if(parserElement != null && getParser() != null) {
+		if (parserElement != null && getParser() != null) {
 			text = getParser().getPrintString(new SemanticAdapter(parserElement, getNotationView()), getParserOptions().intValue());
 		}
-		if(text == null || text.length() == 0) {
+		if (text == null || text.length() == 0) {
 			text = defaultText;
 		}
 		return text;
 	}
 
+	@Override
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if(pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if(sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
 		}
 	}
 
+	@Override
 	public String getEditText() {
-		if(getParserElement() == null || getParser() == null) {
+		if (getParserElement() == null || getParser() == null) {
 			return ""; //$NON-NLS-1$
 		}
 		return getParser().getEditString(new SemanticAdapter(getParserElement(), getNotationView()), getParserOptions().intValue());
@@ -239,21 +242,24 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 		return getParser() != null;
 	}
 
+	@Override
 	public ICellEditorValidator getEditTextValidator() {
 		return new ICellEditorValidator() {
 
+			@Override
 			public String isValid(final Object value) {
-				if(value instanceof String) {
+				if (value instanceof String) {
 					final EObject element = getParserElement();
 					final IParser parser = getParser();
 					try {
-						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<IParserEditStatus>() {
+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<IParserEditStatus>() {
 
+							@Override
 							public void run() {
-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));
+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
 							}
 						});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
 					} catch (InterruptedException ie) {
 						ie.printStackTrace();
 					}
@@ -265,21 +271,23 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 		};
 	}
 
+	@Override
 	public IContentAssistProcessor getCompletionProcessor() {
-		if(getParserElement() == null || getParser() == null) {
+		if (getParserElement() == null || getParser() == null) {
 			return null;
 		}
 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
 	}
 
+	@Override
 	public ParserOptions getParserOptions() {
 
-		if(getNotationView() == null || getNotationView().getDiagram() == null) {
+		if (getNotationView() == null || getNotationView().getDiagram() == null) {
 			return ParserOptions.NONE;
 		}
 
 		EAnnotation display = getNotationView().getEAnnotation(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION);
-		if(display == null) {
+		if (display == null) {
 			return getDefaultParserOptions();
 		}
 
@@ -288,31 +296,33 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 		return new ParserOptions(displayOptions);
 	}
 
+	@Override
 	public ParserOptions getDefaultParserOptions() {
 
-		if(getNotationView() == null || getNotationView().getDiagram() == null) {
+		if (getNotationView() == null || getNotationView().getDiagram() == null) {
 			return ParserOptions.NONE;
 		}
 
 		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
 		int displayOptions = store.getInt(LabelPreferenceHelper.getPreferenceConstant(getLabelPreferenceKey(), ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE));
-		if(displayOptions == 0) {
+		if (displayOptions == 0) {
 			return ParserOptions.NONE;
 		}
 
 		return new ParserOptions(displayOptions);
 	}
 
+	@Override
 	public IParser getParser() {
-		if(parser == null) {
+		if (parser == null) {
 			parser = ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), getParserElement(), getNotationView().getType()));
 		}
 		return parser;
 	}
 
 	protected DirectEditManager getManager() {
-		if(manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), new TextCellEditorLocator((WrappingLabel)this.getFigure())));
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), new TextCellEditorLocator((WrappingLabel) this.getFigure())));
 		}
 		return manager;
 	}
@@ -326,14 +336,14 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 	}
 
 	protected void performDirectEdit(Point eventLocation) {
-		if(getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
 		}
 	}
 
 	private void performDirectEdit(char initialCharacter) {
-		if(getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager)getManager()).show(initialCharacter);
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
 		} else {
 			performDirectEdit();
 		}
@@ -344,40 +354,40 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 
 		final Request theRequest = request;
 
-		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
 			directEditionMode = getDirectEditionType();
 		}
-		switch(directEditionMode) {
+		switch (directEditionMode) {
 		case IDirectEdition.NO_DIRECT_EDITION:
 			// no direct edition mode => does nothing
 			return;
 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
 			updateExtendedEditorConfiguration();
-			if(configuration == null || configuration.getLanguage() == null) {
+			if (configuration == null || configuration.getLanguage() == null) {
 				performDefaultDirectEditorEdit(theRequest);
 			} else {
 				configuration.preEditAction(resolveSemanticElement());
 				Dialog dialog = null;
-				if(configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);
+				if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
 					helper.showEditor();
 					return;
-				} else if(configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if(configuration instanceof IDirectEditorConfiguration) {
+				} else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
 					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
 				} else {
 					return;
 				}
 				final Dialog finalDialog = dialog;
 
-				if(Window.OK == dialog.open()) {
+				if (Window.OK == dialog.open()) {
 					TransactionalEditingDomain domain = getEditingDomain();
 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
 
 						@Override
 						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
 
 						}
 					};
@@ -391,13 +401,14 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 			try {
 				getEditingDomain().runExclusive(new Runnable() {
 
+					@Override
 					public void run() {
-						if(isActive() && isEditable()) {
-							if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-								Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+						if (isActive() && isEditable()) {
+							if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+								Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
 								performDirectEdit(initialChar.charValue());
-							} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-								DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+							} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+								DirectEditRequest editRequest = (DirectEditRequest) theRequest;
 								performDirectEdit(editRequest.getLocation());
 							} else {
 								performDirectEdit();
@@ -430,33 +441,33 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 		setLabelIconHelper(getFigure(), getLabelIcon());
 
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if(pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if(sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
 		}
 	}
 
 	protected void refreshUnderline() {
-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
 		}
 	}
 
 	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
 		}
 	}
 
 	@Override
 	protected void refreshFont() {
-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null) {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
 			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
 			setFont(fontData);
 		}
@@ -469,11 +480,11 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 
 	@Override
 	protected void addSemanticListeners() {
-		if(getParser() instanceof ISemanticParser) {
+		if (getParser() instanceof ISemanticParser) {
 			EObject element = getParserElement();
-			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);
-			for(int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
 			}
 		} else {
 			super.addSemanticListeners();
@@ -482,8 +493,8 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 
 	@Override
 	protected void removeSemanticListeners() {
-		if(parserElements != null) {
-			for(int i = 0; i < parserElements.size(); i++) {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
 			}
 		} else {
@@ -493,7 +504,7 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 
 	@Override
 	protected AccessibleEditPart getAccessibleEditPart() {
-		if(accessibleEP == null) {
+		if (accessibleEP == null) {
 			accessibleEP = new AccessibleGraphicalEditPart() {
 
 				@Override
@@ -511,15 +522,15 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 
 	/**
 	 * Returns the kind of associated editor for direct edition.
-	 * 
+	 *
 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 */
 	public int getDirectEditionType() {
-		if(checkExtendedEditor()) {
+		if (checkExtendedEditor()) {
 			initExtendedEditorConfiguration();
 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
 		}
-		if(checkDefaultEdition()) {
+		if (checkDefaultEdition()) {
 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
 		}
 
@@ -529,11 +540,11 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 
 	/**
 	 * Checks if an extended editor is present.
-	 * 
+	 *
 	 * @return <code>true</code> if an extended editor is present.
 	 */
 	protected boolean checkExtendedEditor() {
-		if(resolveSemanticElement() != null) {
+		if (resolveSemanticElement() != null) {
 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
 		}
 		return false;
@@ -541,7 +552,7 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 
 	/**
 	 * Checks if a default direct edition is available
-	 * 
+	 *
 	 * @return <code>true</code> if a default direct edition is available
 	 */
 	protected boolean checkDefaultEdition() {
@@ -552,9 +563,9 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 	 * Initializes the extended editor configuration
 	 */
 	protected void initExtendedEditorConfiguration() {
-		if(configuration == null) {
+		if (configuration == null) {
 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if(languagePreferred != null && !languagePreferred.equals("")) {
+			if (languagePreferred != null && !languagePreferred.equals("")) {
 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
 			} else {
 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
@@ -567,31 +578,32 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 	 */
 	protected void updateExtendedEditorConfiguration() {
 		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
+		if (languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
 			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
 			configuration = null;
 		}
 	}
 
 	/**
 	 * Performs the direct edit usually used by GMF editors.
-	 * 
+	 *
 	 * @param theRequest
-	 *        the direct edit request that starts the direct edit system
+	 *            the direct edit request that starts the direct edit system
 	 */
 	protected void performDefaultDirectEditorEdit(final Request theRequest) {
 		// initialize the direct edit manager
 		try {
 			getEditingDomain().runExclusive(new Runnable() {
 
+				@Override
 				public void run() {
-					if(isActive() && isEditable()) {
-						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
 							performDirectEdit(initialChar.charValue());
-						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
 							performDirectEdit(editRequest.getLocation());
 						} else {
 							performDirectEdit();
@@ -607,24 +619,25 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 	@Override
 	protected void handleNotificationEvent(Notification event) {
 		Object feature = event.getFeature();
-		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer)event.getNewValue();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
 			refreshUnderline();
-		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
 			refreshStrikeThrough();
-		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
 			refreshFont();
 		} else {
-			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
 				refreshLabel();
 			}
-			if(getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser)getParser();
-				if(modelParser.areSemanticElementsAffected(null, event)) {
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser = (ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
 					removeSemanticListeners();
-					if(resolveSemanticElement() != null) {
+					if (resolveSemanticElement() != null) {
 						addSemanticListeners();
 					}
 					refreshLabel();
@@ -663,10 +676,12 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public abstract String getLabelRole();
 
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public abstract String getIconPathRole();
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLinkEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLinkEditPart.java
index 69c328e45b5..793db66fec2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLinkEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLinkEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,6 +26,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultGraphicalNodeEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.figure.EdgeDecorationType;
 
@@ -49,15 +50,15 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
 	}
 
 	/**
 	 * Add fixed child edit part.
 	 */
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof AppliedStereotypeLinkLabelEditPart) {
-			((AppliedStereotypeLinkLabelEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());
+		if (childEditPart instanceof AppliedStereotypeLinkLabelEditPart) {
+			((AppliedStereotypeLinkLabelEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());
 			return true;
 		}
 		return false;
@@ -67,7 +68,7 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 	 * Remove fixed child edit part.
 	 */
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof AppliedStereotypeLinkLabelEditPart) {
+		if (childEditPart instanceof AppliedStereotypeLinkLabelEditPart) {
 			return true;
 		}
 		return false;
@@ -78,7 +79,7 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 	 */
 	@Override
 	protected void addChildVisual(EditPart childEditPart, int index) {
-		if(addFixedChild(childEditPart)) {
+		if (addFixedChild(childEditPart)) {
 			return;
 		}
 		super.addChildVisual(childEditPart, -1);
@@ -89,7 +90,7 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 	 */
 	@Override
 	protected void removeChildVisual(EditPart childEditPart) {
-		if(removeFixedChild(childEditPart)) {
+		if (removeFixedChild(childEditPart)) {
 			return;
 		}
 		super.removeChildVisual(childEditPart);
@@ -104,13 +105,13 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 
 		// Update the figure when the line width changes
 		Object feature = event.getFeature();
-		if((getModel() != null) && (getModel() == event.getNotifier())) {
+		if ((getModel() != null) && (getModel() == event.getNotifier())) {
 
-			if(NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)) {
+			if (NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)) {
 				refreshLineWidth();
 				refreshArrowSource();
 				refreshArrowTarget();
-			} else if(NotationPackage.eINSTANCE.getLineTypeStyle_LineType().equals(feature)) {
+			} else if (NotationPackage.eINSTANCE.getLineTypeStyle_LineType().equals(feature)) {
 				refreshLineType();
 			}
 		}
@@ -133,7 +134,7 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 	 */
 	@Override
 	protected void setLineWidth(int width) {
-		if(width < 0) {
+		if (width < 0) {
 			width = 1;
 		}
 		getPrimaryShape().setLineWidth(width);
@@ -167,7 +168,7 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 	 * <pre>
 	 * {@inheritDoc}
 	 * 
-	 * This method override parent implementation to add a new set of 
+	 * This method override parent implementation to add a new set of
 	 * predefined decoration type.
 	 * 
 	 * The arrowType available constants are given in {@link EdgeDecorationType}.
@@ -177,39 +178,39 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 	protected RotatableDecoration getArrowDecoration(int arrowType) {
 		RotatableDecoration decoration = null;
 		int width = getLineWidth();
-		if(width < 0) {
+		if (width < 0) {
 			width = 1;
 		}
-		if(arrowType == EdgeDecorationType.OPEN_ARROW) {
+		if (arrowType == EdgeDecorationType.OPEN_ARROW) {
 			IMapMode mm = getMapMode();
 			decoration = new PolylineDecoration();
-			((PolylineDecoration)decoration).setScale(mm.DPtoLP(15 + width), mm.DPtoLP(5 + width));
-			((PolylineDecoration)decoration).setTemplate(PolylineDecoration.TRIANGLE_TIP);
-			((PolylineDecoration)decoration).setLineWidth(mm.DPtoLP(width));
+			((PolylineDecoration) decoration).setScale(mm.DPtoLP(15 + width), mm.DPtoLP(5 + width));
+			((PolylineDecoration) decoration).setTemplate(PolylineDecoration.TRIANGLE_TIP);
+			((PolylineDecoration) decoration).setLineWidth(mm.DPtoLP(width));
 
-		} else if(arrowType == EdgeDecorationType.SOLID_ARROW_FILLED) {
+		} else if (arrowType == EdgeDecorationType.SOLID_ARROW_FILLED) {
 			IMapMode mm = getMapMode();
 			decoration = new PolygonDecoration();
-			((PolygonDecoration)decoration).setScale(mm.DPtoLP(15 + width), mm.DPtoLP(5 + width));
-			((PolygonDecoration)decoration).setTemplate(PolygonDecoration.TRIANGLE_TIP);
-			((PolygonDecoration)decoration).setLineWidth(mm.DPtoLP(width));
-			((PolygonDecoration)decoration).setFill(true);
+			((PolygonDecoration) decoration).setScale(mm.DPtoLP(15 + width), mm.DPtoLP(5 + width));
+			((PolygonDecoration) decoration).setTemplate(PolygonDecoration.TRIANGLE_TIP);
+			((PolygonDecoration) decoration).setLineWidth(mm.DPtoLP(width));
+			((PolygonDecoration) decoration).setFill(true);
 
-		} else if(arrowType == EdgeDecorationType.SOLID_ARROW_EMPTY) {
+		} else if (arrowType == EdgeDecorationType.SOLID_ARROW_EMPTY) {
 			IMapMode mm = getMapMode();
 			decoration = new PolygonDecoration();
-			((PolygonDecoration)decoration).setScale(mm.DPtoLP(15 + width), mm.DPtoLP(5 + width));
-			((PolygonDecoration)decoration).setTemplate(PolygonDecoration.TRIANGLE_TIP);
-			((PolygonDecoration)decoration).setLineWidth(mm.DPtoLP(width));
+			((PolygonDecoration) decoration).setScale(mm.DPtoLP(15 + width), mm.DPtoLP(5 + width));
+			((PolygonDecoration) decoration).setTemplate(PolygonDecoration.TRIANGLE_TIP);
+			((PolygonDecoration) decoration).setLineWidth(mm.DPtoLP(width));
 
 			// Not really empty... filled with white color.
-			((PolygonDecoration)decoration).setFill(true);
-			((PolygonDecoration)decoration).setBackgroundColor(ColorConstants.white);
+			((PolygonDecoration) decoration).setFill(true);
+			((PolygonDecoration) decoration).setBackgroundColor(ColorConstants.white);
 
-		} else if(arrowType == EdgeDecorationType.SOLID_DIAMOND_FILLED) {
+		} else if (arrowType == EdgeDecorationType.SOLID_DIAMOND_FILLED) {
 			IMapMode mm = getMapMode();
 			decoration = new PolygonDecoration();
-			((PolygonDecoration)decoration).setScale(mm.DPtoLP(12 + width), mm.DPtoLP(6 + width));
+			((PolygonDecoration) decoration).setScale(mm.DPtoLP(12 + width), mm.DPtoLP(6 + width));
 
 			PointList diamondPointList = new PointList();
 			diamondPointList.addPoint(0, 0);
@@ -217,14 +218,14 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 			diamondPointList.addPoint(-2, 0);
 			diamondPointList.addPoint(-1, -1);
 
-			((PolygonDecoration)decoration).setTemplate(diamondPointList);
-			((PolygonDecoration)decoration).setLineWidth(mm.DPtoLP(width));
-			((PolygonDecoration)decoration).setFill(true);
+			((PolygonDecoration) decoration).setTemplate(diamondPointList);
+			((PolygonDecoration) decoration).setLineWidth(mm.DPtoLP(width));
+			((PolygonDecoration) decoration).setFill(true);
 
-		} else if(arrowType == EdgeDecorationType.SOLID_DIAMOND_EMPTY) {
+		} else if (arrowType == EdgeDecorationType.SOLID_DIAMOND_EMPTY) {
 			IMapMode mm = getMapMode();
 			decoration = new PolygonDecoration();
-			((PolygonDecoration)decoration).setScale(mm.DPtoLP(12 + width), mm.DPtoLP(6 + width));
+			((PolygonDecoration) decoration).setScale(mm.DPtoLP(12 + width), mm.DPtoLP(6 + width));
 
 			PointList diamondPointList = new PointList();
 			diamondPointList.addPoint(0, 0);
@@ -232,12 +233,12 @@ public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditP
 			diamondPointList.addPoint(-2, 0);
 			diamondPointList.addPoint(-1, -1);
 
-			((PolygonDecoration)decoration).setTemplate(diamondPointList);
-			((PolygonDecoration)decoration).setLineWidth(mm.DPtoLP(width));
+			((PolygonDecoration) decoration).setTemplate(diamondPointList);
+			((PolygonDecoration) decoration).setLineWidth(mm.DPtoLP(width));
 
 			// Not really empty... filled with white color.
-			((PolygonDecoration)decoration).setFill(true);
-			((PolygonDecoration)decoration).setBackgroundColor(ColorConstants.white);
+			((PolygonDecoration) decoration).setFill(true);
+			((PolygonDecoration) decoration).setBackgroundColor(ColorConstants.white);
 		}
 
 		return decoration;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementNodeLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementNodeLabelEditPart.java
index 637fe2b217c..8ec9c287af9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementNodeLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementNodeLabelEditPart.java
@@ -124,28 +124,28 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 
 	/**
 	 * Compartment-like isSelectable implementation.
-	 * 
+	 *
 	 * By default, the edit parts get selectable only if
 	 * the compartment's top level container matches the top level
 	 * container of the editpart that currently has the keyboard focus
 	 * i.e: you need to select the shape first before selecting a this label.
-	 * 
+	 *
 	 * @see CompartmentEditPart#isSelectable()
 	 */
 	@Override
 	public boolean isSelectable() {
-		if(super.isSelectable()) {
+		if (super.isSelectable()) {
 			EditPart focusPart = getViewer().getFocusEditPart();
-			if(focusPart instanceof IGraphicalEditPart) {
-				TopGraphicEditPart focusTopEP = ((IGraphicalEditPart)focusPart).getTopGraphicEditPart();
+			if (focusPart instanceof IGraphicalEditPart) {
+				TopGraphicEditPart focusTopEP = ((IGraphicalEditPart) focusPart).getTopGraphicEditPart();
 				TopGraphicEditPart myTopEP = getTopGraphicEditPart();
-				if(myTopEP == focusTopEP) {
+				if (myTopEP == focusTopEP) {
 					// check if the selection contains only editparts belonging to
 					// the same top level editpart
 					Iterator<?> selection = getViewer().getSelectedEditParts().iterator();
-					while(selection.hasNext()) {
+					while (selection.hasNext()) {
 						Object editPart = selection.next();
-						if(editPart instanceof IGraphicalEditPart && (((IGraphicalEditPart)editPart).getTopGraphicEditPart() != myTopEP)) {
+						if (editPart instanceof IGraphicalEditPart && (((IGraphicalEditPart) editPart).getTopGraphicEditPart() != myTopEP)) {
 							return false;
 						}
 					}
@@ -161,7 +161,7 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 	 */
 	@Override
 	public DragTracker getDragTracker(Request request) {
-		if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {
+		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
 			return null;
 		}
 		// Delegate to the main edit part.
@@ -180,42 +180,42 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 	}
 
 	protected String getLabelTextHelper(IFigure figure) {
-		if(figure instanceof WrappingLabel) {
-			return ((WrappingLabel)figure).getText();
-		} else if(figure instanceof ILabelFigure) {
-			return ((ILabelFigure)figure).getText();
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
 		} else {
-			return ((Label)figure).getText();
+			return ((Label) figure).getText();
 		}
 	}
 
 	protected void setLabelTextHelper(IFigure figure, String text) {
-		if(figure instanceof WrappingLabel) {
-			((WrappingLabel)figure).setText(text);
-		} else if(figure instanceof ILabelFigure) {
-			((ILabelFigure)figure).setText(text);
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
 		} else {
-			((Label)figure).setText(text);
+			((Label) figure).setText(text);
 		}
 	}
 
 	protected Image getLabelIconHelper(IFigure figure) {
-		if(figure instanceof WrappingLabel) {
-			return ((WrappingLabel)figure).getIcon();
-		} else if(figure instanceof ILabelFigure) {
-			return ((ILabelFigure)figure).getIcon();
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
 		} else {
-			return ((Label)figure).getIcon();
+			return ((Label) figure).getIcon();
 		}
 	}
 
 	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if(figure instanceof WrappingLabel) {
-			((WrappingLabel)figure).setIcon(icon);
-		} else if(figure instanceof ILabelFigure) {
-			((ILabelFigure)figure).setIcon(icon);
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
 		} else {
-			((Label)figure).setIcon(icon);
+			((Label) figure).setIcon(icon);
 		}
 	}
 
@@ -237,19 +237,20 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 		return null;
 	}
 
+	@Override
 	public EObject getParserElement() {
 		return resolveSemanticElement();
 	}
 
 	protected Image getLabelIcon() {
 		EObject parserElement = getParserElement();
-		if(parserElement == null) {
+		if (parserElement == null) {
 			return null;
 		}
 
 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for(View view : views) {
-			if(AppearanceHelper.showElementIcon(view)) {
+		for (View view : views) {
+			if (AppearanceHelper.showElementIcon(view)) {
 				return org.eclipse.papyrus.sysml.diagram.common.Activator.getInstance().getLabelProvider().getImage(parserElement);
 			}
 		}
@@ -260,29 +261,31 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 	protected String getLabelText() {
 		String text = null;
 		EObject parserElement = getParserElement();
-		if(parserElement != null && getParser() != null) {
+		if (parserElement != null && getParser() != null) {
 			text = getParser().getPrintString(new SemanticAdapter(parserElement, getNotationView()), getParserOptions().intValue());
 		}
-		if(text == null || text.length() == 0) {
+		if (text == null || text.length() == 0) {
 			text = defaultText;
 		}
 		return text;
 	}
 
+	@Override
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if(pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if(sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
 		}
 	}
 
+	@Override
 	public String getEditText() {
-		if(getParserElement() == null || getParser() == null) {
+		if (getParserElement() == null || getParser() == null) {
 			return ""; //$NON-NLS-1$
 		}
 		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
@@ -292,21 +295,24 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 		return getParser() != null;
 	}
 
+	@Override
 	public ICellEditorValidator getEditTextValidator() {
 		return new ICellEditorValidator() {
 
+			@Override
 			public String isValid(final Object value) {
-				if(value instanceof String) {
+				if (value instanceof String) {
 					final EObject element = getParserElement();
 					final IParser parser = getParser();
 					try {
-						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
 
+							@Override
 							public void run() {
-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));
+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
 							}
 						});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
 					} catch (InterruptedException ie) {
 						ie.printStackTrace();
 					}
@@ -318,21 +324,23 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 		};
 	}
 
+	@Override
 	public IContentAssistProcessor getCompletionProcessor() {
-		if(getParserElement() == null || getParser() == null) {
+		if (getParserElement() == null || getParser() == null) {
 			return null;
 		}
 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
 	}
 
+	@Override
 	public ParserOptions getParserOptions() {
 
-		if(getNotationView() == null || getNotationView().getDiagram() == null) {
+		if (getNotationView() == null || getNotationView().getDiagram() == null) {
 			return ParserOptions.NONE;
 		}
 
 		EAnnotation display = getNotationView().getEAnnotation(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION);
-		if(display == null) {
+		if (display == null) {
 			return getDefaultParserOptions();
 		}
 
@@ -341,31 +349,33 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 		return new ParserOptions(displayOptions);
 	}
 
+	@Override
 	public ParserOptions getDefaultParserOptions() {
 
-		if(getNotationView() == null || getNotationView().getDiagram() == null) {
+		if (getNotationView() == null || getNotationView().getDiagram() == null) {
 			return ParserOptions.NONE;
 		}
 
 		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
 		int displayOptions = store.getInt(LabelPreferenceHelper.getPreferenceConstant(getLabelPreferenceKey(), ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE));
-		if(displayOptions == 0) {
+		if (displayOptions == 0) {
 			return ParserOptions.NONE;
 		}
 
 		return new ParserOptions(displayOptions);
 	}
 
+	@Override
 	public IParser getParser() {
-		if(parser == null) {
+		if (parser == null) {
 			parser = ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), getParserElement(), getNotationView().getType()));
 		}
 		return parser;
 	}
 
 	protected DirectEditManager getManager() {
-		if(manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), new TextCellEditorLocator((WrappingLabel)this.getFigure())));
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), new TextCellEditorLocator((WrappingLabel) this.getFigure())));
 		}
 		return manager;
 	}
@@ -379,14 +389,14 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 	}
 
 	protected void performDirectEdit(Point eventLocation) {
-		if(getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
 		}
 	}
 
 	private void performDirectEdit(char initialCharacter) {
-		if(getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager)getManager()).show(initialCharacter);
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
 		} else {
 			performDirectEdit();
 		}
@@ -397,40 +407,40 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 
 		final Request theRequest = request;
 
-		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
 			directEditionMode = getDirectEditionType();
 		}
-		switch(directEditionMode) {
+		switch (directEditionMode) {
 		case IDirectEdition.NO_DIRECT_EDITION:
 			// no direct edition mode => does nothing
 			return;
 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
 			updateExtendedEditorConfiguration();
-			if(configuration == null || configuration.getLanguage() == null) {
+			if (configuration == null || configuration.getLanguage() == null) {
 				performDefaultDirectEditorEdit(theRequest);
 			} else {
 				configuration.preEditAction(resolveSemanticElement());
 				Dialog dialog = null;
-				if(configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);
+				if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
 					helper.showEditor();
 					return;
-				} else if(configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if(configuration instanceof IDirectEditorConfiguration) {
+				} else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
 					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
 				} else {
 					return;
 				}
 				final Dialog finalDialog = dialog;
 
-				if(Window.OK == dialog.open()) {
+				if (Window.OK == dialog.open()) {
 					TransactionalEditingDomain domain = getEditingDomain();
 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
 
 						@Override
 						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
 
 						}
 					};
@@ -444,13 +454,14 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 			try {
 				getEditingDomain().runExclusive(new Runnable() {
 
+					@Override
 					public void run() {
-						if(isActive() && isEditable()) {
-							if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-								Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+						if (isActive() && isEditable()) {
+							if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+								Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
 								performDirectEdit(initialChar.charValue());
-							} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-								DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+							} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+								DirectEditRequest editRequest = (DirectEditRequest) theRequest;
 								performDirectEdit(editRequest.getLocation());
 							} else {
 								performDirectEdit();
@@ -483,33 +494,33 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 		setLabelIconHelper(getFigure(), getLabelIcon());
 
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if(pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if(sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
+			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
 		}
 	}
 
 	protected void refreshUnderline() {
-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
 		}
 	}
 
 	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
 		}
 	}
 
 	@Override
 	protected void refreshFont() {
-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null) {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
 			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
 			setFont(fontData);
 		}
@@ -522,11 +533,11 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 
 	@Override
 	protected void addSemanticListeners() {
-		if(getParser() instanceof ISemanticParser) {
+		if (getParser() instanceof ISemanticParser) {
 			EObject element = getParserElement();
-			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);
-			for(int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
 			}
 		} else {
 			super.addSemanticListeners();
@@ -535,8 +546,8 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 
 	@Override
 	protected void removeSemanticListeners() {
-		if(parserElements != null) {
-			for(int i = 0; i < parserElements.size(); i++) {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
 			}
 		} else {
@@ -546,7 +557,7 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 
 	@Override
 	protected AccessibleEditPart getAccessibleEditPart() {
-		if(accessibleEP == null) {
+		if (accessibleEP == null) {
 			accessibleEP = new AccessibleGraphicalEditPart() {
 
 				@Override
@@ -564,15 +575,15 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 
 	/**
 	 * Returns the kind of associated editor for direct edition.
-	 * 
+	 *
 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 */
 	public int getDirectEditionType() {
-		if(checkExtendedEditor()) {
+		if (checkExtendedEditor()) {
 			initExtendedEditorConfiguration();
 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
 		}
-		if(checkDefaultEdition()) {
+		if (checkDefaultEdition()) {
 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
 		}
 
@@ -582,11 +593,11 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 
 	/**
 	 * Checks if an extended editor is present.
-	 * 
+	 *
 	 * @return <code>true</code> if an extended editor is present.
 	 */
 	protected boolean checkExtendedEditor() {
-		if(resolveSemanticElement() != null) {
+		if (resolveSemanticElement() != null) {
 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
 		}
 		return false;
@@ -594,7 +605,7 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 
 	/**
 	 * Checks if a default direct edition is available
-	 * 
+	 *
 	 * @return <code>true</code> if a default direct edition is available
 	 */
 	protected boolean checkDefaultEdition() {
@@ -605,9 +616,9 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 	 * Initializes the extended editor configuration
 	 */
 	protected void initExtendedEditorConfiguration() {
-		if(configuration == null) {
+		if (configuration == null) {
 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if(languagePreferred != null && !languagePreferred.equals("")) {
+			if (languagePreferred != null && !languagePreferred.equals("")) {
 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
 			} else {
 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
@@ -620,31 +631,32 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 	 */
 	protected void updateExtendedEditorConfiguration() {
 		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
+		if (languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
 			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
 			configuration = null;
 		}
 	}
 
 	/**
 	 * Performs the direct edit usually used by GMF editors.
-	 * 
+	 *
 	 * @param theRequest
-	 *        the direct edit request that starts the direct edit system
+	 *            the direct edit request that starts the direct edit system
 	 */
 	protected void performDefaultDirectEditorEdit(final Request theRequest) {
 		// initialize the direct edit manager
 		try {
 			getEditingDomain().runExclusive(new Runnable() {
 
+				@Override
 				public void run() {
-					if(isActive() && isEditable()) {
-						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
 							performDirectEdit(initialChar.charValue());
-						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
 							performDirectEdit(editRequest.getLocation());
 						} else {
 							performDirectEdit();
@@ -660,24 +672,25 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 	@Override
 	protected void handleNotificationEvent(Notification event) {
 		Object feature = event.getFeature();
-		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer)event.getNewValue();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
 			refreshUnderline();
-		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
 			refreshStrikeThrough();
-		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
 			refreshFont();
 		} else {
-			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
 				refreshLabel();
 			}
-			if(getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser)getParser();
-				if(modelParser.areSemanticElementsAffected(null, event)) {
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser = (ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
 					removeSemanticListeners();
-					if(resolveSemanticElement() != null) {
+					if (resolveSemanticElement() != null) {
 						addSemanticListeners();
 					}
 					refreshLabel();
@@ -685,7 +698,7 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 			}
 		}
 
-		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {
+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
 			refreshLabel();
 		}
 
@@ -720,10 +733,12 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public abstract String getLabelRole();
 
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public abstract String getIconPathRole();
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractShapeCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractShapeCompartmentEditPart.java
index d6b36f8d876..6484bb2bfca 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractShapeCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractShapeCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -41,11 +41,11 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPol
  * This class is adapted from edit parts generated by GMF Tooling.
  */
 public abstract class AbstractShapeCompartmentEditPart extends ShapeCompartmentEditPart {
-	
+
 	public AbstractShapeCompartmentEditPart(View view) {
 		super(view);
 	}
-	
+
 	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
@@ -55,10 +55,10 @@ public abstract class AbstractShapeCompartmentEditPart extends ShapeCompartmentE
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
 	}
-	
+
 	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
@@ -66,20 +66,20 @@ public abstract class AbstractShapeCompartmentEditPart extends ShapeCompartmentE
 	@Override
 	protected void handleNotificationEvent(Notification notification) {
 		Object feature = notification.getFeature();
-		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
 			refreshBounds();
 		}
 		super.handleNotificationEvent(notification);
 	}
 
 	protected void refreshBounds() {
-		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
 		Dimension size = new Dimension(width, height);
-		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
 		Point loc = new Point(x, y);
-		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
 	}
 
 	@Override
@@ -87,43 +87,51 @@ public abstract class AbstractShapeCompartmentEditPart extends ShapeCompartmentE
 		super.refreshVisuals();
 		refreshBounds();
 	}
-	
+
 	/**
 	 * Install a drag tracker supporting double click (necessary for navigation).
 	 */
+	@Override
 	public DragTracker getDragTracker(Request req) {
-		if (!supportsDragSelection())
+		if (!supportsDragSelection()) {
 			return super.getDragTracker(req);
+		}
 
 		if (req instanceof SelectionRequest
-			&& ((SelectionRequest) req).getLastButtonPressed() == 3)
+				&& ((SelectionRequest) req).getLastButtonPressed() == 3) {
 			return new DeselectAllTracker(this) {
 
+				@Override
 				protected boolean handleButtonDown(int button) {
 					getCurrentViewer().select(AbstractShapeCompartmentEditPart.this);
 					return true;
 				}
 			};
-		
+		}
+
 		return new RubberbandDragTracker() {
-			
-			/* this method has been respecified in order to allow double click 
+
+			/*
+			 * this method has been respecified in order to allow double click
 			 * on the compartment.
 			 * hence it allows the navigation by double click
 			 */
+			@Override
 			protected boolean handleDoubleClick(int button) {
-		        	SelectionRequest request = new SelectionRequest();
-		    		request.setLocation(getLocation());
-		    		request.setType(RequestConstants.REQ_OPEN);
-		    		performRequest(request);
-		            return true;
-		    }
-			
+				SelectionRequest request = new SelectionRequest();
+				request.setLocation(getLocation());
+				request.setType(RequestConstants.REQ_OPEN);
+				performRequest(request);
+				return true;
+			}
+
+			@Override
 			protected void handleFinished() {
-				if (getViewer().getSelectedEditParts().isEmpty())
+				if (getViewer().getSelectedEditParts().isEmpty()) {
 					getViewer().select(AbstractShapeCompartmentEditPart.this);
+				}
 			}
-			
+
 		};
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java
index 8e8baf3814f..bd83628ec6c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -46,20 +46,22 @@ public class AppliedStereotypeAffixedLabelEditPart extends AbstractElementLabelE
 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());
 	}
 
+	@Override
 	public IBorderItemLocator getBorderItemLocator() {
 		IFigure parentFigure = getFigure().getParent();
-		if(parentFigure != null && parentFigure.getLayoutManager() != null) {
+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator)constraint;
+			return (IBorderItemLocator) constraint;
 		}
 		return null;
 	}
 
+	@Override
 	public void refreshBounds() {
-		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
 
 		// Update locator constraint
 		IBorderItemLocator locator = getBorderItemLocator();
@@ -83,8 +85,9 @@ public class AppliedStereotypeAffixedLabelEditPart extends AbstractElementLabelE
 		return new AppliedStereotypeWrappingLabelFigure();
 	}
 
+	@Override
 	public IFigure getPrimaryShape() {
-		return (IFigure)getFigure();
+		return getFigure();
 	}
 
 	/**
@@ -106,6 +109,7 @@ public class AppliedStereotypeAffixedLabelEditPart extends AbstractElementLabelE
 	/**
 	 * Forbid direct edition on this label.
 	 */
+	@Override
 	public int getDirectEditionType() {
 		// The label is read-only (defined in GMFGen model)
 		return IDirectEdition.NO_DIRECT_EDITION;
@@ -114,6 +118,7 @@ public class AppliedStereotypeAffixedLabelEditPart extends AbstractElementLabelE
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "Stereotype";//$NON-NLS-1$
 	}
@@ -121,6 +126,7 @@ public class AppliedStereotypeAffixedLabelEditPart extends AbstractElementLabelE
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return "";//$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeLinkLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeLinkLabelEditPart.java
index 67b116897ff..b0bc849943c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeLinkLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeLinkLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -59,6 +59,7 @@ public class AppliedStereotypeLinkLabelEditPart extends AbstractElementLabelEdit
 	/**
 	 * Forbid direct edition on this label.
 	 */
+	@Override
 	public int getDirectEditionType() {
 		// The label is read-only (defined in GMFGen model)
 		return IDirectEdition.NO_DIRECT_EDITION;
@@ -67,6 +68,7 @@ public class AppliedStereotypeLinkLabelEditPart extends AbstractElementLabelEdit
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "Stereotype";//$NON-NLS-1$
 	}
@@ -74,6 +76,7 @@ public class AppliedStereotypeLinkLabelEditPart extends AbstractElementLabelEdit
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return "";//$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceMultiplicityEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceMultiplicityEditPart.java
index 43448d1aabd..81f430969c6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceMultiplicityEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceMultiplicityEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -55,11 +55,11 @@ public class AssociationLinkLabelSourceMultiplicityEditPart extends AbstractElem
 	 */
 	@Override
 	public EObject getParserElement() {
-		Association association = (Association)resolveSemanticElement();
-		if((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
+		Association association = (Association) resolveSemanticElement();
+		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
 			View owner = ViewUtil.getContainerView(getNotationView());
 
-			if((association != null) && (association.getMemberEnds().size() == 2)) {
+			if ((association != null) && (association.getMemberEnds().size() == 2)) {
 				return AssociationViewUtils.getSourceSemanticEnd(owner);
 			}
 		}
@@ -78,6 +78,7 @@ public class AssociationLinkLabelSourceMultiplicityEditPart extends AbstractElem
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "SourceMultiplicity"; //$NON-NLS-1$
 	}
@@ -85,6 +86,7 @@ public class AssociationLinkLabelSourceMultiplicityEditPart extends AbstractElem
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceRoleEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceRoleEditPart.java
index 671884e9b8e..1a507ee3faa 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceRoleEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceRoleEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -55,11 +55,11 @@ public class AssociationLinkLabelSourceRoleEditPart extends AbstractElementLabel
 	 */
 	@Override
 	public EObject getParserElement() {
-		Association association = (Association)resolveSemanticElement();
-		if((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
+		Association association = (Association) resolveSemanticElement();
+		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
 			View owner = ViewUtil.getContainerView(getNotationView());
 
-			if((association != null) && (association.getMemberEnds().size() == 2)) {
+			if ((association != null) && (association.getMemberEnds().size() == 2)) {
 				return AssociationViewUtils.getSourceSemanticEnd(owner);
 			}
 		}
@@ -70,6 +70,7 @@ public class AssociationLinkLabelSourceRoleEditPart extends AbstractElementLabel
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "SourceRole"; //$NON-NLS-1$
 	}
@@ -77,6 +78,7 @@ public class AssociationLinkLabelSourceRoleEditPart extends AbstractElementLabel
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetMultiplicityEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetMultiplicityEditPart.java
index 0a43778ac63..fce08470d1c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetMultiplicityEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetMultiplicityEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -55,11 +55,11 @@ public class AssociationLinkLabelTargetMultiplicityEditPart extends AbstractElem
 	 */
 	@Override
 	public EObject getParserElement() {
-		Association association = (Association)resolveSemanticElement();
-		if((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
+		Association association = (Association) resolveSemanticElement();
+		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
 			View owner = ViewUtil.getContainerView(getNotationView());
 
-			if((association != null) && (association.getMemberEnds().size() == 2)) {
+			if ((association != null) && (association.getMemberEnds().size() == 2)) {
 				return AssociationViewUtils.getTargetSemanticEnd(owner);
 			}
 		}
@@ -78,6 +78,7 @@ public class AssociationLinkLabelTargetMultiplicityEditPart extends AbstractElem
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "TargetMultiplicity"; //$NON-NLS-1$
 	}
@@ -85,6 +86,7 @@ public class AssociationLinkLabelTargetMultiplicityEditPart extends AbstractElem
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetRoleEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetRoleEditPart.java
index fa7651eccf5..0f97e73bc83 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetRoleEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetRoleEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -55,11 +55,11 @@ public class AssociationLinkLabelTargetRoleEditPart extends AbstractElementLabel
 	 */
 	@Override
 	public EObject getParserElement() {
-		Association association = (Association)resolveSemanticElement();
-		if((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
+		Association association = (Association) resolveSemanticElement();
+		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
 			View owner = ViewUtil.getContainerView(getNotationView());
 
-			if((association != null) && (association.getMemberEnds().size() == 2)) {
+			if ((association != null) && (association.getMemberEnds().size() == 2)) {
 				return AssociationViewUtils.getTargetSemanticEnd(owner);
 			}
 		}
@@ -70,6 +70,7 @@ public class AssociationLinkLabelTargetRoleEditPart extends AbstractElementLabel
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "TargetRole"; //$NON-NLS-1$
 	}
@@ -77,6 +78,7 @@ public class AssociationLinkLabelTargetRoleEditPart extends AbstractElementLabel
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelEditPart.java
index a4e327cf875..25762bee405 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -40,6 +40,7 @@ public class ConnectorLinkLabelEditPart extends AbstractElementLabelEditPart {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "Label"; //$NON-NLS-1$
 	}
@@ -47,6 +48,7 @@ public class ConnectorLinkLabelEditPart extends AbstractElementLabelEditPart {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelSourceMultiplicityEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelSourceMultiplicityEditPart.java
index d007ac11ad8..9745ff2805c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelSourceMultiplicityEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelSourceMultiplicityEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -54,11 +54,11 @@ public class ConnectorLinkLabelSourceMultiplicityEditPart extends AbstractElemen
 	 */
 	@Override
 	public EObject getParserElement() {
-		Connector connector = (Connector)resolveSemanticElement();
-		if((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
+		Connector connector = (Connector) resolveSemanticElement();
+		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
 			View owner = ViewUtil.getContainerView(getNotationView());
 
-			if((connector != null) && (connector.getEnds().size() == 2)) {
+			if ((connector != null) && (connector.getEnds().size() == 2)) {
 				return connector.getEnds().get(0);
 			}
 		}
@@ -77,6 +77,7 @@ public class ConnectorLinkLabelSourceMultiplicityEditPart extends AbstractElemen
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "SourceMultiplicity"; //$NON-NLS-1$
 	}
@@ -84,6 +85,7 @@ public class ConnectorLinkLabelSourceMultiplicityEditPart extends AbstractElemen
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelTargetMultiplicityEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelTargetMultiplicityEditPart.java
index 189a7163b72..3aa1bf9a804 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelTargetMultiplicityEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelTargetMultiplicityEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -54,11 +54,11 @@ public class ConnectorLinkLabelTargetMultiplicityEditPart extends AbstractElemen
 	 */
 	@Override
 	public EObject getParserElement() {
-		Connector connector = (Connector)resolveSemanticElement();
-		if((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
+		Connector connector = (Connector) resolveSemanticElement();
+		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
 			View owner = ViewUtil.getContainerView(getNotationView());
 
-			if((connector != null) && (connector.getEnds().size() == 2)) {
+			if ((connector != null) && (connector.getEnds().size() == 2)) {
 				connector.getEnds().get(1);
 			}
 		}
@@ -77,6 +77,7 @@ public class ConnectorLinkLabelTargetMultiplicityEditPart extends AbstractElemen
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "TargetMultiplicity"; //$NON-NLS-1$
 	}
@@ -84,6 +85,7 @@ public class ConnectorLinkLabelTargetMultiplicityEditPart extends AbstractElemen
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java
index fed634068a9..42747fdd004 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java
@@ -102,14 +102,14 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 
 	/**
 	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * 
+	 *
 	 * @generated
 	 */
 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
 
 	/**
 	 * configuration from a registered edit dialog
-	 * 
+	 *
 	 * @generated
 	 */
 	protected IDirectEditorConfiguration configuration;
@@ -136,12 +136,12 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	protected String getLabelTextHelper(IFigure figure) {
-		if(figure instanceof WrappingLabel) {
-			return ((WrappingLabel)figure).getText();
-		} else if(figure instanceof ILabelFigure) {
-			return ((ILabelFigure)figure).getText();
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
 		} else {
-			return ((Label)figure).getText();
+			return ((Label) figure).getText();
 		}
 	}
 
@@ -149,12 +149,12 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	protected void setLabelTextHelper(IFigure figure, String text) {
-		if(figure instanceof WrappingLabel) {
-			((WrappingLabel)figure).setText("{" + text + "}");
-		} else if(figure instanceof ILabelFigure) {
-			((ILabelFigure)figure).setText(text);
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText("{" + text + "}");
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
 		} else {
-			((Label)figure).setText(text);
+			((Label) figure).setText(text);
 		}
 	}
 
@@ -162,12 +162,12 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	protected Image getLabelIconHelper(IFigure figure) {
-		if(figure instanceof WrappingLabel) {
-			return ((WrappingLabel)figure).getIcon();
-		} else if(figure instanceof ILabelFigure) {
-			return ((ILabelFigure)figure).getIcon();
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
 		} else {
-			return ((Label)figure).getIcon();
+			return ((Label) figure).getIcon();
 		}
 	}
 
@@ -175,12 +175,12 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if(figure instanceof WrappingLabel) {
-			((WrappingLabel)figure).setIcon(icon);
-		} else if(figure instanceof ILabelFigure) {
-			((ILabelFigure)figure).setIcon(icon);
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
 		} else {
-			((Label)figure).setIcon(icon);
+			((Label) figure).setIcon(icon);
 		}
 	}
 
@@ -231,10 +231,10 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	protected String getLabelText() {
 		String text = null;
 		EObject parserElement = getParserElement();
-		if(parserElement != null && getParser() != null) {
+		if (parserElement != null && getParser() != null) {
 			text = getParser().getPrintString(new SemanticAdapter(parserElement, getNotationView()), getParserOptions().intValue());
 		}
-		if(text == null) {
+		if (text == null) {
 			text = "";
 		}
 		return text;
@@ -243,23 +243,25 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	/**
 	 * @generated
 	 */
+	@Override
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
 		}
 	}
 
 	/**
 	 * @generated
 	 */
+	@Override
 	public String getEditText() {
-		if(getParserElement() == null || getParser() == null) {
+		if (getParserElement() == null || getParser() == null) {
 			return ""; //$NON-NLS-1$
 		}
 		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
@@ -275,23 +277,26 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	/**
 	 * @generated
 	 */
+	@Override
 	public ICellEditorValidator getEditTextValidator() {
 		return new ICellEditorValidator() {
 
+			@Override
 			@SuppressWarnings("rawtypes")
 			public String isValid(final Object value) {
-				if(value instanceof String) {
+				if (value instanceof String) {
 					final EObject element = getParserElement();
 					final IParser parser = getParser();
 					try {
-						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
 
+							@Override
 							@SuppressWarnings("unchecked")
 							public void run() {
-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));
+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
 							}
 						});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
 					} catch (InterruptedException ie) {
 						ie.printStackTrace();
 					}
@@ -305,8 +310,9 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	/**
 	 * @generated
 	 */
+	@Override
 	public IContentAssistProcessor getCompletionProcessor() {
-		if(getParserElement() == null || getParser() == null) {
+		if (getParserElement() == null || getParser() == null) {
 			return null;
 		}
 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
@@ -315,6 +321,7 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	/**
 	 * @generated
 	 */
+	@Override
 	public ParserOptions getParserOptions() {
 		return ParserOptions.NONE;
 	}
@@ -322,8 +329,9 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	/**
 	 * @generated
 	 */
+	@Override
 	public IParser getParser() {
-		if(parser == null) {
+		if (parser == null) {
 			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3120, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN.VISUAL_ID));
 		}
 		return parser;
@@ -333,7 +341,7 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	protected DirectEditManager getManager() {
-		if(manager == null) {
+		if (manager == null) {
 			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -357,8 +365,8 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	protected void performDirectEdit(Point eventLocation) {
-		if(getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
 		}
 	}
 
@@ -366,8 +374,8 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	private void performDirectEdit(char initialCharacter) {
-		if(getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager)getManager()).show(initialCharacter);
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
 		} else {
 			performDirectEdit();
 		}
@@ -379,39 +387,39 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	@Override
 	protected void performDirectEditRequest(Request request) {
 		final Request theRequest = request;
-		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
 			directEditionMode = getDirectEditionType();
 		}
-		switch(directEditionMode) {
+		switch (directEditionMode) {
 		case IDirectEdition.NO_DIRECT_EDITION:
 			// no direct edition mode => does nothing
 			return;
 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
 			updateExtendedEditorConfiguration();
-			if(configuration == null || configuration.getLanguage() == null) {
+			if (configuration == null || configuration.getLanguage() == null) {
 				performDefaultDirectEditorEdit(theRequest);
 			} else {
 				configuration.preEditAction(resolveSemanticElement());
 				Dialog dialog = null;
-				if(configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);
+				if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
 					helper.showEditor();
 					return;
-				} else if(configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if(configuration instanceof IDirectEditorConfiguration) {
+				} else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
 					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
 				} else {
 					return;
 				}
 				final Dialog finalDialog = dialog;
-				if(Window.OK == dialog.open()) {
+				if (Window.OK == dialog.open()) {
 					TransactionalEditingDomain domain = getEditingDomain();
 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
 
 						@Override
 						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
 						}
 					};
 					domain.getCommandStack().execute(command);
@@ -423,13 +431,14 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 			try {
 				getEditingDomain().runExclusive(new Runnable() {
 
+					@Override
 					public void run() {
-						if(isActive() && isEditable()) {
-							if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-								Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+						if (isActive() && isEditable()) {
+							if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+								Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
 								performDirectEdit(initialChar.charValue());
-							} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-								DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+							} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+								DirectEditRequest editRequest = (DirectEditRequest) theRequest;
 								performDirectEdit(editRequest.getLocation());
 							} else {
 								performDirectEdit();
@@ -464,17 +473,17 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 */
 	protected void refreshLabel() {
 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if(maskLabelPolicy == null) {
+		if (maskLabelPolicy == null) {
 			setLabelTextHelper(getFigure(), getLabelText());
 			setLabelIconHelper(getFigure(), getLabelIcon());
 		}
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -482,15 +491,15 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	protected void refreshUnderline() {
-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
 		}
-		if(resolveSemanticElement() instanceof Feature) {
-			if(((Feature)resolveSemanticElement()).isStatic()) {
-				((WrappingLabel)getFigure()).setTextUnderline(true);
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
 			} else {
-				((WrappingLabel)getFigure()).setTextUnderline(false);
+				((WrappingLabel) getFigure()).setTextUnderline(false);
 			}
 		}
 	}
@@ -499,9 +508,9 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
 		}
 	}
 
@@ -510,8 +519,8 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 */
 	@Override
 	protected void refreshFont() {
-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if(style != null) {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
 			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
 			setFont(fontData);
 		}
@@ -527,11 +536,11 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 
 	@Override
 	protected void addSemanticListeners() {
-		if(getParser() instanceof ISemanticParser) {
+		if (getParser() instanceof ISemanticParser) {
 			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);
-			for(int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
 			}
 			addListenerFilter("SemanticModelConstraintOwner", this, element); // in order to refresh label when ConstraintSpecification creation
 		} else {
@@ -544,8 +553,8 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 */
 	@Override
 	protected void removeSemanticListeners() {
-		if(parserElements != null) {
-			for(int i = 0; i < parserElements.size(); i++) {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
 			}
 		} else {
@@ -558,7 +567,7 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 */
 	@Override
 	protected AccessibleEditPart getAccessibleEditPart() {
-		if(accessibleEP == null) {
+		if (accessibleEP == null) {
 			accessibleEP = new AccessibleGraphicalEditPart() {
 
 				@Override
@@ -579,16 +588,16 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 
 	/**
 	 * Returns the kind of associated editor for direct edition.
-	 * 
+	 *
 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
-		if(checkExtendedEditor()) {
+		if (checkExtendedEditor()) {
 			initExtendedEditorConfiguration();
 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
 		}
-		if(checkDefaultEdition()) {
+		if (checkDefaultEdition()) {
 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
 		}
 		// not a named element. no specific editor => do nothing
@@ -597,12 +606,12 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 
 	/**
 	 * Checks if an extended editor is present.
-	 * 
+	 *
 	 * @return <code>true</code> if an extended editor is present.
 	 * @generated
 	 */
 	protected boolean checkExtendedEditor() {
-		if(resolveSemanticElement() != null) {
+		if (resolveSemanticElement() != null) {
 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
 		}
 		return false;
@@ -610,7 +619,7 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 
 	/**
 	 * Checks if a default direct edition is available
-	 * 
+	 *
 	 * @return <code>true</code> if a default direct edition is available
 	 * @generated
 	 */
@@ -620,13 +629,13 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 
 	/**
 	 * Initializes the extended editor configuration
-	 * 
+	 *
 	 * @generated
 	 */
 	protected void initExtendedEditorConfiguration() {
-		if(configuration == null) {
+		if (configuration == null) {
 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if(languagePreferred != null && !languagePreferred.equals("")) {
+			if (languagePreferred != null && !languagePreferred.equals("")) {
 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
 			} else {
 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
@@ -636,23 +645,23 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 
 	/**
 	 * Updates the preference configuration
-	 * 
+	 *
 	 * @generated
 	 */
 	protected void updateExtendedEditorConfiguration() {
 		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
+		if (languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
 			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
 			configuration = null;
 		}
 	}
 
 	/**
 	 * Performs the direct edit usually used by GMF editors.
-	 * 
+	 *
 	 * @param theRequest
-	 *        the direct edit request that starts the direct edit system
+	 *            the direct edit request that starts the direct edit system
 	 * @generated
 	 */
 	protected void performDefaultDirectEditorEdit(final Request theRequest) {
@@ -660,13 +669,14 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 		try {
 			getEditingDomain().runExclusive(new Runnable() {
 
+				@Override
 				public void run() {
-					if(isActive() && isEditable()) {
-						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
 							performDirectEdit(initialChar.charValue());
-						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
 							performDirectEdit(editRequest.getLocation());
 						} else {
 							performDirectEdit();
@@ -704,24 +714,25 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	protected void handleNotificationEvent(Notification event) {
 		refreshLabel();
 		Object feature = event.getFeature();
-		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer)event.getNewValue();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
 			refreshUnderline();
-		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
 			refreshStrikeThrough();
-		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
 			refreshFont();
 		} else {
-			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
 				refreshLabel();
 			}
-			if(getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser)getParser();
-				if(modelParser.areSemanticElementsAffected(null, event)) {
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser = (ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
 					removeSemanticListeners();
-					if(resolveSemanticElement() != null) {
+					if (resolveSemanticElement() != null) {
 						addSemanticListeners();
 					}
 					refreshLabel();
@@ -758,7 +769,7 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated
 	 */
 	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));
+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/DefaultChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/DefaultChildLabelEditPart.java
index 1007e6ea660..340cae24c2d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/DefaultChildLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/DefaultChildLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java
index 686ca733116..ad80b85b461 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -48,20 +48,22 @@ public class NamedElementAffixedLabelNameEditPart extends AbstractElementLabelEd
 		super.createDefaultEditPolicies();
 	}
 
+	@Override
 	public IBorderItemLocator getBorderItemLocator() {
 		IFigure parentFigure = getFigure().getParent();
-		if(parentFigure != null && parentFigure.getLayoutManager() != null) {
+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator)constraint;
+			return (IBorderItemLocator) constraint;
 		}
 		return null;
 	}
 
+	@Override
 	public void refreshBounds() {
-		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
 
 		// Update locator constraint
 		IBorderItemLocator locator = getBorderItemLocator();
@@ -77,13 +79,13 @@ public class NamedElementAffixedLabelNameEditPart extends AbstractElementLabelEd
 	@Override
 	protected Image getLabelIcon() {
 		EObject parserElement = getParserElement();
-		if(parserElement == null) {
+		if (parserElement == null) {
 			return null;
 		}
 
 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for(View view : views) {
-			if(NameLabelIconHelper.showLabelIcon(view)) {
+		for (View view : views) {
+			if (NameLabelIconHelper.showLabelIcon(view)) {
 				return Activator.getInstance().getImage(parserElement.eClass());
 			}
 		}
@@ -108,6 +110,7 @@ public class NamedElementAffixedLabelNameEditPart extends AbstractElementLabelEd
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "Name"; //$NON-NLS-1$
 	}
@@ -115,6 +118,7 @@ public class NamedElementAffixedLabelNameEditPart extends AbstractElementLabelEd
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementLinkLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementLinkLabelNameEditPart.java
index 804b3a2f8d9..891d89122ea 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementLinkLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementLinkLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -40,6 +40,7 @@ public class NamedElementLinkLabelNameEditPart extends AbstractElementLabelEditP
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "Name"; //$NON-NLS-1$
 	}
@@ -47,6 +48,7 @@ public class NamedElementLinkLabelNameEditPart extends AbstractElementLabelEditP
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementNodeLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementNodeLabelNameEditPart.java
index 4579e5d48fc..e8bce50738f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementNodeLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementNodeLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,6 +36,7 @@ public class NamedElementNodeLabelNameEditPart extends AbstractElementNodeLabelE
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "Name"; //$NON-NLS-1$
 	}
@@ -43,6 +44,7 @@ public class NamedElementNodeLabelNameEditPart extends AbstractElementNodeLabelE
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java
index 6834dc1ad6b..6ff177923c1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -47,20 +47,22 @@ public class PortAffixedLabelNameEditPart extends AbstractElementLabelEditPart i
 		super.createDefaultEditPolicies();
 	}
 
+	@Override
 	public IBorderItemLocator getBorderItemLocator() {
 		IFigure parentFigure = getFigure().getParent();
-		if(parentFigure != null && parentFigure.getLayoutManager() != null) {
+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator)constraint;
+			return (IBorderItemLocator) constraint;
 		}
 		return null;
 	}
 
+	@Override
 	public void refreshBounds() {
-		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
 
 		// Update locator constraint
 		IBorderItemLocator locator = getBorderItemLocator();
@@ -76,13 +78,13 @@ public class PortAffixedLabelNameEditPart extends AbstractElementLabelEditPart i
 	@Override
 	protected Image getLabelIcon() {
 		EObject parserElement = getParserElement();
-		if(parserElement == null) {
+		if (parserElement == null) {
 			return null;
 		}
 
 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for(View view : views) {
-			if(NameLabelIconHelper.showLabelIcon(view)) {
+		for (View view : views) {
+			if (NameLabelIconHelper.showLabelIcon(view)) {
 				return Activator.getInstance().getLabelProvider().getImage(parserElement);
 			}
 		}
@@ -107,6 +109,7 @@ public class PortAffixedLabelNameEditPart extends AbstractElementLabelEditPart i
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "Label"; //$NON-NLS-1$
 	}
@@ -114,6 +117,7 @@ public class PortAffixedLabelNameEditPart extends AbstractElementLabelEditPart i
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyNodeLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyNodeLabelEditPart.java
index 1f828e0f627..05446ab6a64 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyNodeLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyNodeLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,6 +36,7 @@ public class PropertyNodeLabelEditPart extends AbstractElementNodeLabelEditPart
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getLabelRole() {
 		return "Label"; //$NON-NLS-1$
 	}
@@ -43,6 +44,7 @@ public class PropertyNodeLabelEditPart extends AbstractElementNodeLabelEditPart
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getIconPathRole() {
 		return ""; //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/SlotChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/SlotChildLabelEditPart.java
index effec08a44f..2f2249a21b5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/SlotChildLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/SlotChildLabelEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java
index c8948559040..6e1758cce62 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/MaskManagedLabelEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/MaskManagedLabelEditPolicy.java
index 528da1c1d09..f751822b0a6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/MaskManagedLabelEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/MaskManagedLabelEditPolicy.java
@@ -38,12 +38,13 @@ public class MaskManagedLabelEditPolicy extends GraphicalEditPolicy implements I
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>();
 
 		IParser parser = getHostLabelEditPart().getParser();
-		if(parser instanceof IMaskManagedSemanticParser) {
-			masks = ((IMaskManagedSemanticParser)parser).getMasks();
+		if (parser instanceof IMaskManagedSemanticParser) {
+			masks = ((IMaskManagedSemanticParser) parser).getMasks();
 		}
 
 		return masks;
@@ -52,16 +53,17 @@ public class MaskManagedLabelEditPolicy extends GraphicalEditPolicy implements I
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public Collection<String> getCurrentDisplayValue() {
 		Collection<String> result = MaskLabelHelper.getMaskValues(getView());
-		if(result == null) {
+		if (result == null) {
 			IParser parser = getHostLabelEditPart().getParser();
-			if(parser instanceof IMaskManagedSemanticParser) {
-				result = ((IMaskManagedSemanticParser)parser).getDefaultValue(getHost());
+			if (parser instanceof IMaskManagedSemanticParser) {
+				result = ((IMaskManagedSemanticParser) parser).getDefaultValue(getHost());
 			}
 		}
 
-		if(result == null) {
+		if (result == null) {
 			return Collections.emptySet();
 		}
 
@@ -71,6 +73,7 @@ public class MaskManagedLabelEditPolicy extends GraphicalEditPolicy implements I
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void updateDisplayValue(Collection<String> maskValues) {
 		MaskLabelHelper.setMaskValues(getView(), maskValues);
 	}
@@ -78,25 +81,27 @@ public class MaskManagedLabelEditPolicy extends GraphicalEditPolicy implements I
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setDefaultDisplayValue() {
 		MaskLabelHelper.unsetMaskValues(getView());
 	}
 
 	// @unused.
+	@Override
 	public void refreshDisplay() {
 		// Not implemented.
 	}
 
 	/**
 	 * Get the host label edit part (has to implement {@link ITextAwareEditPart}).
-	 * 
+	 *
 	 * @return the host label edit part.
 	 */
 	private ITextAwareEditPart getHostLabelEditPart() {
-		return (ITextAwareEditPart)getHost();
+		return (ITextAwareEditPart) getHost();
 	}
 
 	private View getView() {
-		return (View)getHost().getModel();
+		return (View) getHost().getModel();
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java
index e7c576a2f6e..eea5f2e0b25 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -82,14 +82,14 @@ public class StructuredClassifierCreationEditPolicy extends CreationEditPolicy {
 
 		// CreateViewCommand replace the semantic adapter in its call to ViewService to know if a provider exists.
 
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
 		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);
 
 		Iterator<? extends ViewDescriptor> descriptors = request.getViewDescriptors().iterator();
-		while(descriptors.hasNext()) {
+		while (descriptors.hasNext()) {
 
-			CreateViewRequest.ViewDescriptor descriptor = (CreateViewRequest.ViewDescriptor)descriptors.next();
-			ICommand createCommand = new CreateViewCommand(editingDomain, descriptor, (View)(getHost().getModel()));
+			CreateViewRequest.ViewDescriptor descriptor = descriptors.next();
+			ICommand createCommand = new CreateViewCommand(editingDomain, descriptor, (View) (getHost().getModel()));
 
 			// Add SetBounds
 			createCommand = CompositeCommand.compose(createCommand, getSetBoundsCommand(request, descriptor));
@@ -105,28 +105,28 @@ public class StructuredClassifierCreationEditPolicy extends CreationEditPolicy {
 
 	/**
 	 * Get a SetBoundsCommand to move a new view at current mouse position.
-	 * 
+	 *
 	 * @param request
-	 *        The creation request.
+	 *            The creation request.
 	 * @param descriptor
-	 *        The descriptor of the new element.
+	 *            The descriptor of the new element.
 	 * @return The set bounds command.
 	 */
 	private ICommand getSetBoundsCommand(CreateViewRequest request, CreateViewRequest.ViewDescriptor descriptor) {
 		ICommand setBoundsCommand = null;
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
 
 		// Retrieve parent location
 		Point parentLoc = getHostFigure().getBounds().getLocation().getCopy();
 
-		
+
 		final Point realWantedLocation;
 		Map<?, ?> params = request.getExtendedData();
-		Point realLocation = (Point)params.get(AspectUnspecifiedTypeCreationTool.INITIAL_MOUSE_LOCATION_FOR_CREATION);
-		if(realLocation != null) {
+		Point realLocation = (Point) params.get(AspectUnspecifiedTypeCreationTool.INITIAL_MOUSE_LOCATION_FOR_CREATION);
+		if (realLocation != null) {
 			realWantedLocation = realLocation.getCopy();
 		} else {
-			//we use this location to be able to create Port in the corners of the figure
+			// we use this location to be able to create Port in the corners of the figure
 			realWantedLocation = request.getLocation().getCopy();
 		}
 
@@ -141,18 +141,19 @@ public class StructuredClassifierCreationEditPolicy extends CreationEditPolicy {
 		PortPositionLocator locator = new PortPositionLocator(getHostFigure(), PositionConstants.NONE);
 		final Rectangle preferredBounds = locator.getPreferredLocation(new Rectangle(requestedLocation, new Dimension(20, 20)));
 		Rectangle retainedBounds = preferredBounds.getCopy();
-		
-		//find the current side of the wanted position
+
+		// find the current side of the wanted position
 		final Rectangle parentBounds = getHostFigure().getBounds().getCopy();
-		//break all!!! getHostFigure().translateToAbsolute(parentBounds);
+		// break all!!! getHostFigure().translateToAbsolute(parentBounds);
 		locator.setConstraint(preferredBounds.getCopy().translate(parentBounds.getLocation().getNegated()));
 		int currentSide = locator.getCurrentSideOfParent();
-		if(request.isSnapToEnabled() && currentSide != PositionConstants.NORTH_EAST && currentSide != PositionConstants.NORTH_WEST && currentSide != PositionConstants.SOUTH_EAST && currentSide != PositionConstants.SOUTH_WEST) { //request for snap port at the creation
-			//we find the best location with snap
+		if (request.isSnapToEnabled() && currentSide != PositionConstants.NORTH_EAST && currentSide != PositionConstants.NORTH_WEST && currentSide != PositionConstants.SOUTH_EAST && currentSide != PositionConstants.SOUTH_WEST) { // request for snap port at the
+																																																										// creation
+			// we find the best location with snap
 			Point wantedPoint = preferredBounds.getLocation();
 			getHostFigure().translateToAbsolute(wantedPoint);
 			Rectangle portBounds = new Rectangle(wantedPoint, new Dimension(20, 20));
-			NodeSnapHelper helper = new NodeSnapHelper((SnapToHelper)getHost().getAdapter(SnapToHelper.class), portBounds, false, false, true);
+			NodeSnapHelper helper = new NodeSnapHelper((SnapToHelper) getHost().getAdapter(SnapToHelper.class), portBounds, false, false, true);
 			final ChangeBoundsRequest tmpRequest = new ChangeBoundsRequest("move"); //$NON-NLS-1$
 			tmpRequest.setEditParts(Collections.emptyList());
 			tmpRequest.setSnapToEnabled(true);
@@ -160,7 +161,7 @@ public class StructuredClassifierCreationEditPolicy extends CreationEditPolicy {
 			helper.snapPoint(tmpRequest);
 			preferredBounds.translate(tmpRequest.getMoveDelta());
 
-			switch(currentSide) {
+			switch (currentSide) {
 			case PositionConstants.NORTH:
 			case PositionConstants.SOUTH:
 				preferredBounds.y = retainedBounds.y;
@@ -181,10 +182,10 @@ public class StructuredClassifierCreationEditPolicy extends CreationEditPolicy {
 
 	/**
 	 * Convenience method to return the host's Figure.
-	 * 
+	 *
 	 * @return The host GraphicalEditPart's Figure
 	 */
 	private IFigure getHostFigure() {
-		return ((GraphicalEditPart)getHost()).getFigure();
+		return ((GraphicalEditPart) getHost()).getFigure();
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/AssociationLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/AssociationLinkViewFactory.java
index bad1bf0e473..87594cbb4bf 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/AssociationLinkViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/AssociationLinkViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -37,7 +37,7 @@ public class AssociationLinkViewFactory extends ConnectorViewFactory {
 	 * <pre>
 	 * {@inheritDoc}
 	 * 
-	 * Add two EObjectValueStyle in order to store the Properties that are associated with 
+	 * Add two EObjectValueStyle in order to store the Properties that are associated with
 	 * the Graphical ends.
 	 * </pre>
 	 */
@@ -65,10 +65,10 @@ public class AssociationLinkViewFactory extends ConnectorViewFactory {
 	 */
 	@Override
 	public View createView(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Edge view = (Edge)super.createView(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
+		Edge view = (Edge) super.createView(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
 
-		if((view != null) && (view.getElement() != null) && (view.getElement() instanceof Association)) {
-			Association association = (Association)view.getElement();
+		if ((view != null) && (view.getElement() != null) && (view.getElement() instanceof Association)) {
+			Association association = (Association) view.getElement();
 
 			assert (association.getMemberEnds().size() == 2);
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/ClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/ClassifierViewFactory.java
index fcfbb2aed63..f52c3a73ce5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/ClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/ClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
 /**
  * View factory for UML Classifier.
- * 
+ *
  * FIXME : NestedClassifier compartment is not yet supported.
  */
 public class ClassifierViewFactory extends ShapeViewFactory {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java
index a23a64ba4f3..c1a4d84c04c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -38,6 +38,7 @@ public class ConnectorEdgeFigure extends NamedElementEdgeFigure {
 	/**
 	 * Creates the contents.
 	 */
+	@Override
 	protected void createContents() {
 		super.createContents();
 
@@ -55,16 +56,17 @@ public class ConnectorEdgeFigure extends NamedElementEdgeFigure {
 
 	/**
 	 * Gets the applied stereotype association label.
-	 * 
+	 *
 	 * @return the applied stereotype association label
 	 */
+	@Override
 	public WrappingLabel getAppliedStereotypeLabel() {
 		return appliedStereotypeLabel;
 	}
 
 	/**
 	 * Gets the multiplicity source label.
-	 * 
+	 *
 	 * @return the multiplicity source label
 	 */
 	public WrappingLabel getSourceMultiplicityLabel() {
@@ -73,7 +75,7 @@ public class ConnectorEdgeFigure extends NamedElementEdgeFigure {
 
 	/**
 	 * Gets the multiplicity target label.
-	 * 
+	 *
 	 * @return the multiplicity target label
 	 */
 	public WrappingLabel getTargetMultiplicityLabel() {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/EdgeDecorationType.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/EdgeDecorationType.java
index c6b19b64614..f0c43819175 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/EdgeDecorationType.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/EdgeDecorationType.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.notation.ArrowType;
  */
 public final class EdgeDecorationType {
 
-	public static final int NONE = ArrowType.NONE; //0
+	public static final int NONE = ArrowType.NONE; // 0
 
 	public static final int OPEN_ARROW = ArrowType.OPEN_ARROW; // 1
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/GeneralizationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/GeneralizationFigure.java
index 78e43a20bf9..51a89d59f97 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/GeneralizationFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/GeneralizationFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceRealizationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceRealizationFigure.java
index f18f823633f..2511b00e612 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceRealizationFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceRealizationFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java
index 2d0b95a3dec..b9f2bcf23f1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -38,7 +38,7 @@ public class NamedElementEdgeFigure extends UMLEdgeFigure {
 		super();
 
 		// set dashes
-		for(int i = 0; i < 10; i++) {
+		for (int i = 0; i < 10; i++) {
 			dashes[i] = 5;
 		}
 		setLineDash(dashes);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java
index 33fdd110b3c..7142acc23d9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
 import org.eclipse.uml2.uml.Association;
 import org.eclipse.uml2.uml.InstanceValue;
@@ -45,21 +46,21 @@ public class AssociationEndLabelParser extends PropertyLabelParser {
 	public String getPrintString(IAdaptable element, int flags) {
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = "";
-		EObject eObject =EMFHelper.getEObject(element);
+		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof Property)) {
+		if ((eObject != null) && (eObject instanceof Property)) {
 
-			Property property = (Property)eObject;
+			Property property = (Property) eObject;
 
 			// manage visibility
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_VISIBILITY)) {
+			if (maskValues.contains(ICustomAppearance.DISP_VISIBILITY)) {
 				String visibility;
-				switch(property.getVisibility().getValue()) {
+				switch (property.getVisibility().getValue()) {
 				case VisibilityKind.PACKAGE:
 					visibility = "~";
 					break;
@@ -80,46 +81,46 @@ public class AssociationEndLabelParser extends PropertyLabelParser {
 			}
 
 			// manage derived modifier
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_DERIVE) && property.isDerived()) {
+			if (maskValues.contains(ICustomAppearance.DISP_DERIVE) && property.isDerived()) {
 				result = String.format(DERIVED_FORMAT, result);
 			}
 
 			// manage name
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_NAME) && property.isSetName()) {
+			if (maskValues.contains(ICustomAppearance.DISP_NAME) && property.isSetName()) {
 				String name = property.getName();
 
 				// If property is owned by Association (non navigable) only show the name when explicitly asked.
 
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_NON_NAVIGABLE_ROLE) || !((property.getOwningAssociation() != null) && (property.getOwningAssociation().getOwnedEnds().contains(property)))) {
+				if (maskValues.contains(ILabelPreferenceConstants.DISP_NON_NAVIGABLE_ROLE) || !((property.getOwningAssociation() != null) && (property.getOwningAssociation().getOwnedEnds().contains(property)))) {
 
 					result = String.format(NAME_FORMAT, result, name);
 				}
 			}
 
 			// manage type
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_TYPE)) {
+			if (maskValues.contains(ICustomAppearance.DISP_TYPE)) {
 				String type = "<Undefined>";
-				if(property.getType() != null) {
+				if (property.getType() != null) {
 					type = property.getType().getName();
 				}
 
 				// If type is undefined only show "<Undefined>" when explicitly asked.
 
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || (!"<Undefined>".equals(type))) {
+				if (maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || (!"<Undefined>".equals(type))) {
 
 					result = String.format(TYPE_FORMAT, result, type);
 				}
 			}
 
 			// manage multiplicity
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_MULTIPLICITY)) {
+			if (maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY)) {
 
 				// If multiplicity is [1] (SysML default), only show when explicitly asked.
 				String lower = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getLowerValue()) : "1";
 				String upper = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getUpperValue()) : "1";
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
+				if (maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
 
-					if(lower.equals(upper)) {
+					if (lower.equals(upper)) {
 						result = String.format(MULTIPLICITY_FORMAT_ALT, result, lower, upper);
 					} else {
 						result = String.format(MULTIPLICITY_FORMAT, result, lower, upper);
@@ -128,35 +129,35 @@ public class AssociationEndLabelParser extends PropertyLabelParser {
 			}
 
 			// manage default value
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_VALUE) && property.getDefaultValue() != null) {
+			if (maskValues.contains(ICustomAppearance.DISP_DEFAULT_VALUE) && property.getDefaultValue() != null) {
 				ValueSpecification valueSpecification = property.getDefaultValue();
-				if((valueSpecification instanceof InstanceValue && property.getType().equals(valueSpecification.getType())) || !(valueSpecification instanceof InstanceValue)) {
+				if ((valueSpecification instanceof InstanceValue && property.getType().equals(valueSpecification.getType())) || !(valueSpecification instanceof InstanceValue)) {
 					result = String.format(DEFAULT_VALUE_FORMAT, result, ValueSpecificationUtil.getSpecificationValue(valueSpecification));
 				}
 			}
 
 			// manage modifier
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_MODIFIERS)) {
+			if (maskValues.contains(ICustomAppearance.DISP_MODIFIERS)) {
 				StringBuffer sb = new StringBuffer();
-				if(property.isReadOnly()) {
+				if (property.isReadOnly()) {
 					sb.append(sb.length() == 0 ? "readOnly" : ", readOnly");
 				}
-				if(property.isOrdered()) {
+				if (property.isOrdered()) {
 					sb.append(sb.length() == 0 ? "ordered" : ", ordered");
 				}
-				if(property.isUnique()) {
+				if (property.isUnique()) {
 					sb.append(sb.length() == 0 ? "unique" : ", unique");
 				}
-				if(property.isDerivedUnion()) {
+				if (property.isDerivedUnion()) {
 					sb.append(sb.length() == 0 ? "union" : ", union");
 				}
 				EList<Property> redefinedProperties = property.getRedefinedProperties();
-				if(redefinedProperties != null && !redefinedProperties.isEmpty()) {
-					for(Property p : redefinedProperties) {
+				if (redefinedProperties != null && !redefinedProperties.isEmpty()) {
+					for (Property p : redefinedProperties) {
 						sb.append(sb.length() == 0 ? p.getName() : ", redefines " + p.getName());
 					}
 				}
-				if(sb.length() != 0) {
+				if (sb.length() != 0) {
 					result = String.format(ALT_MODIFIER_FORMAT, sb.toString(), result);
 				}
 			}
@@ -174,15 +175,15 @@ public class AssociationEndLabelParser extends PropertyLabelParser {
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		View view = (View)element.getAdapter(View.class);
-		if(view == null) {
+		View view = (View) element.getAdapter(View.class);
+		if (view == null) {
 			return super.getDefaultValue(element);
 		}
 
-		if(view.getType() != null && view.getType().contains("multiplicity")) {
-			return Arrays.asList(ILabelPreferenceConstants.DISP_MULTIPLICITY, ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY);
-		} else if(view.getType() != null && view.getType().contains("role")) {
-			return Arrays.asList(ILabelPreferenceConstants.DISP_NAME, ILabelPreferenceConstants.DISP_VISIBILITY, ILabelPreferenceConstants.DISP_DERIVE);
+		if (view.getType() != null && view.getType().contains("multiplicity")) {
+			return Arrays.asList(ICustomAppearance.DISP_MULTIPLICITY, ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY);
+		} else if (view.getType() != null && view.getType().contains("role")) {
+			return Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_VISIBILITY, ICustomAppearance.DISP_DERIVE);
 		}
 
 		return super.getDefaultValue(element);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConnectorLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConnectorLabelParser.java
index 751e220d76c..d8b67756741 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConnectorLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConnectorLabelParser.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.uml2.uml.Connector;
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -48,32 +49,32 @@ public class ConnectorLabelParser extends NamedElementLabelParser {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = "";
 		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof Connector)) {
+		if ((eObject != null) && (eObject instanceof Connector)) {
 
-			Connector connector = (Connector)eObject;
+			Connector connector = (Connector) eObject;
 
 			// manage name
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_NAME) && (connector.isSetName())) {
+			if (maskValues.contains(ICustomAppearance.DISP_NAME) && (connector.isSetName())) {
 				String name = connector.getName();
 				result = String.format(NAME_FORMAT, name);
 			}
 
 			// manage type
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_TYPE)) {
+			if (maskValues.contains(ICustomAppearance.DISP_TYPE)) {
 				String type = "<Undefined>";
-				if(connector.getType() != null) {
+				if (connector.getType() != null) {
 					type = connector.getType().getName();
 				}
 
 				// If type is undefined only show "<Undefined>" when explicitly asked.
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || !"<Undefined>".equals(type)) {
+				if (maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || !"<Undefined>".equals(type)) {
 					result = String.format(TYPE_FORMAT, result, type);
 				}
 			}
@@ -88,9 +89,9 @@ public class ConnectorLabelParser extends NamedElementLabelParser {
 	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
 				return UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || super.isAffectingEvent(event, flags);
 			}
 		}
@@ -105,11 +106,11 @@ public class ConnectorLabelParser extends NamedElementLabelParser {
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 
-		if((element != null) && (element instanceof Connector)) {
-			Connector semElement = (Connector)element;
+		if ((element != null) && (element instanceof Connector)) {
+			Connector semElement = (Connector) element;
 
 			semanticElementsBeingParsed.add(semElement);
-			if(semElement.getType() != null) {
+			if (semElement.getType() != null) {
 				semanticElementsBeingParsed.add(semElement.getType());
 			}
 		}
@@ -119,14 +120,14 @@ public class ConnectorLabelParser extends NamedElementLabelParser {
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_TYPE, "Type");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_TYPE, "Type");
 		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
 		return masks;
 	}
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_NAME, ILabelPreferenceConstants.DISP_TYPE);
+		return Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
index 5cdb13f6730..b6193fd946d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
 import org.eclipse.uml2.uml.Constraint;
 import org.eclipse.uml2.uml.UMLPackage;
@@ -57,27 +58,27 @@ public class ConstraintLabelParser extends NamedElementLabelParser {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String editString = "";
 
-		EObject eObject =EMFHelper.getEObject(element);
-		if((eObject != null) && (eObject instanceof Constraint)) {
-			Constraint semElement = (Constraint)eObject;
+		EObject eObject = EMFHelper.getEObject(element);
+		if ((eObject != null) && (eObject instanceof Constraint)) {
+			Constraint semElement = (Constraint) eObject;
 
 			// edit name
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_NAME))) {
-				if(semElement.isSetName()) {
+			if ((maskValues.contains(ICustomAppearance.DISP_NAME))) {
+				if (semElement.isSetName()) {
 					editString = semElement.getName();
 				}
 
 				// (try to) edit constraint specification
-			} else if((maskValues.contains(ILabelPreferenceConstants.DISP_SPECIFICATION))) {
-				if(semElement.getSpecification() != null) {
+			} else if ((maskValues.contains(ILabelPreferenceConstants.DISP_SPECIFICATION))) {
+				if (semElement.getSpecification() != null) {
 					editString = ValueSpecificationUtil.getSpecificationValue(semElement.getSpecification());
-					if(editString == null) {
+					if (editString == null) {
 						editString = "";
 					}
 				}
@@ -93,29 +94,29 @@ public class ConstraintLabelParser extends NamedElementLabelParser {
 	public String getPrintString(IAdaptable element, int flags) {
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = "";
 		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof Constraint)) {
+		if ((eObject != null) && (eObject instanceof Constraint)) {
 
-			Constraint semElement = (Constraint)eObject;
+			Constraint semElement = (Constraint) eObject;
 
 			// manage name
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_NAME)) && (semElement.isSetName())) {
+			if ((maskValues.contains(ICustomAppearance.DISP_NAME)) && (semElement.isSetName())) {
 				String name = semElement.getName();
 				result = String.format(NAME_FORMAT, name);
 			}
 
 			// manage specification
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_SPECIFICATION))) {
+			if ((maskValues.contains(ILabelPreferenceConstants.DISP_SPECIFICATION))) {
 				String spec = "<Undefined>";
-				if(semElement.getSpecification() != null) {
+				if (semElement.getSpecification() != null) {
 					spec = ValueSpecificationUtil.getSpecificationValue(semElement.getSpecification());
-					if(spec == null || "".equals(spec)) {
+					if (spec == null || "".equals(spec)) {
 						spec = "<Undefined>";
 					}
 				}
@@ -136,20 +137,20 @@ public class ConstraintLabelParser extends NamedElementLabelParser {
 		ICommand command = UnexecutableCommand.INSTANCE;
 		SetRequest updateRequest = null;
 
-		Constraint constraint = (Constraint)EMFHelper.getEObject(element);
-		if(constraint == null) {
+		Constraint constraint = (Constraint) EMFHelper.getEObject(element);
+		if (constraint == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		// prepare set name request
-		if((maskValues.contains(ILabelPreferenceConstants.DISP_NAME))) {
+		if ((maskValues.contains(ICustomAppearance.DISP_NAME))) {
 			updateRequest = new SetRequest(constraint, UMLPackage.eINSTANCE.getNamedElement_Name(), newString);
 			updateRequest.setLabel("Update Constraint Label");
 
 			// prepare set specification request
-		} else if((maskValues.contains(ILabelPreferenceConstants.DISP_SPECIFICATION))) {
+		} else if ((maskValues.contains(ILabelPreferenceConstants.DISP_SPECIFICATION))) {
 			ValueSpecification spec = constraint.getSpecification();
-			if(spec == null) {
+			if (spec == null) {
 				return UnexecutableCommand.INSTANCE;
 			}
 
@@ -161,7 +162,7 @@ public class ConstraintLabelParser extends NamedElementLabelParser {
 		}
 
 		try {
-			if(updateRequest != null) {
+			if (updateRequest != null) {
 				command = ElementEditServiceUtils.getEditServiceProvider().getEditService(constraint).getEditCommand(updateRequest);
 			}
 
@@ -179,10 +180,12 @@ public class ConstraintLabelParser extends NamedElementLabelParser {
 	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
-				return UMLPackage.eINSTANCE.getValueSpecification__BooleanValue().equals(feature) || UMLPackage.eINSTANCE.getValueSpecification__IntegerValue().equals(feature) || UMLPackage.eINSTANCE.getValueSpecification__StringValue().equals(feature) || UMLPackage.eINSTANCE.getValueSpecification__UnlimitedValue().equals(feature) || UMLPackage.eINSTANCE.getOpaqueExpression_Body().equals(feature) || UMLPackage.eINSTANCE.getOpaqueExpression_Language().equals(feature) || super.isAffectingEvent(event, flags);
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
+				return UMLPackage.eINSTANCE.getValueSpecification__BooleanValue().equals(feature) || UMLPackage.eINSTANCE.getValueSpecification__IntegerValue().equals(feature) || UMLPackage.eINSTANCE.getValueSpecification__StringValue().equals(feature)
+						|| UMLPackage.eINSTANCE.getValueSpecification__UnlimitedValue().equals(feature) || UMLPackage.eINSTANCE.getOpaqueExpression_Body().equals(feature) || UMLPackage.eINSTANCE.getOpaqueExpression_Language().equals(feature)
+						|| super.isAffectingEvent(event, flags);
 			}
 		}
 
@@ -196,11 +199,11 @@ public class ConstraintLabelParser extends NamedElementLabelParser {
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 
-		if((element != null) && (element instanceof Constraint)) {
-			Constraint semElement = (Constraint)element;
+		if ((element != null) && (element instanceof Constraint)) {
+			Constraint semElement = (Constraint) element;
 
 			semanticElementsBeingParsed.add(semElement);
-			if(semElement.getSpecification() != null) {
+			if (semElement.getSpecification() != null) {
 				semanticElementsBeingParsed.add(semElement.getSpecification());
 			}
 		}
@@ -213,7 +216,7 @@ public class ConstraintLabelParser extends NamedElementLabelParser {
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>(2);
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
 		masks.put(ILabelPreferenceConstants.DISP_SPECIFICATION, "Specification");
 		return masks;
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/DefaultParserHintAdapter.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/DefaultParserHintAdapter.java
index 4ad4430074c..1bfb39d67da 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/DefaultParserHintAdapter.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/DefaultParserHintAdapter.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -34,7 +34,7 @@ public class DefaultParserHintAdapter extends ParserHintAdapter {
 	@Override
 	public Object getAdapter(Class adapter) {
 
-		if(adapter.equals(Diagram.class)) {
+		if (adapter.equals(Diagram.class)) {
 			return diagram;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java
index 48ef1416777..a19b9fb7d3e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java
@@ -35,6 +35,7 @@ import org.eclipse.papyrus.gmf.diagram.common.parser.IMaskManagedSemanticParser;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.MaskLabelHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
 import org.eclipse.uml2.uml.MultiplicityElement;
 import org.eclipse.uml2.uml.Property;
@@ -54,6 +55,7 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getEditString(IAdaptable element, int flags) {
 		return getPrintString(element, flags);
 	}
@@ -61,6 +63,7 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public IParserEditStatus isValidEditString(IAdaptable element, String editString) {
 		return ParserEditStatus.UNEDITABLE_STATUS;
 	}
@@ -68,6 +71,7 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public ICommand getParseCommand(IAdaptable element, String newString, int flags) {
 		return UnexecutableCommand.INSTANCE;
 	}
@@ -75,31 +79,32 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getPrintString(IAdaptable element, int flags) {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = "";
 		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof MultiplicityElement)) {
+		if ((eObject != null) && (eObject instanceof MultiplicityElement)) {
 
-			MultiplicityElement multElt = (MultiplicityElement)eObject;
+			MultiplicityElement multElt = (MultiplicityElement) eObject;
 
 			// manage multiplicity
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_MULTIPLICITY))) {
+			if ((maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY))) {
 
 				// If multiplicity is [1] (SysML default), only show when explicitly asked.
 				// TODO : add a case for default with multiplicity not set.
 				String lower = (multElt.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(multElt.getLowerValue()) : "1";
 				String upper = (multElt.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(multElt.getUpperValue()) : "1";
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
+				if (maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
 
-					if(lower.equals(upper)) {
+					if (lower.equals(upper)) {
 						result = String.format(MULTIPLICITY_FORMAT_ALT, lower, upper);
 					} else {
 						result = String.format(MULTIPLICITY_FORMAT, lower, upper);
@@ -113,11 +118,12 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
 				return EcorePackage.eINSTANCE.getEAnnotation_Details().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue().equals(feature);
 			}
 		}
@@ -128,6 +134,7 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
 		return null;
 	}
@@ -135,17 +142,18 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 
-		if((element != null) && (element instanceof MultiplicityElement)) {
-			MultiplicityElement semElement = (MultiplicityElement)element;
+		if ((element != null) && (element instanceof MultiplicityElement)) {
+			MultiplicityElement semElement = (MultiplicityElement) element;
 
 			semanticElementsBeingParsed.add(semElement);
-			if(semElement.getLowerValue() != null) {
+			if (semElement.getLowerValue() != null) {
 				semanticElementsBeingParsed.add(semElement.getLowerValue());
 			}
-			if(semElement.getUpperValue() != null) {
+			if (semElement.getUpperValue() != null) {
 				semanticElementsBeingParsed.add(semElement.getUpperValue());
 			}
 		}
@@ -155,31 +163,34 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean areSemanticElementsAffected(EObject listener, Object notification) {
 		return true;
 	}
 
+	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ILabelPreferenceConstants.DISP_MULTIPLICITY, "Multiplicity");
+		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
 		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY, "Show default multiplicity");
 		return masks;
 	}
 
 	protected Collection<String> getMaskValues(IAdaptable element) {
-		View view = (View)element.getAdapter(View.class);
-		if(view == null) {
+		View view = (View) element.getAdapter(View.class);
+		if (view == null) {
 			return getDefaultValue(element);
 		}
 
 		Collection<String> result = MaskLabelHelper.getMaskValues(view);
-		if(result == null) {
+		if (result == null) {
 			result = getDefaultValue(element);
 		}
 		return result;
 	}
 
+	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_MULTIPLICITY);
+		return Arrays.asList(ICustomAppearance.DISP_MULTIPLICITY);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
index 4c8d65ee7ae..f7da8639689 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
@@ -48,13 +48,14 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getEditString(IAdaptable element, int flags) {
 		String editString = "";
 
 		EObject eObject = EMFHelper.getEObject(element);
-		if((eObject != null) && (eObject instanceof NamedElement)) {
-			NamedElement semElement = (NamedElement)eObject;
-			if(semElement.isSetName()) {
+		if ((eObject != null) && (eObject instanceof NamedElement)) {
+			NamedElement semElement = (NamedElement) eObject;
+			if (semElement.isSetName()) {
 				editString = semElement.getName();
 			}
 		}
@@ -64,6 +65,7 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public IParserEditStatus isValidEditString(IAdaptable element, String editString) {
 		return ParserEditStatus.EDITABLE_STATUS;
 	}
@@ -71,12 +73,13 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public ICommand getParseCommand(IAdaptable element, String newString, int flags) {
 
 		ICommand command = UnexecutableCommand.INSTANCE;
 
-		EObject objectToEdit =EMFHelper.getEObject(element);
-		if(objectToEdit == null) {
+		EObject objectToEdit = EMFHelper.getEObject(element);
+		if (objectToEdit == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -92,12 +95,13 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getPrintString(IAdaptable element, int flags) {
 		String result = "";
 		EObject eObject = EMFHelper.getEObject(element);
 
-		if(eObject instanceof NamedElement) {
-			return ((NamedElement)eObject).getName();
+		if (eObject instanceof NamedElement) {
+			return ((NamedElement) eObject).getName();
 		}
 
 		return result;
@@ -106,11 +110,12 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
 				return EcorePackage.eINSTANCE.getEAnnotation_Details().equals(feature) || UMLPackage.eINSTANCE.getNamedElement_Name().equals(feature);
 			}
 		}
@@ -121,6 +126,7 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
 		return null;
 	}
@@ -128,6 +134,7 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 		semanticElementsBeingParsed.add(element);
@@ -138,6 +145,7 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean areSemanticElementsAffected(EObject listener, Object notification) {
 		return true;
 	}
@@ -145,23 +153,25 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public Map<String, String> getMasks() {
 		return Collections.emptyMap();
 	}
 
 	protected Collection<String> getMaskValues(IAdaptable element) {
-		View view = (View)element.getAdapter(View.class);
-		if(view == null) {
+		View view = (View) element.getAdapter(View.class);
+		if (view == null) {
 			return getDefaultValue(element);
 		}
 
 		Collection<String> result = MaskLabelHelper.getMaskValues(view);
-		if(result == null) {
+		if (result == null) {
 			result = getDefaultValue(element);
 		}
 		return result;
 	}
 
+	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
 		return Collections.emptySet();
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/OperationLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/OperationLabelParser.java
index 46a7b96bdf4..3747e67bc84 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/OperationLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/OperationLabelParser.java
@@ -66,21 +66,21 @@ public class OperationLabelParser extends NamedElementLabelParser {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = "";
-		EObject eObject =EMFHelper.getEObject(element);
+		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof Operation)) {
+		if ((eObject != null) && (eObject instanceof Operation)) {
 
-			Operation operation = (Operation)eObject;
+			Operation operation = (Operation) eObject;
 
 			// manage visibility
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_VISIBILITY)) {
+			if (maskValues.contains(ICustomAppearance.DISP_VISIBILITY)) {
 				String visibility;
-				switch(operation.getVisibility().getValue()) {
+				switch (operation.getVisibility().getValue()) {
 				case VisibilityKind.PACKAGE:
 					visibility = "~";
 					break;
@@ -101,12 +101,12 @@ public class OperationLabelParser extends NamedElementLabelParser {
 			}
 
 			// manage name and parameters
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_NAME)) && (operation.isSetName())) {
+			if ((maskValues.contains(ICustomAppearance.DISP_NAME)) && (operation.isSetName())) {
 				String name = operation.getName();
 
 				StringBuffer params = new StringBuffer();
-				for(Parameter parameter : operation.getOwnedParameters()) {
-					if(parameter.getDirection() != ParameterDirectionKind.RETURN_LITERAL) {
+				for (Parameter parameter : operation.getOwnedParameters()) {
+					if (parameter.getDirection() != ParameterDirectionKind.RETURN_LITERAL) {
 						String currentParamLabel = ParameterLabelUtil.getPrintString(parameter, extractParameterMaskValues(maskValues));
 						params.append(params.length() == 0 ? currentParamLabel : ", " + currentParamLabel);
 					}
@@ -116,38 +116,38 @@ public class OperationLabelParser extends NamedElementLabelParser {
 			}
 
 			// manage type
-			if((maskValues.contains(ILabelPreferenceConstants.DISP_TYPE))) {
+			if ((maskValues.contains(ICustomAppearance.DISP_TYPE))) {
 				String type = "<Undefined>";
-				if(operation.getType() != null) {
+				if (operation.getType() != null) {
 					type = operation.getType().getName();
 				}
 
 				// If type is undefined only show "<Undefined>" when explicitly asked.
-				if((maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE)) || (!"<Undefined>".equals(type))) {
+				if ((maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE)) || (!"<Undefined>".equals(type))) {
 					result = String.format(TYPE_FORMAT, result, type);
 				}
 			}
 
 			// manage modifier
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_MODIFIERS)) {
+			if (maskValues.contains(ICustomAppearance.DISP_MODIFIERS)) {
 				StringBuffer sb = new StringBuffer();
-				if(operation.isAbstract()) {
+				if (operation.isAbstract()) {
 					sb.append(sb.length() == 0 ? "abstract" : ", abstract");
 				}
-				if(operation.isStatic()) {
+				if (operation.isStatic()) {
 					sb.append(sb.length() == 0 ? "static" : ", static");
 				}
-				if(operation.isUnique()) {
+				if (operation.isUnique()) {
 					sb.append(sb.length() == 0 ? "unique" : ", unique");
 				}
-				if(operation.isQuery()) {
+				if (operation.isQuery()) {
 					sb.append(sb.length() == 0 ? "query" : ", query");
 				}
-				if(operation.isLeaf()) {
+				if (operation.isLeaf()) {
 					sb.append(sb.length() == 0 ? "leaf" : ", leaf");
 				}
 
-				if(sb.length() != 0) {
+				if (sb.length() != 0) {
 					result = String.format(MODIFIER_FORMAT, result, sb.toString());
 				}
 			}
@@ -158,8 +158,8 @@ public class OperationLabelParser extends NamedElementLabelParser {
 	private static Collection<String> extractParameterMaskValues(Collection<String> operationMaskValues) {
 		Set<String> result = new HashSet<String>();
 
-		for(String maskValue : operationMaskValues) {
-			if(maskValue.startsWith(ICustomAppearance.PARAMETERS_PREFIX)) {
+		for (String maskValue : operationMaskValues) {
+			if (maskValue.startsWith(ICustomAppearance.PARAMETERS_PREFIX)) {
 				String newValue = StringHelper.firstToLower(maskValue.replace(ICustomAppearance.PARAMETERS_PREFIX, ""));
 				result.add(newValue);
 			}
@@ -174,10 +174,12 @@ public class OperationLabelParser extends NamedElementLabelParser {
 	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
-				return UMLPackage.eINSTANCE.getNamedElement_Visibility().equals(feature) || UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getBehavioralFeature_IsAbstract().equals(feature) || UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature) || UMLPackage.eINSTANCE.getOperation_IsUnique().equals(feature) || UMLPackage.eINSTANCE.getOperation_IsQuery().equals(feature) || UMLPackage.eINSTANCE.getRedefinableElement_IsLeaf().equals(feature) || parameterParser.isAffectingEvent(event, flags) || super.isAffectingEvent(event, flags);
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
+				return UMLPackage.eINSTANCE.getNamedElement_Visibility().equals(feature) || UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getBehavioralFeature_IsAbstract().equals(feature)
+						|| UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature) || UMLPackage.eINSTANCE.getOperation_IsUnique().equals(feature) || UMLPackage.eINSTANCE.getOperation_IsQuery().equals(feature)
+						|| UMLPackage.eINSTANCE.getRedefinableElement_IsLeaf().equals(feature) || parameterParser.isAffectingEvent(event, flags) || super.isAffectingEvent(event, flags);
 			}
 		}
 
@@ -192,14 +194,14 @@ public class OperationLabelParser extends NamedElementLabelParser {
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 
-		if((element != null) && (element instanceof Operation)) {
-			Operation semElement = (Operation)element;
+		if ((element != null) && (element instanceof Operation)) {
+			Operation semElement = (Operation) element;
 
 			semanticElementsBeingParsed.add(semElement);
-			if(semElement.getType() != null) {
+			if (semElement.getType() != null) {
 				semanticElementsBeingParsed.add(semElement.getType());
 			}
-			for(Parameter parameter : semElement.getOwnedParameters()) {
+			for (Parameter parameter : semElement.getOwnedParameters()) {
 				semanticElementsBeingParsed.addAll(parameterParser.getSemanticElementsBeingParsed(parameter));
 			}
 		}
@@ -212,23 +214,23 @@ public class OperationLabelParser extends NamedElementLabelParser {
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>(5);
-		masks.put(ILabelPreferenceConstants.DISP_VISIBILITY, "Visibility");
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_TYPE, "Type");
+		masks.put(ICustomAppearance.DISP_VISIBILITY, "Visibility");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_TYPE, "Type");
 		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
-		masks.put(ILabelPreferenceConstants.DISP_MODIFIERS, "Modifiers");
-
-		masks.put(ILabelPreferenceConstants.DISP_PARAMETER_DIRECTION, "Parameter direction");
-		masks.put(ILabelPreferenceConstants.DISP_PARAMETER_NAME, "Parameter name");
-		masks.put(ILabelPreferenceConstants.DISP_PARAMETER_TYPE, "Parameter type");
-		masks.put(ILabelPreferenceConstants.DISP_PARAMETER_MULTIPLICITY, "Parameter multiplicity");
-		masks.put(ILabelPreferenceConstants.DISP_PARAMETER_DEFAULT, "Parameter default value");
-		masks.put(ILabelPreferenceConstants.DISP_PARAMETER_MODIFIERS, "Parameter modifiers");
+		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
+
+		masks.put(ICustomAppearance.DISP_PARAMETER_DIRECTION, "Parameter direction");
+		masks.put(ICustomAppearance.DISP_PARAMETER_NAME, "Parameter name");
+		masks.put(ICustomAppearance.DISP_PARAMETER_TYPE, "Parameter type");
+		masks.put(ICustomAppearance.DISP_PARAMETER_MULTIPLICITY, "Parameter multiplicity");
+		masks.put(ICustomAppearance.DISP_PARAMETER_DEFAULT, "Parameter default value");
+		masks.put(ICustomAppearance.DISP_PARAMETER_MODIFIERS, "Parameter modifiers");
 		return masks;
 	}
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_NAME, ILabelPreferenceConstants.DISP_TYPE, ILabelPreferenceConstants.DISP_PARAMETER_DIRECTION, ILabelPreferenceConstants.DISP_PARAMETER_NAME, ILabelPreferenceConstants.DISP_PARAMETER_TYPE);
+		return Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE, ICustomAppearance.DISP_PARAMETER_DIRECTION, ICustomAppearance.DISP_PARAMETER_NAME, ICustomAppearance.DISP_PARAMETER_TYPE);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java
index 6c2fc31b5a6..02d50179816 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.uml.diagram.common.utils.ParameterLabelUtil;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -61,14 +62,14 @@ public class ParameterLabelParser extends NamedElementLabelParser {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		EObject eObject = EMFHelper.getEObject(element);
 
-		if(eObject != null && eObject instanceof Parameter) {
-			Parameter parameter = (Parameter)eObject;
+		if (eObject != null && eObject instanceof Parameter) {
+			Parameter parameter = (Parameter) eObject;
 			return ParameterLabelUtil.getPrintString(parameter, maskValues);
 		}
 
@@ -81,10 +82,13 @@ public class ParameterLabelParser extends NamedElementLabelParser {
 	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
-				return UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getParameter_Direction().equals(feature) || UMLPackage.eINSTANCE.getParameter_DefaultValue().equals(feature) || UMLPackage.eINSTANCE.getParameter_IsStream().equals(feature) || UMLPackage.eINSTANCE.getParameter_IsException().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_IsOrdered().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_IsUnique().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue().equals(feature) || super.isAffectingEvent(event, flags);
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
+				return UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getParameter_Direction().equals(feature) || UMLPackage.eINSTANCE.getParameter_DefaultValue().equals(feature)
+						|| UMLPackage.eINSTANCE.getParameter_IsStream().equals(feature) || UMLPackage.eINSTANCE.getParameter_IsException().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_IsOrdered().equals(feature)
+						|| UMLPackage.eINSTANCE.getMultiplicityElement_IsUnique().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue().equals(feature)
+						|| super.isAffectingEvent(event, flags);
 			}
 		}
 
@@ -98,20 +102,20 @@ public class ParameterLabelParser extends NamedElementLabelParser {
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 
-		if((element != null) && (element instanceof Parameter)) {
-			Parameter semElement = (Parameter)element;
+		if ((element != null) && (element instanceof Parameter)) {
+			Parameter semElement = (Parameter) element;
 
 			semanticElementsBeingParsed.add(semElement);
-			if(semElement.getType() != null) {
+			if (semElement.getType() != null) {
 				semanticElementsBeingParsed.add(semElement.getType());
 			}
-			if(semElement.getDefaultValue() != null) {
+			if (semElement.getDefaultValue() != null) {
 				semanticElementsBeingParsed.add(semElement.getDefaultValue());
 			}
-			if(semElement.getLowerValue() != null) {
+			if (semElement.getLowerValue() != null) {
 				semanticElementsBeingParsed.add(semElement.getLowerValue());
 			}
-			if(semElement.getUpperValue() != null) {
+			if (semElement.getUpperValue() != null) {
 				semanticElementsBeingParsed.add(semElement.getUpperValue());
 			}
 		}
@@ -124,17 +128,17 @@ public class ParameterLabelParser extends NamedElementLabelParser {
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ILabelPreferenceConstants.DISP_DIRECTION, "Direction");
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_TYPE, "Type");
-		masks.put(ILabelPreferenceConstants.DISP_MULTIPLICITY, "Multiplicity");
-		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_VALUE, "Default value");
-		masks.put(ILabelPreferenceConstants.DISP_MODIFIERS, "Modifiers");
+		masks.put(ICustomAppearance.DISP_DIRECTION, "Direction");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_TYPE, "Type");
+		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
+		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default value");
+		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
 		return masks;
 	}
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_NAME);
+		return Arrays.asList(ICustomAppearance.DISP_NAME);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java
index 65cda498f40..718298af84a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
 import org.eclipse.uml2.uml.InstanceValue;
 import org.eclipse.uml2.uml.Property;
@@ -71,21 +72,21 @@ public class PropertyLabelParser extends NamedElementLabelParser {
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = "";
 		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof Property)) {
+		if ((eObject != null) && (eObject instanceof Property)) {
 
-			Property property = (Property)eObject;
+			Property property = (Property) eObject;
 
 			// manage visibility
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_VISIBILITY)) {
+			if (maskValues.contains(ICustomAppearance.DISP_VISIBILITY)) {
 				String visibility;
-				switch(property.getVisibility().getValue()) {
+				switch (property.getVisibility().getValue()) {
 				case VisibilityKind.PACKAGE:
 					visibility = "~";
 					break;
@@ -106,39 +107,39 @@ public class PropertyLabelParser extends NamedElementLabelParser {
 			}
 
 			// manage derived modifier
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_DERIVE) && (property.isDerived())) {
+			if (maskValues.contains(ICustomAppearance.DISP_DERIVE) && (property.isDerived())) {
 				result = String.format(DERIVED_FORMAT, result);
 			}
 
 			// manage name
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_NAME) && (property.isSetName())) {
+			if (maskValues.contains(ICustomAppearance.DISP_NAME) && (property.isSetName())) {
 				String name = property.getName();
 				result = String.format(NAME_FORMAT, result, name);
 			}
 
 			// manage type
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_TYPE)) {
+			if (maskValues.contains(ICustomAppearance.DISP_TYPE)) {
 				String type = "<Undefined>";
-				if(property.getType() != null) {
+				if (property.getType() != null) {
 					type = property.getType().getName();
 				}
 
 				// If type is undefined only show "<Undefined>" when explicitly asked.
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || (!"<Undefined>".equals(type))) {
+				if (maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || (!"<Undefined>".equals(type))) {
 					result = String.format(TYPE_FORMAT, result, type);
 				}
 			}
 
 			// manage multiplicity
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_MULTIPLICITY)) {
+			if (maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY)) {
 
 				// If multiplicity is [1] (SysML default), only show when explicitly asked.
 				// TODO : add a case for default with multiplicity not set.
 				String lower = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getLowerValue()) : "1";
 				String upper = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getUpperValue()) : "1";
-				if(maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
+				if (maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
 
-					if(lower.equals(upper)) {
+					if (lower.equals(upper)) {
 						result = String.format(MULTIPLICITY_FORMAT_ALT, result, lower, upper);
 					} else {
 						result = String.format(MULTIPLICITY_FORMAT, result, lower, upper);
@@ -147,35 +148,35 @@ public class PropertyLabelParser extends NamedElementLabelParser {
 			}
 
 			// manage default value
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_VALUE) && property.getDefaultValue() != null) {
+			if (maskValues.contains(ICustomAppearance.DISP_DEFAULT_VALUE) && property.getDefaultValue() != null) {
 				ValueSpecification valueSpecification = property.getDefaultValue();
-				if((valueSpecification instanceof InstanceValue && property.getType().equals(valueSpecification.getType())) || !(valueSpecification instanceof InstanceValue)) {
+				if ((valueSpecification instanceof InstanceValue && property.getType().equals(valueSpecification.getType())) || !(valueSpecification instanceof InstanceValue)) {
 					result = String.format(DEFAULT_VALUE_FORMAT, result, ValueSpecificationUtil.getSpecificationValue(valueSpecification));
 				}
 			}
 
 			// manage modifier
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_MODIFIERS)) {
+			if (maskValues.contains(ICustomAppearance.DISP_MODIFIERS)) {
 				StringBuffer sb = new StringBuffer();
-				if(property.isReadOnly()) {
+				if (property.isReadOnly()) {
 					sb.append(sb.length() == 0 ? "readOnly" : ", readOnly");
 				}
-				if(property.isOrdered()) {
+				if (property.isOrdered()) {
 					sb.append(sb.length() == 0 ? "ordered" : ", ordered");
 				}
-				if(property.isUnique()) {
+				if (property.isUnique()) {
 					sb.append(sb.length() == 0 ? "unique" : ", unique");
 				}
-				if(property.isDerivedUnion()) {
+				if (property.isDerivedUnion()) {
 					sb.append(sb.length() == 0 ? "union" : ", union");
 				}
 				EList<Property> redefinedProperties = property.getRedefinedProperties();
-				if(redefinedProperties != null && !redefinedProperties.isEmpty()) {
-					for(Property p : redefinedProperties) {
+				if (redefinedProperties != null && !redefinedProperties.isEmpty()) {
+					for (Property p : redefinedProperties) {
 						sb.append(sb.length() == 0 ? p.getName() : ", redefines " + p.getName());
 					}
 				}
-				if(sb.length() != 0) {
+				if (sb.length() != 0) {
 					result = String.format(MODIFIER_FORMAT, result, sb.toString());
 				}
 			}
@@ -189,11 +190,14 @@ public class PropertyLabelParser extends NamedElementLabelParser {
 	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
 
-			if(feature instanceof EStructuralFeature) { // UMLPackage.eINSTANCE.getLiteralString_Value().equals(feature) ||
-				return UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getInstanceValue_Instance().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_IsOrdered().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_IsUnique().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue().equals(feature) || UMLPackage.eINSTANCE.getStructuralFeature_IsReadOnly().equals(feature) || UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature) || UMLPackage.eINSTANCE.getProperty_IsDerived().equals(feature) || UMLPackage.eINSTANCE.getProperty_IsDerivedUnion().equals(feature) || UMLPackage.eINSTANCE.getProperty_RedefinedProperty().equals(feature) || super.isAffectingEvent(event, flags);
+			if (feature instanceof EStructuralFeature) { // UMLPackage.eINSTANCE.getLiteralString_Value().equals(feature) ||
+				return UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getInstanceValue_Instance().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_IsOrdered().equals(feature)
+						|| UMLPackage.eINSTANCE.getMultiplicityElement_IsUnique().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue().equals(feature)
+						|| UMLPackage.eINSTANCE.getStructuralFeature_IsReadOnly().equals(feature) || UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature) || UMLPackage.eINSTANCE.getProperty_IsDerived().equals(feature)
+						|| UMLPackage.eINSTANCE.getProperty_IsDerivedUnion().equals(feature) || UMLPackage.eINSTANCE.getProperty_RedefinedProperty().equals(feature) || super.isAffectingEvent(event, flags);
 			}
 		}
 
@@ -207,20 +211,20 @@ public class PropertyLabelParser extends NamedElementLabelParser {
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 
-		if((element != null) && (element instanceof Property)) {
-			Property semElement = (Property)element;
+		if ((element != null) && (element instanceof Property)) {
+			Property semElement = (Property) element;
 
 			semanticElementsBeingParsed.add(semElement);
-			if(semElement.getType() != null) {
+			if (semElement.getType() != null) {
 				semanticElementsBeingParsed.add(semElement.getType());
 			}
-			if(semElement.getLowerValue() != null) {
+			if (semElement.getLowerValue() != null) {
 				semanticElementsBeingParsed.add(semElement.getLowerValue());
 			}
-			if(semElement.getUpperValue() != null) {
+			if (semElement.getUpperValue() != null) {
 				semanticElementsBeingParsed.add(semElement.getUpperValue());
 			}
-			if(semElement.getDefaultValue() != null) {
+			if (semElement.getDefaultValue() != null) {
 				semanticElementsBeingParsed.add(semElement.getDefaultValue());
 			}
 		}
@@ -233,20 +237,20 @@ public class PropertyLabelParser extends NamedElementLabelParser {
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ILabelPreferenceConstants.DISP_VISIBILITY, "Visibility");
-		masks.put(ILabelPreferenceConstants.DISP_DERIVE, "Is Derived");
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_TYPE, "Type");
+		masks.put(ICustomAppearance.DISP_VISIBILITY, "Visibility");
+		masks.put(ICustomAppearance.DISP_DERIVE, "Is Derived");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_TYPE, "Type");
 		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
-		masks.put(ILabelPreferenceConstants.DISP_MULTIPLICITY, "Multiplicity");
+		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
 		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY, "Show default multiplicity");
-		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_VALUE, "Default Value");
-		masks.put(ILabelPreferenceConstants.DISP_MODIFIERS, "Modifiers");
+		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default Value");
+		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
 		return masks;
 	}
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_NAME, ILabelPreferenceConstants.DISP_TYPE, ILabelPreferenceConstants.DISP_MULTIPLICITY, ILabelPreferenceConstants.DISP_UNDEFINED_TYPE);
+		return Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE, ICustomAppearance.DISP_MULTIPLICITY, ILabelPreferenceConstants.DISP_UNDEFINED_TYPE);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ReceptionLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ReceptionLabelParser.java
index 8ac02e08e00..7f38d2dcef8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ReceptionLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ReceptionLabelParser.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.papyrus.gmf.diagram.common.parser.IMaskManagedSemanticParser;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
 import org.eclipse.uml2.uml.Reception;
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -52,27 +53,27 @@ public class ReceptionLabelParser extends NamedElementLabelParser implements IMa
 
 		Collection<String> maskValues = getMaskValues(element);
 
-		if(maskValues.isEmpty()) {
+		if (maskValues.isEmpty()) {
 			return MaskedLabel;
 		}
 
 		String result = PREFIX;
 		EObject eObject = EMFHelper.getEObject(element);
 
-		if((eObject != null) && (eObject instanceof Reception)) {
+		if ((eObject != null) && (eObject instanceof Reception)) {
 
-			Reception reception = (Reception)eObject;
+			Reception reception = (Reception) eObject;
 
 			// manage name
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_NAME) && reception.isSetName()) {
+			if (maskValues.contains(ICustomAppearance.DISP_NAME) && reception.isSetName()) {
 				String name = reception.getName();
 				result = String.format(NAME_FORMAT, result, name);
 			}
 
 			// manage signal
-			if(maskValues.contains(ILabelPreferenceConstants.DISP_SIGNAL)) {
+			if (maskValues.contains(ILabelPreferenceConstants.DISP_SIGNAL)) {
 				String type = "<Undefined>";
-				if(reception.getSignal() != null) {
+				if (reception.getSignal() != null) {
 					type = reception.getSignal().getName();
 				}
 				result = String.format(TYPE_FORMAT, result, type);
@@ -88,9 +89,9 @@ public class ReceptionLabelParser extends NamedElementLabelParser implements IMa
 	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
 
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
 				return UMLPackage.eINSTANCE.getReception_Signal().equals(feature) || super.isAffectingEvent(event, flags);
 			}
 		}
@@ -105,11 +106,11 @@ public class ReceptionLabelParser extends NamedElementLabelParser implements IMa
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 
-		if((element != null) && (element instanceof Reception)) {
-			Reception semElement = (Reception)element;
+		if ((element != null) && (element instanceof Reception)) {
+			Reception semElement = (Reception) element;
 
 			semanticElementsBeingParsed.add(semElement);
-			if(semElement.getSignal() != null) {
+			if (semElement.getSignal() != null) {
 				semanticElementsBeingParsed.add(semElement.getSignal());
 			}
 		}
@@ -122,13 +123,13 @@ public class ReceptionLabelParser extends NamedElementLabelParser implements IMa
 	@Override
 	public Map<String, String> getMasks() {
 		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ILabelPreferenceConstants.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
 		masks.put(ILabelPreferenceConstants.DISP_SIGNAL, "Signal");
 		return masks;
 	}
 
 	@Override
 	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_NAME, ILabelPreferenceConstants.DISP_SIGNAL);
+		return Arrays.asList(ICustomAppearance.DISP_NAME, ILabelPreferenceConstants.DISP_SIGNAL);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/SlotLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/SlotLabelParser.java
index fa15078a465..f1b973ad083 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/SlotLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/SlotLabelParser.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -41,6 +41,7 @@ public class SlotLabelParser implements ISemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getEditString(IAdaptable element, int flags) {
 		return getPrintString(element, flags);
 	}
@@ -48,6 +49,7 @@ public class SlotLabelParser implements ISemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public IParserEditStatus isValidEditString(IAdaptable element, String editString) {
 		return ParserEditStatus.UNEDITABLE_STATUS;
 	}
@@ -55,6 +57,7 @@ public class SlotLabelParser implements ISemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public ICommand getParseCommand(IAdaptable element, String newString, int flags) {
 		return UnexecutableCommand.INSTANCE;
 	}
@@ -62,34 +65,35 @@ public class SlotLabelParser implements ISemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getPrintString(IAdaptable element, int flags) {
 		String result = "";
-		EObject eObject =EMFHelper.getEObject(element);
+		EObject eObject = EMFHelper.getEObject(element);
 
-		if(eObject instanceof Slot) {
-			Slot slot = (Slot)eObject;
+		if (eObject instanceof Slot) {
+			Slot slot = (Slot) eObject;
 			result = "<UNDEFINED>";
 
-			if(slot.getDefiningFeature() != null) {
+			if (slot.getDefiningFeature() != null) {
 
 				// Add defining feature
 				result = slot.getDefiningFeature().getName();
 
 				// Add values
-				if(!slot.getValues().isEmpty()) {
+				if (!slot.getValues().isEmpty()) {
 
 					String values = "";
 					Iterator<ValueSpecification> iter = slot.getValues().iterator();
-					while(iter.hasNext()) {
+					while (iter.hasNext()) {
 						ValueSpecification currentSpecification = iter.next();
 
 						String currentValue = currentSpecification.stringValue();
-						if((currentSpecification instanceof InstanceValue) && ((InstanceValue)currentSpecification).getInstance() != null) {
-							currentValue = ((InstanceValue)currentSpecification).getInstance().getName();
+						if ((currentSpecification instanceof InstanceValue) && ((InstanceValue) currentSpecification).getInstance() != null) {
+							currentValue = ((InstanceValue) currentSpecification).getInstance().getName();
 						}
 
 						values = values + currentValue;
-						if(iter.hasNext()) {
+						if (iter.hasNext()) {
 							result = result + ", ";
 						}
 					}
@@ -105,10 +109,11 @@ public class SlotLabelParser implements ISemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean isAffectingEvent(Object event, int flags) {
-		if(event instanceof Notification) {
-			Object feature = ((Notification)event).getFeature();
-			if(feature instanceof EStructuralFeature) {
+		if (event instanceof Notification) {
+			Object feature = ((Notification) event).getFeature();
+			if (feature instanceof EStructuralFeature) {
 				return UMLPackage.eINSTANCE.getSlot_DefiningFeature().equals(feature);
 			}
 		}
@@ -119,6 +124,7 @@ public class SlotLabelParser implements ISemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
 		return null;
 	}
@@ -126,6 +132,7 @@ public class SlotLabelParser implements ISemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
 		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
 		semanticElementsBeingParsed.add(element);
@@ -136,6 +143,7 @@ public class SlotLabelParser implements ISemanticParser {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean areSemanticElementsAffected(EObject listener, Object notification) {
 		return true;
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/AssociationViewUtils.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/AssociationViewUtils.java
index e1fbb0682f6..a9be2ba4980 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/AssociationViewUtils.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/AssociationViewUtils.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -31,51 +31,51 @@ public class AssociationViewUtils {
 
 	/**
 	 * Get the semantic end from the source of an edge representing an Association.
-	 * 
+	 *
 	 * @param view
-	 *        the Association view.
+	 *            the Association view.
 	 * @return the Property corresponding to the source of the graphical end.
 	 */
 	public static Property getSourceSemanticEnd(View view) {
-		EObjectValueStyle semanticStyle = (EObjectValueStyle)view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_SOURCE_END);
-		return semanticStyle == null ? null : (Property)semanticStyle.getEObjectValue();
+		EObjectValueStyle semanticStyle = (EObjectValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_SOURCE_END);
+		return semanticStyle == null ? null : (Property) semanticStyle.getEObjectValue();
 	}
 
 	/**
 	 * Get the semantic end from the target of an edge representing an Association.
-	 * 
+	 *
 	 * @param view
-	 *        the Association view.
+	 *            the Association view.
 	 * @return the Property corresponding to the target of the graphical end.
 	 */
 	public static Property getTargetSemanticEnd(View view) {
-		EObjectValueStyle semanticStyle = (EObjectValueStyle)view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_TARGET_END);
-		return semanticStyle == null ? null : (Property)semanticStyle.getEObjectValue();
+		EObjectValueStyle semanticStyle = (EObjectValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_TARGET_END);
+		return semanticStyle == null ? null : (Property) semanticStyle.getEObjectValue();
 	}
 
 	/**
 	 * Set the semantic end for the source of an edge representing an Association.
-	 * 
+	 *
 	 * @param view
-	 *        the Association view.
+	 *            the Association view.
 	 * @param end
-	 *        the Property corresponding to the source of the graphical end.
+	 *            the Property corresponding to the source of the graphical end.
 	 */
 	public static void setSourceSemanticEnd(View view, Property end) {
-		EObjectValueStyle semanticStyle = (EObjectValueStyle)view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_SOURCE_END);
+		EObjectValueStyle semanticStyle = (EObjectValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_SOURCE_END);
 		semanticStyle.setEObjectValue(end);
 	}
 
 	/**
 	 * Set the semantic end for the target of an edge representing an Association.
-	 * 
+	 *
 	 * @param view
-	 *        the Association view.
+	 *            the Association view.
 	 * @param end
-	 *        the Property corresponding to the target of the graphical end.
+	 *            the Property corresponding to the target of the graphical end.
 	 */
 	public static void setTargetSemanticEnd(View view, Property end) {
-		EObjectValueStyle semanticStyle = (EObjectValueStyle)view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_TARGET_END);
+		EObjectValueStyle semanticStyle = (EObjectValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_TARGET_END);
 		semanticStyle.setEObjectValue(end);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java
index 5ba1a5621b3..e4d61536072 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -17,6 +17,7 @@ import java.util.Collection;
 

 import org.eclipse.papyrus.gmf.diagram.common.parser.IMaskManagedSemanticParser;

 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;

 import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;

 import org.eclipse.uml2.uml.InstanceValue;

 import org.eclipse.uml2.uml.Parameter;

@@ -45,18 +46,18 @@ public class ParameterLabelUtil {
 	protected static final String MODIFIER_FORMAT = "%s{%s}";

 

 	public static String getPrintString(Parameter parameter, Collection<String> displayValue) {

-		if(displayValue.isEmpty()) {

+		if (displayValue.isEmpty()) {

 			return IMaskManagedSemanticParser.MaskedLabel;

 		}

 

 		String result = "";

 

-		if(parameter != null) {

+		if (parameter != null) {

 

 			// manage direction

-			if(displayValue.contains(ILabelPreferenceConstants.DISP_DIRECTION) || displayValue.contains(ILabelPreferenceConstants.DISP_PARAMETER_DIRECTION)) {

+			if (displayValue.contains(ICustomAppearance.DISP_DIRECTION) || displayValue.contains(ICustomAppearance.DISP_PARAMETER_DIRECTION)) {

 				String direction;

-				switch(parameter.getDirection().getValue()) {

+				switch (parameter.getDirection().getValue()) {

 				case ParameterDirectionKind.IN:

 					direction = "in";

 					break;

@@ -77,20 +78,20 @@ public class ParameterLabelUtil {
 			}

 

 			// manage name

-			if((displayValue.contains(ILabelPreferenceConstants.DISP_NAME) || displayValue.contains(ILabelPreferenceConstants.DISP_PARAMETER_NAME)) && (parameter.isSetName())) {

+			if ((displayValue.contains(ICustomAppearance.DISP_NAME) || displayValue.contains(ICustomAppearance.DISP_PARAMETER_NAME)) && (parameter.isSetName())) {

 				String name = parameter.getName();

 				result = String.format(NAME_FORMAT, result, name);

 			}

 

 			// manage type

-			if(displayValue.contains(ILabelPreferenceConstants.DISP_TYPE) || displayValue.contains(ILabelPreferenceConstants.DISP_PARAMETER_TYPE)) {

+			if (displayValue.contains(ICustomAppearance.DISP_TYPE) || displayValue.contains(ICustomAppearance.DISP_PARAMETER_TYPE)) {

 				String type = "<Undefined>";

-				if(parameter.getType() != null) {

+				if (parameter.getType() != null) {

 					type = parameter.getType().getName();

 				}

 

 				// If type is undefined only show "<Undefined>" when explicitly asked.

-				if(displayValue.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || (!"<Undefined>".equals(type))) {

+				if (displayValue.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || (!"<Undefined>".equals(type))) {

 					result = String.format(TYPE_FORMAT, result, type);

 				}

 			}

@@ -98,34 +99,34 @@ public class ParameterLabelUtil {
 			// manage multiplicity

 			String lower = (parameter.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(parameter.getLowerValue()) : "1";

 			String upper = (parameter.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(parameter.getUpperValue()) : "1";

-			if((displayValue.contains(ILabelPreferenceConstants.DISP_PARAMETER_MULTIPLICITY) || displayValue.contains(ILabelPreferenceConstants.DISP_MULTIPLICITY)) && !("1".equals(lower) && "1".equals(upper))) {

+			if ((displayValue.contains(ICustomAppearance.DISP_PARAMETER_MULTIPLICITY) || displayValue.contains(ICustomAppearance.DISP_MULTIPLICITY)) && !("1".equals(lower) && "1".equals(upper))) {

 				result = String.format(MULTIPLICITY_FORMAT, result, lower, upper);

 			}

 

 			// manage default value

-			if((displayValue.contains(ILabelPreferenceConstants.DISP_PARAMETER_DEFAULT) || displayValue.contains(ILabelPreferenceConstants.DISP_DEFAULT_VALUE)) && ((parameter.getDefaultValue() != null))) {

+			if ((displayValue.contains(ICustomAppearance.DISP_PARAMETER_DEFAULT) || displayValue.contains(ICustomAppearance.DISP_DEFAULT_VALUE)) && ((parameter.getDefaultValue() != null))) {

 				ValueSpecification valueSpecification = parameter.getDefaultValue();

-				if((valueSpecification instanceof InstanceValue && parameter.getType().equals(valueSpecification.getType())) || !(valueSpecification instanceof InstanceValue)) {

+				if ((valueSpecification instanceof InstanceValue && parameter.getType().equals(valueSpecification.getType())) || !(valueSpecification instanceof InstanceValue)) {

 					result = String.format(DEFAULT_VALUE_FORMAT, result, ValueSpecificationUtil.getSpecificationValue(valueSpecification));

 				}

 			}

 

 			// manage modifier

-			if(displayValue.contains(ILabelPreferenceConstants.DISP_PARAMETER_MODIFIERS) || displayValue.contains(ILabelPreferenceConstants.DISP_MODIFIERS)) {

+			if (displayValue.contains(ICustomAppearance.DISP_PARAMETER_MODIFIERS) || displayValue.contains(ICustomAppearance.DISP_MODIFIERS)) {

 				StringBuffer sb = new StringBuffer();

-				if(parameter.isOrdered()) {

+				if (parameter.isOrdered()) {

 					sb.append(sb.length() == 0 ? "ordered" : ", ordered");

 				}

-				if(parameter.isUnique()) {

+				if (parameter.isUnique()) {

 					sb.append(sb.length() == 0 ? "unique" : ", unique");

 				}

-				if(parameter.isStream()) {

+				if (parameter.isStream()) {

 					sb.append(sb.length() == 0 ? "stream" : ", stream");

 				}

-				if(parameter.isException()) {

+				if (parameter.isException()) {

 					sb.append(sb.length() == 0 ? "exception" : ", exception");

 				}

-				if(sb.length() != 0) {

+				if (sb.length() != 0) {

 					result = String.format(MODIFIER_FORMAT, result, sb.toString());

 				}

 			}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockCompositeEditPart.java
index 5e913c3e9c9..03205daf866 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockCompositeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockCompositeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockConstraintCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockConstraintCompartmentEditPart.java
index c85d0eeaacc..73edce5b521 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockConstraintCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockConstraintCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class BlockConstraintCompartmentEditPart extends ResizeableListCompartmen
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockEditPart.java
index 143db4edc37..334c8499427 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockLabelNameEditPart.java
index d932f1abaa2..83af46d0cff 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompartmentEditPart.java
index cd98882f5aa..05428a61ab6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class BlockPropertyCompartmentEditPart extends ResizeableListCompartmentE
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyStructureCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyStructureCompartmentEditPart.java
index 772702b9597..d1d57905708 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyStructureCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyStructureCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockEditPart.java
index 077b75c217b..517cbcf3cbf 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -59,7 +59,7 @@ public class ConstraintBlockEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -80,20 +80,20 @@ public class ConstraintBlockEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof ConstraintBlockLabelNameEditPart) {
-			((ConstraintBlockLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof ConstraintBlockLabelNameEditPart) {
+			((ConstraintBlockLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof ParameterCompartmentEditPart) {
+		if (childEditPart instanceof ParameterCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getParameterCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((ParameterCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((ParameterCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof BlockConstraintCompartmentEditPart) {
+		if (childEditPart instanceof BlockConstraintCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getBlockConstraintCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((BlockConstraintCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((BlockConstraintCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -101,19 +101,19 @@ public class ConstraintBlockEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof ConstraintBlockLabelNameEditPart) {
+		if (childEditPart instanceof ConstraintBlockLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof ParameterCompartmentEditPart) {
+		if (childEditPart instanceof ParameterCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getParameterCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((ParameterCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((ParameterCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof BlockConstraintCompartmentEditPart) {
+		if (childEditPart instanceof BlockConstraintCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getBlockConstraintCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((BlockConstraintCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((BlockConstraintCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -121,25 +121,25 @@ public class ConstraintBlockEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof ParameterCompartmentEditPart) {
+		if (editPart instanceof ParameterCompartmentEditPart) {
 			return getPrimaryShape().getParameterCompartmentFigure();
 		}
-		if(editPart instanceof BlockConstraintCompartmentEditPart) {
+		if (editPart instanceof BlockConstraintCompartmentEditPart) {
 			return getPrimaryShape().getBlockConstraintCompartmentFigure();
 		}
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new ConstraintBlockFigure();
@@ -147,7 +147,7 @@ public class ConstraintBlockEditPart extends AbstractElementEditPart {
 
 	@Override
 	public ConstraintBlockFigure getPrimaryShape() {
-		return (ConstraintBlockFigure)primaryShape;
+		return (ConstraintBlockFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockLabelNameEditPart.java
index a16d40a9b35..a863eb654d8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionEditPart.java
index 2cf472a20a8..634df35fcb3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -55,7 +55,7 @@ public class DimensionEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -76,8 +76,8 @@ public class DimensionEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof DimensionLabelNameEditPart) {
-			((DimensionLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof DimensionLabelNameEditPart) {
+			((DimensionLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
 		return false;
@@ -85,7 +85,7 @@ public class DimensionEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof DimensionLabelNameEditPart) {
+		if (childEditPart instanceof DimensionLabelNameEditPart) {
 			return true;
 		}
 		return false;
@@ -96,16 +96,16 @@ public class DimensionEditPart extends AbstractElementEditPart {
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new DimensionFigure();
@@ -113,7 +113,7 @@ public class DimensionEditPart extends AbstractElementEditPart {
 
 	@Override
 	public DimensionFigure getPrimaryShape() {
-		return (DimensionFigure)primaryShape;
+		return (DimensionFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionLabelNameEditPart.java
index 6a5c938d28c..cc012285d49 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortCompartmentEditPart.java
index a59bb712e1f..bf6a93c4e74 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class FlowPortCompartmentEditPart extends ResizeableListCompartmentEditPa
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyCompartmentEditPart.java
index fb5397b10a8..da2ba2e910a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class FlowPropertyCompartmentEditPart extends ResizeableListCompartmentEd
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationEditPart.java
index dc7d976ad94..06163885d14 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -59,7 +59,7 @@ public class FlowSpecificationEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -80,14 +80,14 @@ public class FlowSpecificationEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof FlowSpecificationLabelNameEditPart) {
-			((FlowSpecificationLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof FlowSpecificationLabelNameEditPart) {
+			((FlowSpecificationLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof FlowPropertyCompartmentEditPart) {
+		if (childEditPart instanceof FlowPropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getFlowPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((FlowPropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((FlowPropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -95,13 +95,13 @@ public class FlowSpecificationEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof FlowSpecificationLabelNameEditPart) {
+		if (childEditPart instanceof FlowSpecificationLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof FlowPropertyCompartmentEditPart) {
+		if (childEditPart instanceof FlowPropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getFlowPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((FlowPropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((FlowPropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -109,22 +109,22 @@ public class FlowSpecificationEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof FlowPropertyCompartmentEditPart) {
+		if (editPart instanceof FlowPropertyCompartmentEditPart) {
 			return getPrimaryShape().getFlowPropertyCompartmentFigure();
 		}
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new FlowSpecificationFigure();
@@ -132,7 +132,7 @@ public class FlowSpecificationEditPart extends AbstractElementEditPart {
 
 	@Override
 	public FlowSpecificationFigure getPrimaryShape() {
-		return (FlowSpecificationFigure)primaryShape;
+		return (FlowSpecificationFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationLabelNameEditPart.java
index 8bed3811ff7..bb44d904f9d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ParameterCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ParameterCompartmentEditPart.java
index 12724d3a1bd..7c80a491a23 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ParameterCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ParameterCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class ParameterCompartmentEditPart extends ResizeableListCompartmentEditP
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/PartPropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/PartPropertyCompartmentEditPart.java
index 8a810931c98..86ed5f2815e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/PartPropertyCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/PartPropertyCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class PartPropertyCompartmentEditPart extends ResizeableListCompartmentEd
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ReferencePropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ReferencePropertyCompartmentEditPart.java
index 1c39fa12eeb..a9eda1b0224 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ReferencePropertyCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ReferencePropertyCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class ReferencePropertyCompartmentEditPart extends ResizeableListCompartm
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/StructureCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/StructureCompartmentEditPart.java
index 88aee1412b1..d85a9ccbf5a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/StructureCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/StructureCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitEditPart.java
index f5831d3aa93..ec6d764f0df 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -55,7 +55,7 @@ public class UnitEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -76,8 +76,8 @@ public class UnitEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof UnitLabelNameEditPart) {
-			((UnitLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof UnitLabelNameEditPart) {
+			((UnitLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
 		return false;
@@ -85,7 +85,7 @@ public class UnitEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof UnitLabelNameEditPart) {
+		if (childEditPart instanceof UnitLabelNameEditPart) {
 			return true;
 		}
 		return false;
@@ -96,16 +96,16 @@ public class UnitEditPart extends AbstractElementEditPart {
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new UnitFigure();
@@ -113,7 +113,7 @@ public class UnitEditPart extends AbstractElementEditPart {
 
 	@Override
 	public UnitFigure getPrimaryShape() {
-		return (UnitFigure)primaryShape;
+		return (UnitFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitLabelNameEditPart.java
index d6e03747299..f160a7651be 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValuePropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValuePropertyCompartmentEditPart.java
index 03815ab6572..3524226cc7c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValuePropertyCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValuePropertyCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class ValuePropertyCompartmentEditPart extends ResizeableListCompartmentE
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeEditPart.java
index 45b57d2ff19..47935c40014 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -61,7 +61,7 @@ public class ValueTypeEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -82,20 +82,20 @@ public class ValueTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof ValueTypeLabelNameEditPart) {
-			((ValueTypeLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof ValueTypeLabelNameEditPart) {
+			((ValueTypeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -103,19 +103,19 @@ public class ValueTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof ValueTypeLabelNameEditPart) {
+		if (childEditPart instanceof ValueTypeLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -123,25 +123,25 @@ public class ValueTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof PropertyCompartmentEditPart) {
+		if (editPart instanceof PropertyCompartmentEditPart) {
 			return getPrimaryShape().getPropertyCompartmentFigure();
 		}
-		if(editPart instanceof OperationCompartmentEditPart) {
+		if (editPart instanceof OperationCompartmentEditPart) {
 			return getPrimaryShape().getOperationCompartmentFigure();
 		}
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new ValueTypeFigure();
@@ -149,7 +149,7 @@ public class ValueTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	public ValueTypeFigure getPrimaryShape() {
-		return (ValueTypeFigure)primaryShape;
+		return (ValueTypeFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeLabelNameEditPart.java
index 383297c6e0c..b2fe15c129d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeLabelNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeLabelNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java
index 53f5bec9423..3c4cb2154b7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -40,12 +40,12 @@ public class BlockClassifierViewFactory extends ShapeViewFactory {
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
 
-	// Start of user code preferences	
+	// Start of user code preferences
 	@Override
 	protected void initializeFromPreferences(View view) {
 		super.initializeFromPreferences(view);
-		org.eclipse.jface.preference.IPreferenceStore store = (org.eclipse.jface.preference.IPreferenceStore)getPreferencesHint().getPreferenceStore();
-		if(store == null) {
+		org.eclipse.jface.preference.IPreferenceStore store = (org.eclipse.jface.preference.IPreferenceStore) getPreferencesHint().getPreferenceStore();
+		if (store == null) {
 			return;
 		}
 		// Get default size from preferences use set view size.
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java
index 35a4862f9bd..f993010bb16 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,8 +36,8 @@ public class BlockCompositeClassifierViewFactory extends ShapeViewFactory {
 	@Override
 	protected void initializeFromPreferences(View view) {
 		super.initializeFromPreferences(view);
-		org.eclipse.jface.preference.IPreferenceStore store = (org.eclipse.jface.preference.IPreferenceStore)getPreferencesHint().getPreferenceStore();
-		if(store == null) {
+		org.eclipse.jface.preference.IPreferenceStore store = (org.eclipse.jface.preference.IPreferenceStore) getPreferencesHint().getPreferenceStore();
+		if (store == null) {
 			return;
 		}
 		// Get default size from preferences use set view size.
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java
index bfbdfd8a2f5..4fde8d208f4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -37,8 +37,8 @@ public class BlockPropertyCompositeClassifierViewFactory extends ShapeViewFactor
 	@Override
 	protected void initializeFromPreferences(View view) {
 		super.initializeFromPreferences(view);
-		org.eclipse.jface.preference.IPreferenceStore store = (org.eclipse.jface.preference.IPreferenceStore)getPreferencesHint().getPreferenceStore();
-		if(store == null) {
+		org.eclipse.jface.preference.IPreferenceStore store = (org.eclipse.jface.preference.IPreferenceStore) getPreferencesHint().getPreferenceStore();
+		if (store == null) {
 			return;
 		}
 		// Get default size from preferences use set view size.
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockClassifierViewFactory.java
index 420b988f6ad..2c722b9a94a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -32,6 +32,6 @@ public class ConstraintBlockClassifierViewFactory extends ShapeViewFactory {
 		// this action needs to be done after the compartments creation
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
-	// Start of user code preferences	
+	// Start of user code preferences
 	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockPropertyCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockPropertyCompositeClassifierViewFactory.java
index 0df988d5820..097b114915f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockPropertyCompositeClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockPropertyCompositeClassifierViewFactory.java
@@ -7,11 +7,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory; 
+package org.eclipse.papyrus.sysml.diagram.common.factory;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.common.util.EList;
@@ -40,27 +40,27 @@ public class ConstraintBlockPropertyCompositeClassifierViewFactory extends Shape
 	@Override
 	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
 
-		getViewService().createNode(element, view, UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, ViewUtil.APPEND, persisted, getPreferencesHint());		
+		getViewService().createNode(element, view, UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
 		if (ConstraintBlockPropertyCompositeEditPart.lastRepresentationIsSquareWithStructure()) {
 			getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
 		}
 
 		if (element != null) {
-			 EObject newElement = EMFHelper.getEObject(element);
-			 if (newElement instanceof Property && UMLUtil.getStereotypeApplication((Property)newElement, ConstraintProperty.class) != null) {
-				Property constraintProperty = (Property) newElement;	
+			EObject newElement = EMFHelper.getEObject(element);
+			if (newElement instanceof Property && UMLUtil.getStereotypeApplication((Property) newElement, ConstraintProperty.class) != null) {
+				Property constraintProperty = (Property) newElement;
 				ViewService.createNode(view, getConstraint(constraintProperty), UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, getPreferencesHint());
-			 }
+			}
 		}
-		
+
 		// this action needs to be done after the compartments creation
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
-	
+
 	private Constraint getConstraint(Property constraintProperty) {
 		Type type = constraintProperty.getType();
 		if (type instanceof Class && UMLUtil.getStereotypeApplication(type, ConstraintBlock.class) != null) { // instanceof ensure type is not null
-			Class constraintBlock = (Class)type;
+			Class constraintBlock = (Class) type;
 			EList<Constraint> ownedRules = constraintBlock.getOwnedRules();
 			for (Constraint constraint : ownedRules) {
 				return constraint;
@@ -69,6 +69,6 @@ public class ConstraintBlockPropertyCompositeClassifierViewFactory extends Shape
 		return null;
 	}
 
-	// Start of user code preferences	
+	// Start of user code preferences
 	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/DimensionClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/DimensionClassifierViewFactory.java
index d518ec7f39a..4c9538eb7f9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/DimensionClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/DimensionClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -30,6 +30,6 @@ public class DimensionClassifierViewFactory extends ShapeViewFactory {
 		// this action needs to be done after the compartments creation
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
-	// Start of user code preferences	
+	// Start of user code preferences
 	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowPortAffixedNodeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowPortAffixedNodeViewFactory.java
index cb0e0802d8b..fa9338933fb 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowPortAffixedNodeViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowPortAffixedNodeViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowSpecificationClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowSpecificationClassifierViewFactory.java
index fad767a565a..f94d5a153cc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowSpecificationClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowSpecificationClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -31,6 +31,6 @@ public class FlowSpecificationClassifierViewFactory extends ShapeViewFactory {
 		// this action needs to be done after the compartments creation
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
-	// Start of user code preferences	
+	// Start of user code preferences
 	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/NestedBlockPropertyCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/NestedBlockPropertyCompositeClassifierViewFactory.java
index 93a3f5670ca..fc990300597 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/NestedBlockPropertyCompositeClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/NestedBlockPropertyCompositeClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -30,6 +30,6 @@ public class NestedBlockPropertyCompositeClassifierViewFactory extends ShapeView
 		// this action needs to be done after the compartments creation
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
-	// Start of user code preferences	
+	// Start of user code preferences
 	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/UnitClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/UnitClassifierViewFactory.java
index 2ed1100e730..7413b11f4d1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/UnitClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/UnitClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -30,6 +30,6 @@ public class UnitClassifierViewFactory extends ShapeViewFactory {
 		// this action needs to be done after the compartments creation
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
-	// Start of user code preferences	
+	// Start of user code preferences
 	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ValueTypeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ValueTypeClassifierViewFactory.java
index dd3fe979dce..15d2b60264f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ValueTypeClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ValueTypeClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -33,6 +33,6 @@ public class ValueTypeClassifierViewFactory extends ShapeViewFactory {
 		// this action needs to be done after the compartments creation
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
-	// Start of user code preferences	
+	// Start of user code preferences
 	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockCompositeFigure.java
index 7b628e72b04..867276e9d9c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockCompositeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockCompositeFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,15 +26,16 @@ public class BlockCompositeFigure extends ClassifierFigure {
 		super("block"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockFigure.java
index ead72b6000f..22381498e55 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -33,15 +33,16 @@ public class BlockFigure extends ClassifierFigure {
 		super("block"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
@@ -77,6 +78,7 @@ public class BlockFigure extends ClassifierFigure {
 		return getCompartment(FlowPortCompartmentEditPart.COMPARTMENT_NAME);
 	}
 
+	@Override
 	public IFigure getOperationCompartmentFigure() {
 		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockPropertyCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockPropertyCompositeFigure.java
index f937549ff74..0122cafd541 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockPropertyCompositeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockPropertyCompositeFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,15 +26,16 @@ public class BlockPropertyCompositeFigure extends ClassifierFigure {
 		super("undefined"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockFigure.java
index 0799aba9398..4fbda1071ee 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -27,15 +27,16 @@ public class ConstraintBlockFigure extends ClassifierFigure {
 		super("constraint"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockPropertyCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockPropertyCompositeFigure.java
index 3d4d3e107c7..8f1cf15e208 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockPropertyCompositeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockPropertyCompositeFigure.java
@@ -7,11 +7,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure; 
+package org.eclipse.papyrus.sysml.diagram.common.figure;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,8 +33,8 @@ public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFi
 
 	protected WrappingLabel constraintLabel;
 	protected WrappingLabel tagLabel;
-	
-	private static final String tagConstraintText = String.valueOf("\u00AB") + "constraint" + String.valueOf("\u00BB"); 
+
+	private static final String tagConstraintText = String.valueOf("\u00AB") + "constraint" + String.valueOf("\u00BB");
 
 	/** main flow page */
 	protected FlowPage page;
@@ -42,20 +42,21 @@ public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFi
 	public ConstraintBlockPropertyCompositeFigure() {
 		this(ConstraintBlockPropertyCompositeEditPart.ROUNDED_REPRESENTATION);
 	}
-	
+
 	public ConstraintBlockPropertyCompositeFigure(String representationMode) {
 		super();
 
 		ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout() {
-			
+
 			@Override
 			/**
 			 * Always strech figure for StructureCompartment
 			 * @see org.eclipse.draw2d.LayoutManager#layout(IFigure)
 			 */
 			public void layout(IFigure parent) {
-				if (!parent.isVisible())
+				if (!parent.isVisible()) {
 					return;
+				}
 				List<?> children = getChildren(parent);
 				int numChildren = children.size();
 				Rectangle clientArea = transposer.t(parent.getClientArea());
@@ -67,10 +68,10 @@ public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFi
 				Dimension minSizes[] = new Dimension[numChildren];
 				Dimension maxSizes[] = new Dimension[numChildren];
 
-				// Calculate the width and height hints.  If it's a vertical ToolBarLayout,
-				// then ignore the height hint (set it to -1); otherwise, ignore the 
-				// width hint.  These hints will be passed to the children of the parent
-				// figure when getting their preferred size. 
+				// Calculate the width and height hints. If it's a vertical ToolBarLayout,
+				// then ignore the height hint (set it to -1); otherwise, ignore the
+				// width hint. These hints will be passed to the children of the parent
+				// figure when getting their preferred size.
 				int wHint = -1;
 				int hHint = -1;
 				if (isHorizontal()) {
@@ -79,16 +80,16 @@ public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFi
 					wHint = parent.getClientArea(Rectangle.SINGLETON).width;
 				}
 
-				/*		
-				 * Calculate sum of preferred heights of all children(totalHeight). 
+				/*
+				 * Calculate sum of preferred heights of all children(totalHeight).
 				 * Calculate sum of minimum heights of all children(minHeight).
 				 * Cache Preferred Sizes and Minimum Sizes of all children.
-				 *
+				 * 
 				 * totalHeight is the sum of the preferred heights of all children
 				 * totalMinHeight is the sum of the minimum heights of all children
 				 * prefMinSumHeight is the sum of the difference between all children's
-				 * preferred heights and minimum heights. (This is used as a ratio to 
-				 * calculate how much each child will shrink). 
+				 * preferred heights and minimum heights. (This is used as a ratio to
+				 * calculate how much each child will shrink).
 				 */
 				IFigure child;
 				int totalHeight = 0;
@@ -122,16 +123,16 @@ public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFi
 				prefMinSumHeight = totalHeight - totalMinHeight;
 				prefMaxSumHeight = totalMaxHeight - totalHeight;
 
-				/* 
-				 * The total amount that the children must be shrunk is the 
-				 * sum of the preferred Heights of the children minus  
+				/*
+				 * The total amount that the children must be shrunk is the
+				 * sum of the preferred Heights of the children minus
 				 * Max(the available area and the sum of the minimum heights of the children).
-				 *
+				 * 
 				 * amntShrinkHeight is the combined amount that the children must shrink
-				 * amntShrinkCurrentHeight is the amount each child will shrink respectively  
+				 * amntShrinkCurrentHeight is the amount each child will shrink respectively
 				 */
 				int amntShrinkHeight =
-					totalHeight - Math.max(availableHeight, totalMinHeight);
+						totalHeight - Math.max(availableHeight, totalMinHeight);
 
 				for (int i = 0; i < numChildren; i++) {
 					int amntShrinkCurrentHeight = 0;
@@ -145,35 +146,38 @@ public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFi
 
 					child = (IFigure) children.get(i);
 					if (getStretchMajorAxis() || child instanceof ShapeCompartmentFigure) {
-						if (amntShrinkHeight > 0 && prefMinSumHeight != 0)
-		                    amntShrinkCurrentHeight = (int) ((long) (prefHeight - minHeight)
-		                        * amntShrinkHeight / (prefMinSumHeight));
-						else if (amntShrinkHeight < 0 && totalHeight != 0)
+						if (amntShrinkHeight > 0 && prefMinSumHeight != 0) {
+							amntShrinkCurrentHeight = (int) ((long) (prefHeight - minHeight)
+									* amntShrinkHeight / (prefMinSumHeight));
+						} else if (amntShrinkHeight < 0 && totalHeight != 0) {
 							amntShrinkCurrentHeight =
-								(int) (((maxHeight - prefHeight) / prefMaxSumHeight)
+									(int) (((maxHeight - prefHeight) / prefMaxSumHeight)
 									* amntShrinkHeight);
+						}
 					}
 
 					int width = Math.min(prefWidth, maxWidth);
-					if (isStretchMinorAxis())
+					if (isStretchMinorAxis()) {
 						width = maxWidth;
+					}
 					width = Math.max(minWidth, Math.min(clientArea.width, width));
 					newBounds.width = width;
 
 					int adjust = clientArea.width - width;
 					switch (getMinorAlignment()) {
-						case ALIGN_TOPLEFT :
-							adjust = 0;
-							break;
-						case ALIGN_CENTER :
-							adjust /= 2;
-							break;
-						case ALIGN_BOTTOMRIGHT :
-							break;
+					case ALIGN_TOPLEFT:
+						adjust = 0;
+						break;
+					case ALIGN_CENTER:
+						adjust /= 2;
+						break;
+					case ALIGN_BOTTOMRIGHT:
+						break;
 					}
 					newBounds.x += adjust;
-					if (newBounds.height - amntShrinkCurrentHeight > maxHeight)
+					if (newBounds.height - amntShrinkCurrentHeight > maxHeight) {
 						amntShrinkCurrentHeight = newBounds.height - maxHeight;
+					}
 					newBounds.height -= amntShrinkCurrentHeight;
 					child.setBounds(transposer.t(newBounds));
 
@@ -196,20 +200,22 @@ public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFi
 					Iterator<?> iter = children.iterator();
 					while (iter.hasNext()) {
 						IFigure f = (IFigure) iter.next();
-						if (!f.isVisible())
+						if (!f.isVisible()) {
 							iter.remove();
+						}
 					}
 				}
-				if (isReversed())
+				if (isReversed()) {
 					Collections.reverse(children);
+				}
 				return children;
 			}
 
 		};
-		
+
 		layout.setStretchMajorAxis(false);
 		setLayoutManager(layout);
-		
+
 		tagLabel = new WrappingLabel();
 		tagLabel.setAlignment(PositionConstants.MIDDLE);
 		add(tagLabel);
@@ -221,33 +227,34 @@ public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFi
 			corner = 0;
 			tagLabel.setText(tagConstraintText);
 		}
-		
+
 		add(nameLabel);
 
 		constraintLabel = new WrappingLabel();
 		constraintLabel.setAlignment(PositionConstants.RIGHT);
 		add(constraintLabel);
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeNamedElementFigure#getNameLabel()
-	 * 
+	 *
 	 * @return
 	 */
+	@Override
 	public WrappingLabel getNameLabel() {
 		return nameLabel;
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * @return the textflow of the constraint that contain the string of the
 	 *         specification
 	 */
 	public WrappingLabel getConstraintLabel() {
 		return constraintLabel;
 	}
-	
+
 	public int getCorner() {
 		return corner;
 	}
@@ -263,7 +270,7 @@ public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFi
 	public void setTagLabel(String newTag) {
 		this.tagLabel.setText(newTag);
 	}
-	
+
 	public static boolean isCompleteRepresentation() {
 		return false;
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/DimensionFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/DimensionFigure.java
index 4d3776c283a..6079f1b62a4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/DimensionFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/DimensionFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,15 +24,16 @@ public class DimensionFigure extends ClassifierFigure {
 		super("dimension"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/FlowSpecificationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/FlowSpecificationFigure.java
index a7f8bc7b6d7..f05f3cde6aa 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/FlowSpecificationFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/FlowSpecificationFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,15 +26,16 @@ public class FlowSpecificationFigure extends ClassifierFigure {
 		super("flowSpecification"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/NestedBlockPropertyCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/NestedBlockPropertyCompositeFigure.java
index 47476df3bc5..638d17864f0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/NestedBlockPropertyCompositeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/NestedBlockPropertyCompositeFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,15 +24,16 @@ public class NestedBlockPropertyCompositeFigure extends ClassifierFigure {
 		super("undefined"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/SysMLDiagramFrameFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/SysMLDiagramFrameFigure.java
index 7c50997b434..ad42f9d085d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/SysMLDiagramFrameFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/SysMLDiagramFrameFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -37,9 +37,9 @@ public class SysMLDiagramFrameFigure extends NodeNamedElementFigure {
 	private WrappingLabel frameLabel;
 
 	private RectangleFigure frameLabelContainerFigure;
-	
+
 	private InteractionFigure interactionFigure;
-	
+
 	private int structureOffset;
 
 	public SysMLDiagramFrameFigure() {
@@ -53,14 +53,14 @@ public class SysMLDiagramFrameFigure extends NodeNamedElementFigure {
 	}
 
 	protected RectangleFigure createFigureHeader() {
-		
+
 		if (this.stereotypeLabel == null) {
 			this.stereotypeLabel = new WrappingLabel() {
-	
+
 				@Override
 				public Dimension getPreferredSize(final int wHint, final int hHint) {
 					final Dimension preferredSize = super.getPreferredSize(wHint, hHint);
-					if(preferredSize.width == 0) {
+					if (preferredSize.width == 0) {
 						return preferredSize;
 					}
 					return new Dimension(preferredSize.width + 2, preferredSize.height);
@@ -71,11 +71,11 @@ public class SysMLDiagramFrameFigure extends NodeNamedElementFigure {
 		stereotypeLabel.setAlignment(OrderedLayout.ALIGN_CENTER);
 		if (this.frameLabel == null) {
 			this.frameLabel = new WrappingLabel() {
-	
+
 				@Override
 				public Dimension getPreferredSize(final int wHint, final int hHint) {
 					final Dimension preferredSize = super.getPreferredSize(wHint, hHint);
-					if(preferredSize.width == 0) {
+					if (preferredSize.width == 0) {
 						return preferredSize;
 					}
 					return new Dimension(preferredSize.width + 9, preferredSize.height);
@@ -107,37 +107,38 @@ public class SysMLDiagramFrameFigure extends NodeNamedElementFigure {
 	public RectangleFigure getLabelContainer() {
 		return frameLabelContainerFigure;
 	}
-	
+
 	/**
 	 * this is the layout manager in charge to place element in the enumeration
-	 * 
+	 *
 	 */
 	private class SysMLLayoutLayoutManager extends AutomaticCompartmentLayoutManager {
 
 		/**
-		 * 
+		 *
 		 * {@inheritDoc}
 		 */
+		@Override
 		public void layout(final IFigure container) {
 			List<IFigure> figuresToRemove = new ArrayList<IFigure>();
-			for(int i = 0; i < container.getChildren().size(); i++) {
-				IFigure currentCompartment = (IFigure)container.getChildren().get(i);
+			for (int i = 0; i < container.getChildren().size(); i++) {
+				IFigure currentCompartment = (IFigure) container.getChildren().get(i);
 				// this is a visible compartment
-				if(currentCompartment instanceof ShapeCompartmentFigure) {
+				if (currentCompartment instanceof ShapeCompartmentFigure) {
 					Rectangle bound = new Rectangle(currentCompartment.getBounds());
 					currentCompartment.invalidate();
 					Dimension pref = currentCompartment.getPreferredSize();
 					currentCompartment.invalidate();
 					Dimension prefConstraint = currentCompartment.getPreferredSize(container.getBounds().width - 40, -1);
-					if(pref.width < prefConstraint.width) {
+					if (pref.width < prefConstraint.width) {
 						bound.setSize(pref);
 					} else {
 						bound.setSize(prefConstraint);
 					}
 					bound.x = container.getBounds().x + 10;
-					bound.y = container.getBounds().y + structureOffset ;
+					bound.y = container.getBounds().y + structureOffset;
 					bound.width = container.getBounds().width - 20;
-					bound.height = container.getBounds().height - structureOffset - 10; 
+					bound.height = container.getBounds().height - structureOffset - 10;
 					currentCompartment.setBounds(bound);
 				} else if (currentCompartment == frameLabelContainerFigure) {
 					Rectangle boundLabel = new Rectangle(frameLabelContainerFigure.getBounds());
@@ -171,5 +172,5 @@ public class SysMLDiagramFrameFigure extends NodeNamedElementFigure {
 		}
 		interactionFigure.add(frameLabel);
 	}
-	
+
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/UnitFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/UnitFigure.java
index 0ac2bdf56ce..8021e76ec33 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/UnitFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/UnitFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,15 +24,16 @@ public class UnitFigure extends ClassifierFigure {
 		super("unit"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ValueTypeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ValueTypeFigure.java
index b989cd3e8da..be0f1677699 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ValueTypeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ValueTypeFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -27,15 +27,16 @@ public class ValueTypeFigure extends ClassifierFigure {
 		super("valuetype"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
@@ -49,6 +50,7 @@ public class ValueTypeFigure extends ClassifierFigure {
 		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
 	}
 
+	@Override
 	public IFigure getOperationCompartmentFigure() {
 		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLGraphicalTypes.java
index eaa7b094cc9..572c2de388f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLGraphicalTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLGraphicalTypes.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -40,7 +40,7 @@ public class SysMLGraphicalTypes {
 	public static final String SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID = "shape_sysml_flowport_as_affixed"; //$NON-NLS-1$
 
 	public static final String SHAPE_SYSML_REQUIREMENT_AS_CLASSIFER_ID = "shape_sysml_requirement_as_classifier"; //$NON-NLS-1$
-	
+
 	@Deprecated
 	public static final String SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID = "shape_sysml_nestedblockproperty_as_composite"; //$NON-NLS-1$
 
@@ -71,9 +71,9 @@ public class SysMLGraphicalTypes {
 	public static final String LABEL_SYSML_VALUETYPE_NAME_ID = "label_sysml_valuetype_name"; //$NON-NLS-1$
 
 	public static final String LABEL_SYSML_REQUIREMENT_ID_ID = "label_sysml_requirement_id"; //$NON-NLS-1$
-	
+
 	public static final String LABEL_SYSML_REQUIREMENT_TEXT_ID = "label_sysml_requirement_text"; //$NON-NLS-1$
-	
+
 	/** Custom affixed labels */
 	public static final String AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID = "affixedlabel_sysml_flowport_label"; //$NON-NLS-1$
 
@@ -97,7 +97,7 @@ public class SysMLGraphicalTypes {
 	public static final String COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID = "compartment_sysml_blockproperty_structure"; //$NON-NLS-1$
 
 	public static final String COMPARTMENT_SYSML_VALUE_AS_LIST_ID = "compartment_sysml_value_as_list"; //$NON-NLS-1$
-	
+
 	public static final String COMPARTMENT_SYSML_REQUIREMENT_IDINFO_AS_LIST_ID = "compartment_sysml_requirement_idinfo_as_list"; //$NON-NLS-1$
 
 	/** Custom links */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ActorEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ActorEditPart.java
index 48d2ed6175f..eda815b5d91 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ActorEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ActorEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -58,7 +58,7 @@ public class ActorEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -79,20 +79,20 @@ public class ActorEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -100,19 +100,19 @@ public class ActorEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -120,25 +120,25 @@ public class ActorEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof PropertyCompartmentEditPart) {
+		if (editPart instanceof PropertyCompartmentEditPart) {
 			return getPrimaryShape().getPropertyCompartmentFigure();
 		}
-		if(editPart instanceof OperationCompartmentEditPart) {
+		if (editPart instanceof OperationCompartmentEditPart) {
 			return getPrimaryShape().getOperationCompartmentFigure();
 		}
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new ActorFigure();
@@ -146,7 +146,7 @@ public class ActorEditPart extends AbstractElementEditPart {
 
 	@Override
 	public ActorFigure getPrimaryShape() {
-		return (ActorFigure)primaryShape;
+		return (ActorFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorEditPart.java
index 90763608a57..699f630a164 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -47,16 +47,16 @@ public class ConnectorEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof ConnectorLinkLabelEditPart) {
-			((ConnectorLinkLabelEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof ConnectorLinkLabelEditPart) {
+			((ConnectorLinkLabelEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof ConnectorLinkLabelSourceMultiplicityEditPart) {
-			((ConnectorLinkLabelSourceMultiplicityEditPart)childEditPart).setLabel(getPrimaryShape().getSourceMultiplicityLabel());
+		if (childEditPart instanceof ConnectorLinkLabelSourceMultiplicityEditPart) {
+			((ConnectorLinkLabelSourceMultiplicityEditPart) childEditPart).setLabel(getPrimaryShape().getSourceMultiplicityLabel());
 			return true;
 		}
-		if(childEditPart instanceof ConnectorLinkLabelTargetMultiplicityEditPart) {
-			((ConnectorLinkLabelTargetMultiplicityEditPart)childEditPart).setLabel(getPrimaryShape().getTargetMultiplicityLabel());
+		if (childEditPart instanceof ConnectorLinkLabelTargetMultiplicityEditPart) {
+			((ConnectorLinkLabelTargetMultiplicityEditPart) childEditPart).setLabel(getPrimaryShape().getTargetMultiplicityLabel());
 			return true;
 		}
 		return super.addFixedChild(childEditPart);
@@ -67,13 +67,13 @@ public class ConnectorEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof ConnectorLinkLabelEditPart) {
+		if (childEditPart instanceof ConnectorLinkLabelEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof ConnectorLinkLabelSourceMultiplicityEditPart) {
+		if (childEditPart instanceof ConnectorLinkLabelSourceMultiplicityEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof ConnectorLinkLabelTargetMultiplicityEditPart) {
+		if (childEditPart instanceof ConnectorLinkLabelTargetMultiplicityEditPart) {
 			return true;
 		}
 		return super.removeFixedChild(childEditPart);
@@ -92,17 +92,17 @@ public class ConnectorEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	public ConnectorEdgeFigure getPrimaryShape() {
-		return (ConnectorEdgeFigure)getFigure();
+		return (ConnectorEdgeFigure) getFigure();
 	}
 
 	@Override
 	protected void refreshLineWidth() {
 		int width = getLineWidth();
-		if(width < 1) {
+		if (width < 1) {
 			width = 1;
 		}
 
-		if(org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication((Element)resolveSemanticElement(), BindingConnector.class) != null) {
+		if (org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication((Element) resolveSemanticElement(), BindingConnector.class) != null) {
 			setLineWidth(width * 2);
 		} else {
 			setLineWidth(width);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintCompartmentEditPart.java
index 77b118616fb..c24697cf921 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class ConstraintCompartmentEditPart extends ResizeableListCompartmentEdit
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintParameterAffixedNodeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintParameterAffixedNodeEditPart.java
index a450a7d041e..0dc9b7d3427 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintParameterAffixedNodeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintParameterAffixedNodeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -57,6 +57,7 @@ public class ConstraintParameterAffixedNodeEditPart extends AbstractElementBorde
 	}
 
 
+	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy() {
@@ -71,11 +72,11 @@ public class ConstraintParameterAffixedNodeEditPart extends AbstractElementBorde
 			 */
 			@Override
 			protected void refreshStereotypeDisplay() {
-				if(getHost() instanceof IPapyrusEditPart) {
-					IFigure figure = ((IPapyrusEditPart)getHost()).getPrimaryShape();
+				if (getHost() instanceof IPapyrusEditPart) {
+					IFigure figure = ((IPapyrusEditPart) getHost()).getPrimaryShape();
 
-					if((figure instanceof IPapyrusUMLElementFigure) && (stereotypeIconToDisplay() != null)) {
-						((IPapyrusUMLElementFigure)figure).setStereotypeDisplay(null, stereotypeIconToDisplay());
+					if ((figure instanceof IPapyrusUMLElementFigure) && (stereotypeIconToDisplay() != null)) {
+						((IPapyrusUMLElementFigure) figure).setStereotypeDisplay(null, stereotypeIconToDisplay());
 					} else {
 						refreshVisuals();
 					}
@@ -91,13 +92,15 @@ public class ConstraintParameterAffixedNodeEditPart extends AbstractElementBorde
 	protected LayoutEditPolicy createLayoutEditPolicy() {
 		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
 
+			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if(child instanceof IBorderItemEditPart) { // External labels
+				if (child instanceof IBorderItemEditPart) { // External labels
 					return new ExternalLabelPrimaryDragRoleEditPolicy() {
 
+						@Override
 						@SuppressWarnings("rawtypes")
 						protected List createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());
+							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
 							mh.setBorder(null);
 							return Collections.singletonList(mh);
 						}
@@ -105,16 +108,18 @@ public class ConstraintParameterAffixedNodeEditPart extends AbstractElementBorde
 				}
 
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
 			}
 
+			@Override
 			protected Command getMoveChildrenCommand(Request request) {
 				return null;
 			}
 
+			@Override
 			protected Command getCreateCommand(CreateRequest request) {
 				return null;
 			}
@@ -136,7 +141,7 @@ public class ConstraintParameterAffixedNodeEditPart extends AbstractElementBorde
 
 	/**
 	 * <pre>
-	 * Calls the figure refresh when a change event is detected on 
+	 * Calls the figure refresh when a change event is detected on
 	 * UMLPackage.eINSTANCE.getProperty_Aggregation().
 	 * 
 	 * {@inheritDoc}
@@ -147,7 +152,7 @@ public class ConstraintParameterAffixedNodeEditPart extends AbstractElementBorde
 
 		// When the constraint parameter position changes, its position on parent side may change and requires a visual refresh.
 		Object feature = event.getFeature();
-		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
 			refreshVisuals();
 		}
 
@@ -167,7 +172,7 @@ public class ConstraintParameterAffixedNodeEditPart extends AbstractElementBorde
 	 */
 	@Override
 	public AffixedNamedElementFigure getPrimaryShape() {
-		return (AffixedNamedElementFigure)primaryShape;
+		return (AffixedNamedElementFigure) primaryShape;
 	}
 
 	/**
@@ -189,7 +194,7 @@ public class ConstraintParameterAffixedNodeEditPart extends AbstractElementBorde
 			@Override
 			public void postLayout(IFigure container) {
 				refreshVisuals();
-				//getBorderedFigure().getBorderItemContainer().removeLayoutListener(layoutInitializationListener);
+				// getBorderedFigure().getBorderItemContainer().removeLayoutListener(layoutInitializationListener);
 				layoutInitializationListener = null;
 			}
 		};
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DataTypeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DataTypeEditPart.java
index 9a22b861157..7171ca160d3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DataTypeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DataTypeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -58,7 +58,7 @@ public class DataTypeEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -79,20 +79,20 @@ public class DataTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -100,19 +100,19 @@ public class DataTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -120,25 +120,25 @@ public class DataTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof PropertyCompartmentEditPart) {
+		if (editPart instanceof PropertyCompartmentEditPart) {
 			return getPrimaryShape().getPropertyCompartmentFigure();
 		}
-		if(editPart instanceof OperationCompartmentEditPart) {
+		if (editPart instanceof OperationCompartmentEditPart) {
 			return getPrimaryShape().getOperationCompartmentFigure();
 		}
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new DataTypeFigure();
@@ -146,7 +146,7 @@ public class DataTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	public DataTypeFigure getPrimaryShape() {
-		return (DataTypeFigure)primaryShape;
+		return (DataTypeFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DependencyEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DependencyEditPart.java
index ddca73b2787..480c4734820 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DependencyEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DependencyEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -47,8 +47,8 @@ public class DependencyEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			((NamedElementLinkLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
+			((NamedElementLinkLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
 		return super.addFixedChild(childEditPart);
@@ -59,7 +59,7 @@ public class DependencyEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementLinkLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
 			return true;
 		}
 		return super.removeFixedChild(childEditPart);
@@ -68,6 +68,7 @@ public class DependencyEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates figure for this edit part.
 	 */
+	@Override
 	protected Connection createConnectionFigure() {
 		return new NamedElementEdgeFigure();
 	}
@@ -75,8 +76,9 @@ public class DependencyEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates primary shape for this edit part.
 	 */
+	@Override
 	public NamedElementEdgeFigure getPrimaryShape() {
-		return (NamedElementEdgeFigure)getFigure();
+		return (NamedElementEdgeFigure) getFigure();
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationEditPart.java
index 57edca2df57..1c6c0784646 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -58,7 +58,7 @@ public class EnumerationEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -79,14 +79,14 @@ public class EnumerationEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof EnumerationLiteralCompartmentEditPart) {
+		if (childEditPart instanceof EnumerationLiteralCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((EnumerationLiteralCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((EnumerationLiteralCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -94,13 +94,13 @@ public class EnumerationEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof EnumerationLiteralCompartmentEditPart) {
+		if (childEditPart instanceof EnumerationLiteralCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((EnumerationLiteralCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((EnumerationLiteralCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -108,22 +108,22 @@ public class EnumerationEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof EnumerationLiteralCompartmentEditPart) {
+		if (editPart instanceof EnumerationLiteralCompartmentEditPart) {
 			return getPrimaryShape().getEnumerationLiteralCompartmentFigure();
 		}
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new EnumerationFigure();
@@ -131,7 +131,7 @@ public class EnumerationEditPart extends AbstractElementEditPart {
 
 	@Override
 	public EnumerationFigure getPrimaryShape() {
-		return (EnumerationFigure)primaryShape;
+		return (EnumerationFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationLiteralCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationLiteralCompartmentEditPart.java
index 008e9463599..b911455f8ea 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationLiteralCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationLiteralCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class EnumerationLiteralCompartmentEditPart extends ResizeableListCompart
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/GeneralizationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/GeneralizationEditPart.java
index 1354831da6e..2d0f91906ad 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/GeneralizationEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/GeneralizationEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -61,6 +61,7 @@ public class GeneralizationEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates figure for this edit part.
 	 */
+	@Override
 	protected Connection createConnectionFigure() {
 		return new GeneralizationFigure();
 	}
@@ -68,8 +69,9 @@ public class GeneralizationEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates primary shape for this edit part.
 	 */
+	@Override
 	public GeneralizationFigure getPrimaryShape() {
-		return (GeneralizationFigure)getFigure();
+		return (GeneralizationFigure) getFigure();
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceEditPart.java
index 76092a5422b..ecdc6a084d8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -58,7 +58,7 @@ public class InterfaceEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -79,20 +79,20 @@ public class InterfaceEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -100,19 +100,19 @@ public class InterfaceEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -120,25 +120,25 @@ public class InterfaceEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof PropertyCompartmentEditPart) {
+		if (editPart instanceof PropertyCompartmentEditPart) {
 			return getPrimaryShape().getPropertyCompartmentFigure();
 		}
-		if(editPart instanceof OperationCompartmentEditPart) {
+		if (editPart instanceof OperationCompartmentEditPart) {
 			return getPrimaryShape().getOperationCompartmentFigure();
 		}
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new InterfaceFigure();
@@ -146,7 +146,7 @@ public class InterfaceEditPart extends AbstractElementEditPart {
 
 	@Override
 	public InterfaceFigure getPrimaryShape() {
-		return (InterfaceFigure)primaryShape;
+		return (InterfaceFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceRealizationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceRealizationEditPart.java
index a9032cfbb0d..d82cd9a2e12 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceRealizationEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceRealizationEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -47,8 +47,8 @@ public class InterfaceRealizationEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			((NamedElementLinkLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
+			((NamedElementLinkLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
 		return super.addFixedChild(childEditPart);
@@ -59,7 +59,7 @@ public class InterfaceRealizationEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementLinkLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
 			return true;
 		}
 		return super.removeFixedChild(childEditPart);
@@ -68,6 +68,7 @@ public class InterfaceRealizationEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates figure for this edit part.
 	 */
+	@Override
 	protected Connection createConnectionFigure() {
 		return new InterfaceRealizationFigure();
 	}
@@ -75,8 +76,9 @@ public class InterfaceRealizationEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates primary shape for this edit part.
 	 */
+	@Override
 	public InterfaceRealizationFigure getPrimaryShape() {
-		return (InterfaceRealizationFigure)getFigure();
+		return (InterfaceRealizationFigure) getFigure();
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/OperationCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/OperationCompartmentEditPart.java
index bed685d01ce..9e28fc8d821 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/OperationCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/OperationCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class OperationCompartmentEditPart extends ResizeableListCompartmentEditP
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedNodeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedNodeEditPart.java
index 15ac7802163..e8715b7db88 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedNodeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedNodeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -42,40 +42,45 @@ public class PortAffixedNodeEditPart extends AbstractElementBorderEditPart {
 		super(view);
 	}
 
+	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());
 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
 		// Start of user code custom policies
-		// End of user code		
+		// End of user code
 	}
 
 	@Override
 	protected LayoutEditPolicy createLayoutEditPolicy() {
 		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
 
+			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if(child instanceof IBorderItemEditPart) { // External labels
+				if (child instanceof IBorderItemEditPart) { // External labels
 					return new ExternalLabelPrimaryDragRoleEditPolicy() {
 
+						@Override
 						protected List createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());
+							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
 							mh.setBorder(null);
 							return Collections.singletonList(mh);
 						}
 					};
 				}
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
 			}
 
+			@Override
 			protected Command getMoveChildrenCommand(Request request) {
 				return null;
 			}
 
+			@Override
 			protected Command getCreateCommand(CreateRequest request) {
 				return null;
 			}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortCompartmentEditPart.java
index 3f5e9033b17..ddd64792962 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class PortCompartmentEditPart extends ResizeableListCompartmentEditPart {
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PrimitiveTypeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PrimitiveTypeEditPart.java
index 751e3d90a43..e09469a6d49 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PrimitiveTypeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PrimitiveTypeEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -54,7 +54,7 @@ public class PrimitiveTypeEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -75,8 +75,8 @@ public class PrimitiveTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
 		return false;
@@ -84,7 +84,7 @@ public class PrimitiveTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
 			return true;
 		}
 		return false;
@@ -95,16 +95,16 @@ public class PrimitiveTypeEditPart extends AbstractElementEditPart {
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new PrimitiveTypeFigure();
@@ -112,7 +112,7 @@ public class PrimitiveTypeEditPart extends AbstractElementEditPart {
 
 	@Override
 	public PrimitiveTypeFigure getPrimaryShape() {
-		return (PrimitiveTypeFigure)primaryShape;
+		return (PrimitiveTypeFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyCompartmentEditPart.java
index d58ffd110b9..6718c8f8959 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyCompartmentEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,18 +45,21 @@ public class PropertyCompartmentEditPart extends ResizeableListCompartmentEditPa
 		return COMPARTMENT_NAME;
 	}
 
+	@Override
 	protected boolean hasModelChildrenChanged(Notification evt) {
 		return false;
 	}
 
+	@Override
 	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
 		result.setTitleVisibility(false);
 		return result;
 	}
 
+	@Override
 	protected void setRatio(Double ratio) {
-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
 			super.setRatio(ratio);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/SignalEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/SignalEditPart.java
index afbd6d02ac9..5d8000a84a6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/SignalEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/SignalEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -58,7 +58,7 @@ public class SignalEditPart extends AbstractElementEditPart {
 			@Override
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if(result == null) {
+				if (result == null) {
 					result = new NonResizableEditPolicy();
 				}
 				return result;
@@ -79,20 +79,20 @@ public class SignalEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -100,19 +100,19 @@ public class SignalEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementNodeLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof PropertyCompartmentEditPart) {
+		if (childEditPart instanceof PropertyCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof OperationCompartmentEditPart) {
+		if (childEditPart instanceof OperationCompartmentEditPart) {
 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
 			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -120,25 +120,25 @@ public class SignalEditPart extends AbstractElementEditPart {
 
 	@Override
 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if(editPart instanceof PropertyCompartmentEditPart) {
+		if (editPart instanceof PropertyCompartmentEditPart) {
 			return getPrimaryShape().getPropertyCompartmentFigure();
 		}
-		if(editPart instanceof OperationCompartmentEditPart) {
+		if (editPart instanceof OperationCompartmentEditPart) {
 			return getPrimaryShape().getOperationCompartmentFigure();
 		}
 		return getContentPane();
 	}
 
-	//	public EditPart getTargetEditPart(Request request) {
-	//		if(request instanceof CreateViewAndElementRequest) {
-	//			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	//			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	//			if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	//				return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	//			}
-	//		}
-	//		return super.getTargetEditPart(request);
-	//	}
+	// public EditPart getTargetEditPart(Request request) {
+	// if(request instanceof CreateViewAndElementRequest) {
+	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
+	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
+	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
+	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
+	// }
+	// }
+	// return super.getTargetEditPart(request);
+	// }
 	@Override
 	protected IFigure createNodeShape() {
 		return primaryShape = new SignalFigure();
@@ -146,7 +146,7 @@ public class SignalEditPart extends AbstractElementEditPart {
 
 	@Override
 	public SignalFigure getPrimaryShape() {
-		return (SignalFigure)primaryShape;
+		return (SignalFigure) primaryShape;
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/UsageEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/UsageEditPart.java
index 53effae3437..04d589ca367 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/UsageEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/UsageEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -19,6 +19,7 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.figure.EdgeDecorationType;
 import org.eclipse.papyrus.uml.diagram.common.figure.NamedElementEdgeFigure;
@@ -39,7 +40,7 @@ public class UsageEditPart extends AbstractElementLinkEditPart {
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy("use"));
+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy("use"));
 		// Start of user code custom policies
 		// End of user code
 	}
@@ -49,8 +50,8 @@ public class UsageEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			((NamedElementLinkLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
+			((NamedElementLinkLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
 		return super.addFixedChild(childEditPart);
@@ -61,7 +62,7 @@ public class UsageEditPart extends AbstractElementLinkEditPart {
 	 */
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof NamedElementLinkLabelNameEditPart) {
+		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
 			return true;
 		}
 		return super.removeFixedChild(childEditPart);
@@ -70,6 +71,7 @@ public class UsageEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates figure for this edit part.
 	 */
+	@Override
 	protected Connection createConnectionFigure() {
 		return new NamedElementEdgeFigure();
 	}
@@ -77,8 +79,9 @@ public class UsageEditPart extends AbstractElementLinkEditPart {
 	/**
 	 * Creates primary shape for this edit part.
 	 */
+	@Override
 	public NamedElementEdgeFigure getPrimaryShape() {
-		return (NamedElementEdgeFigure)getFigure();
+		return (NamedElementEdgeFigure) getFigure();
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConnectorLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConnectorLinkViewFactory.java
index dbea16970da..f1851011c66 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConnectorLinkViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConnectorLinkViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConstraintPropertyAffixedNodeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConstraintPropertyAffixedNodeViewFactory.java
index 7e61a306410..96460cb9c40 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConstraintPropertyAffixedNodeViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConstraintPropertyAffixedNodeViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/DependencyLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/DependencyLinkViewFactory.java
index 79dc768d1b9..15aba6f4db5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/DependencyLinkViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/DependencyLinkViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/EnumerationClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/EnumerationClassifierViewFactory.java
index a8cd95c5e75..4b300693973 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/EnumerationClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/EnumerationClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -31,6 +31,6 @@ public class EnumerationClassifierViewFactory extends ShapeViewFactory {
 		// this action needs to be done after the compartments creation
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
-	// Start of user code preferences	
+	// Start of user code preferences
 	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/GeneralizationLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/GeneralizationLinkViewFactory.java
index ec3a72a0116..4459ac68e98 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/GeneralizationLinkViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/GeneralizationLinkViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/InterfaceRealizationLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/InterfaceRealizationLinkViewFactory.java
index 7c16d052e27..095d3582c4e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/InterfaceRealizationLinkViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/InterfaceRealizationLinkViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PortAffixedNodeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PortAffixedNodeViewFactory.java
index 0f254405847..555236eacd7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PortAffixedNodeViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PortAffixedNodeViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PrimitiveTypeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PrimitiveTypeClassifierViewFactory.java
index f9a77389bb4..0f603a562ef 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PrimitiveTypeClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PrimitiveTypeClassifierViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -30,6 +30,6 @@ public class PrimitiveTypeClassifierViewFactory extends ShapeViewFactory {
 		// this action needs to be done after the compartments creation
 		super.decorateView(containerView, view, element, semanticHint, index, persisted);
 	}
-	// Start of user code preferences	
+	// Start of user code preferences
 	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/UsageLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/UsageLinkViewFactory.java
index ad4f551229c..a02e00ede2a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/UsageLinkViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/UsageLinkViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/ActorFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/ActorFigure.java
index e66ed4aab73..e7b5124b775 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/ActorFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/ActorFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -27,15 +27,16 @@ public class ActorFigure extends ClassifierFigure {
 		super("actor"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
@@ -49,6 +50,7 @@ public class ActorFigure extends ClassifierFigure {
 		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
 	}
 
+	@Override
 	public IFigure getOperationCompartmentFigure() {
 		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/DataTypeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/DataTypeFigure.java
index 1a29b3ea63d..e6ab2cb91d3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/DataTypeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/DataTypeFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -27,15 +27,16 @@ public class DataTypeFigure extends ClassifierFigure {
 		super("datatype"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
@@ -49,6 +50,7 @@ public class DataTypeFigure extends ClassifierFigure {
 		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
 	}
 
+	@Override
 	public IFigure getOperationCompartmentFigure() {
 		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/EnumerationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/EnumerationFigure.java
index 1e502ed9c70..33839691c06 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/EnumerationFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/EnumerationFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,15 +26,16 @@ public class EnumerationFigure extends ClassifierFigure {
 		super("enumeration"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceFigure.java
index a44ce4dbf69..db162ee1a95 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -27,15 +27,16 @@ public class InterfaceFigure extends ClassifierFigure {
 		super("interface"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
@@ -49,6 +50,7 @@ public class InterfaceFigure extends ClassifierFigure {
 		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
 	}
 
+	@Override
 	public IFigure getOperationCompartmentFigure() {
 		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/PrimitiveTypeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/PrimitiveTypeFigure.java
index e008af2e1ac..596800a9789 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/PrimitiveTypeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/PrimitiveTypeFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,15 +24,16 @@ public class PrimitiveTypeFigure extends ClassifierFigure {
 		super("primitive"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/SignalFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/SignalFigure.java
index 7223b187860..8b78df6b131 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/SignalFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/SignalFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -27,15 +27,16 @@ public class SignalFigure extends ClassifierFigure {
 		super("signal"); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void createContentPane(List<String> compartments) {
 		super.createContentPane(getUpdatedListOfCompartments(compartments));
 	}
 
 	/**
 	 * Get the list of compartments, updated with specific ones
-	 * 
+	 *
 	 * @param compartments
-	 *        the original list of compartments (untouched)
+	 *            the original list of compartments (untouched)
 	 * @return the new completed list of compartments
 	 */
 	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
@@ -49,6 +50,7 @@ public class SignalFigure extends ClassifierFigure {
 		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
 	}
 
+	@Override
 	public IFigure getOperationCompartmentFigure() {
 		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/utils/UMLGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/utils/UMLGraphicalTypes.java
index 068f7c04bd6..494dea676aa 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/utils/UMLGraphicalTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/utils/UMLGraphicalTypes.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
index d1ba80264a0..ff7756726c2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -96,7 +96,7 @@ public class Activator extends AbstractUIPlugin {
 	public void stop(BundleContext context) throws Exception {
 		adapterFactory.dispose();
 		adapterFactory = null;
-		if(labelProvider != null) {
+		if (labelProvider != null) {
 			labelProvider.dispose();
 			labelProvider = null;
 		}
@@ -106,7 +106,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getInstance() {
@@ -115,10 +115,10 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 * 
+	 *
 	 * @generated
 	 * @param path
-	 *        the path
+	 *            the path
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getBundledImageDescriptor(String path) {
@@ -126,9 +126,9 @@ public class Activator extends AbstractUIPlugin {
 	}
 
 	/**
-	 * 
+	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 * 
+	 *
 	 * @return Shared Preference Store.
 	 */
 	@Override
@@ -139,7 +139,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Get the item provider adapter factory.
-	 * 
+	 *
 	 * @return the adapter factory.
 	 */
 	public AdapterFactory getItemProvidersAdapterFactory() {
@@ -148,14 +148,14 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Get an image descriptor for current item.
-	 * 
+	 *
 	 * @param item
-	 *        the item for which an image descriptor searched.
+	 *            the item for which an image descriptor searched.
 	 * @return the image descriptor.
 	 */
 	public ImageDescriptor getItemImageDescriptor(Object item) {
-		IItemLabelProvider labelProvider = (IItemLabelProvider)adapterFactory.adapt(item, IItemLabelProvider.class);
-		if(labelProvider != null) {
+		IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(item, IItemLabelProvider.class);
+		if (labelProvider != null) {
 			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item));
 		}
 		return null;
@@ -163,9 +163,9 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Get an image for a ENamedElement in plug-in image registry.
-	 * 
+	 *
 	 * @param element
-	 *        the element.
+	 *            the element.
 	 * @return the image.
 	 */
 	public Image getImage(ENamedElement element) {
@@ -173,9 +173,9 @@ public class Activator extends AbstractUIPlugin {
 		String imageKey = element.getName();
 
 		Image image = getImageRegistry().get(imageKey);
-		if(image == null) {
+		if (image == null) {
 			ImageDescriptor imageDescriptor = getProvidedImageDescriptor(element);
-			if(imageDescriptor == null) {
+			if (imageDescriptor == null) {
 				imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
 			}
 			getImageRegistry().put(imageKey, imageDescriptor);
@@ -202,19 +202,19 @@ public class Activator extends AbstractUIPlugin {
 	 *         <li> {@linkplain PositionConstants#SOUTH_EAST}</li>
 	 *         <li> {@linkplain PositionConstants#SOUTH_WEST}</li>
 	 *         </ul>
-	 * 
+	 *
 	 * </pre>
 	 */
 	public Image getFlowPortImage(FlowPort flowport, int side) {
 
 		// Prepare the image key
 		String imageKey = "FlowPort_";
-		if(flowport.isAtomic()) {
-			if(flowport.getDirection() == FlowDirection.IN) {
+		if (flowport.isAtomic()) {
+			if (flowport.getDirection() == FlowDirection.IN) {
 				imageKey = imageKey + "IN_";
-			} else if(flowport.getDirection() == FlowDirection.OUT) {
+			} else if (flowport.getDirection() == FlowDirection.OUT) {
 				imageKey = imageKey + "OUT_";
-			} else if(flowport.getDirection() == FlowDirection.INOUT) {
+			} else if (flowport.getDirection() == FlowDirection.INOUT) {
 				imageKey = imageKey + "INOUT_";
 			}
 
@@ -223,31 +223,31 @@ public class Activator extends AbstractUIPlugin {
 			imageKey = imageKey + "NA_";
 		}
 
-		if(side == PositionConstants.WEST) {
+		if (side == PositionConstants.WEST) {
 			imageKey = imageKey + "WEST";
-		} else if(side == PositionConstants.NORTH) {
+		} else if (side == PositionConstants.NORTH) {
 			imageKey = imageKey + "NORTH";
-		} else if(side == PositionConstants.SOUTH) {
+		} else if (side == PositionConstants.SOUTH) {
 			imageKey = imageKey + "SOUTH";
-		} else if(side == PositionConstants.EAST) {
+		} else if (side == PositionConstants.EAST) {
 			imageKey = imageKey + "EAST";
-		} else if(side == PositionConstants.NORTH_WEST) {
+		} else if (side == PositionConstants.NORTH_WEST) {
 			imageKey = imageKey + "NORTH_WEST";
-		} else if(side == PositionConstants.NORTH_EAST) {
+		} else if (side == PositionConstants.NORTH_EAST) {
 			imageKey = imageKey + "NORTH_EAST";
-		} else if(side == PositionConstants.SOUTH_EAST) {
+		} else if (side == PositionConstants.SOUTH_EAST) {
 			imageKey = imageKey + "SOUTH_EAST";
-		} else if(side == PositionConstants.SOUTH_WEST) {
+		} else if (side == PositionConstants.SOUTH_WEST) {
 			imageKey = imageKey + "SOUTH_WEST";
 		}
 
 		// Retrieve image from registry or add it in the registry
 		Image image = getImageRegistry().get(imageKey);
-		if(image == null) {
+		if (image == null) {
 
 			ImageDescriptor imageDescriptor = imageDescriptorFromPlugin(PLUGIN_ID, "/icons/flowports/" + imageKey + ".gif");
 
-			if(imageDescriptor == null) {
+			if (imageDescriptor == null) {
 				imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
 			}
 			getImageRegistry().put(imageKey, imageDescriptor);
@@ -259,11 +259,11 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns a label provider supported by EMF Facet
-	 * 
+	 *
 	 * @return a label provider supported by EMF Facet
 	 */
 	public ILabelProvider getLabelProvider() {
-		if(labelProvider == null) {
+		if (labelProvider == null) {
 			// add a generic label provider for sysml elements
 			labelProvider = new UMLLabelProvider();
 		}
@@ -277,14 +277,14 @@ public class Activator extends AbstractUIPlugin {
 		ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>();
 
 		// Add SysML adapters
-//		factories.add(new ActivitiesItemProviderAdapterFactory());
-//		factories.add(new AllocationsItemProviderAdapterFactory());
-//		factories.add(new BlocksItemProviderAdapterFactory());
-//		factories.add(new ConstraintsItemProviderAdapterFactory());
-//		factories.add(new ModelelementsItemProviderAdapterFactory());
-//		factories.add(new PortandflowsItemProviderAdapterFactory());
-//		factories.add(new RequirementsItemProviderAdapterFactory());
-		// Add UML adapter   
+		// factories.add(new ActivitiesItemProviderAdapterFactory());
+		// factories.add(new AllocationsItemProviderAdapterFactory());
+		// factories.add(new BlocksItemProviderAdapterFactory());
+		// factories.add(new ConstraintsItemProviderAdapterFactory());
+		// factories.add(new ModelelementsItemProviderAdapterFactory());
+		// factories.add(new PortandflowsItemProviderAdapterFactory());
+		// factories.add(new RequirementsItemProviderAdapterFactory());
+		// Add UML adapter
 		factories.add(new UMLItemProviderAdapterFactory());
 
 		// Other adapters
@@ -295,19 +295,19 @@ public class Activator extends AbstractUIPlugin {
 	}
 
 	private ImageDescriptor getProvidedImageDescriptor(ENamedElement element) {
-		if(element instanceof EStructuralFeature) {
-			EStructuralFeature feature = ((EStructuralFeature)element);
+		if (element instanceof EStructuralFeature) {
+			EStructuralFeature feature = ((EStructuralFeature) element);
 			EClass eContainingClass = feature.getEContainingClass();
 			EClassifier eType = feature.getEType();
-			if(eContainingClass != null && !eContainingClass.isAbstract()) {
+			if (eContainingClass != null && !eContainingClass.isAbstract()) {
 				element = eContainingClass;
-			} else if(eType instanceof EClass && !((EClass)eType).isAbstract()) {
+			} else if (eType instanceof EClass && !((EClass) eType).isAbstract()) {
 				element = eType;
 			}
 		}
-		if(element instanceof EClass) {
-			EClass eClass = (EClass)element;
-			if(!eClass.isAbstract()) {
+		if (element instanceof EClass) {
+			EClass eClass = (EClass) element;
+			if (!eClass.isAbstract()) {
 				return getItemImageDescriptor(eClass.getEPackage().getEFactoryInstance().create(eClass));
 			}
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java
index f9aa4c0527e..c82b1e12599 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -31,7 +31,7 @@ public class CreateSysMLModelCommand extends ModelCreationCommandBase {
 
 	/**
 	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#createRootElement()
-	 * 
+	 *
 	 * @return
 	 */
 
@@ -42,25 +42,25 @@ public class CreateSysMLModelCommand extends ModelCreationCommandBase {
 
 	/**
 	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#initializeModel(org.eclipse.emf.ecore.EObject)
-	 * 
+	 *
 	 * @param owner
 	 */
 
 	@Override
 	protected void initializeModel(EObject owner) {
 		super.initializeModel(owner);
-		((org.eclipse.uml2.uml.Package)owner).setName(getModelName());
+		((org.eclipse.uml2.uml.Package) owner).setName(getModelName());
 
 		// Retrieve SysML profile and apply with Sub-profile
-		Profile sysml = (Profile)PackageUtil.loadPackage(URI.createURI(SysmlResource.SYSML_PROFILE_URI), owner.eResource().getResourceSet());
-		if(sysml != null) {
-			PackageUtil.applyProfile(((org.eclipse.uml2.uml.Package)owner), sysml, true);
+		Profile sysml = (Profile) PackageUtil.loadPackage(URI.createURI(SysmlResource.SYSML_PROFILE_URI), owner.eResource().getResourceSet());
+		if (sysml != null) {
+			PackageUtil.applyProfile(((org.eclipse.uml2.uml.Package) owner), sysml, true);
 		}
 	}
 
 	/**
 	 * Gets the model name.
-	 * 
+	 *
 	 * @return the model name
 	 */
 	protected String getModelName() {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java
index 4b140657d28..c85e409050b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -67,6 +67,7 @@ public class PartPasteStrategy implements IPasteStrategy {
 	 * 
 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getLabel()
 	 */
+	@Override
 	public String getLabel() {
 		return "partPasteStrategy"; //$NON-NLS-1$
 	}
@@ -76,6 +77,7 @@ public class PartPasteStrategy implements IPasteStrategy {
 	 * 
 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getID()
 	 */
+	@Override
 	public String getID() {
 		return Activator.ID + ".partPasteStrategy"; //$NON-NLS-1$
 	}
@@ -85,6 +87,7 @@ public class PartPasteStrategy implements IPasteStrategy {
 	 * 
 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getDescription()
 	 */
+	@Override
 	public String getDescription() {
 		return "Paste part elements with association"; //$NON-NLS-1$
 	}
@@ -112,6 +115,7 @@ public class PartPasteStrategy implements IPasteStrategy {
 	 * 
 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getImage()
 	 */
+	@Override
 	@Deprecated
 	public Image getImage() {
 		return null;
@@ -122,6 +126,7 @@ public class PartPasteStrategy implements IPasteStrategy {
 	 * 
 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getPriority()
 	 */
+	@Override
 	@Deprecated
 	public int getPriority() {
 		return 1;
@@ -131,10 +136,10 @@ public class PartPasteStrategy implements IPasteStrategy {
 	 * Sets the options.
 	 *
 	 * @param options
-	 *        the options
+	 *            the options
 	 */
 	public void setOptions(Map<String, Object> options) {
-		//Nothing
+		// Nothing
 	}
 
 	/*
@@ -145,51 +150,51 @@ public class PartPasteStrategy implements IPasteStrategy {
 	 */
 	@Override
 	public org.eclipse.emf.common.command.Command getSemanticCommand(EditingDomain domain, EObject targetOwner, PapyrusClipboard<Object> papyrusClipboard) {
-		if(targetOwner instanceof Classifier || targetOwner instanceof Package) { // test if block or package
+		if (targetOwner instanceof Classifier || targetOwner instanceof Package) { // test if block or package
 			// get affiliate AdditionnalData
 			Map<Object, ?> additionalDataMap = papyrusClipboard.getAdditionalDataForStrategy(getID());
-			if(additionalDataMap != null) {
+			if (additionalDataMap != null) {
 				CompoundCommand compoundCommand = new CompoundCommand("Copy associations for parts"); //$NON-NLS-1$
-				for(Iterator<Object> iterator = papyrusClipboard.iterator(); iterator.hasNext();) {
+				for (Iterator<Object> iterator = papyrusClipboard.iterator(); iterator.hasNext();) {
 					Object object = iterator.next();
 					EObject target = papyrusClipboard.getTragetCopyFromInternalClipboardCopy(object);
 					Object additionnalData = additionalDataMap.get(object);
 					EList<Association> listDuplicatedAssociation = new BasicEList<Association>();
 					EObject associationContainer = null;
-					if(target != null && target instanceof Property && targetOwner instanceof Classifier && additionnalData instanceof PartAdditionalData) { // test if it is a part
-						Classifier block = (Classifier)targetOwner;
-						Property property = (Property)target;
-						PartAdditionalData partAdditionalData = (PartAdditionalData)additionnalData;
+					if (target != null && target instanceof Property && targetOwner instanceof Classifier && additionnalData instanceof PartAdditionalData) { // test if it is a part
+						Classifier block = (Classifier) targetOwner;
+						Property property = (Property) target;
+						PartAdditionalData partAdditionalData = (PartAdditionalData) additionnalData;
 						Association newAssociation = partAdditionalData.getDuplicatedAssociation();
 						restoreAssociationPartContext(block, property, newAssociation);
 						listDuplicatedAssociation.add(newAssociation);
 						associationContainer = block.eContainer();
-					} else if(target != null && target instanceof Classifier && targetOwner instanceof Package && additionnalData instanceof PartBlockAdditionalData) { // test if it is a block
-						Classifier classifier = (Classifier)target;
+					} else if (target != null && target instanceof Classifier && targetOwner instanceof Package && additionnalData instanceof PartBlockAdditionalData) { // test if it is a block
+						Classifier classifier = (Classifier) target;
 						EList<Property> allAttributes = classifier.getAllAttributes();
-						PartBlockAdditionalData partBlockAdditionalData = (PartBlockAdditionalData)additionnalData;
-						for(Property property : allAttributes) {
+						PartBlockAdditionalData partBlockAdditionalData = (PartBlockAdditionalData) additionnalData;
+						for (Property property : allAttributes) {
 							Association duplicatedAssociation = partBlockAdditionalData.getDuplicatedAssociationByPropertyName(property.getName());
-							if (duplicatedAssociation != null){
+							if (duplicatedAssociation != null) {
 								restoreAssociationPartContext(classifier, property, duplicatedAssociation);
-								listDuplicatedAssociation.add(duplicatedAssociation);								
+								listDuplicatedAssociation.add(duplicatedAssociation);
 							}
 						}
 						associationContainer = targetOwner;
 					}
-					if(associationContainer != null && !listDuplicatedAssociation.isEmpty()) {
-						// add associations to the nearest container	
+					if (associationContainer != null && !listDuplicatedAssociation.isEmpty()) {
+						// add associations to the nearest container
 						MoveRequest moveRequest = new MoveRequest(associationContainer, listDuplicatedAssociation);
 						IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetOwner);
-						if(provider != null) {
+						if (provider != null) {
 							ICommand editCommand = provider.getEditCommand(moveRequest);
 							GMFtoEMFCommandWrapper gmFtoEMFCommandWrapper = new GMFtoEMFCommandWrapper(editCommand);
 							compoundCommand.append(gmFtoEMFCommandWrapper);
 						}
 					}
 				}
-				// An empty command can't be executed 
-				if(compoundCommand.getCommandList().isEmpty()) {
+				// An empty command can't be executed
+				if (compoundCommand.getCommandList().isEmpty()) {
 					return null;
 				}
 				return compoundCommand;
@@ -210,10 +215,10 @@ public class PartPasteStrategy implements IPasteStrategy {
 	 */
 	@Override
 	public Command getGraphicalCommand(EditingDomain domain, org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart targetEditPart, PapyrusClipboard<Object> papyrusClipboard) {
-		View targetView = (View)targetEditPart.getModel();
-		EObject targetOwner = (EObject)targetView.getElement();
+		View targetView = (View) targetEditPart.getModel();
+		EObject targetOwner = targetView.getElement();
 		org.eclipse.emf.common.command.Command semanticCommand = getSemanticCommand(domain, targetOwner, papyrusClipboard);
-		if(semanticCommand != null) {
+		if (semanticCommand != null) {
 			org.eclipse.gef.commands.CompoundCommand compoundCommand = new org.eclipse.gef.commands.CompoundCommand("Association Part Semantic And Graphical paste"); //$NON-NLS-1$
 			EMFtoGEFCommandWrapper emFtoGEFCommandWrapper = new EMFtoGEFCommandWrapper(semanticCommand);
 			compoundCommand.add(emFtoGEFCommandWrapper);
@@ -241,22 +246,22 @@ public class PartPasteStrategy implements IPasteStrategy {
 	@Override
 	public void prepare(PapyrusClipboard<Object> papyrusClipboard, Collection<EObject> selection) {
 		Map<Object, IClipboardAdditionalData> mapCopyPartData = new HashMap<Object, IClipboardAdditionalData>();
-		for(Iterator<EObject> iterator = papyrusClipboard.iterateOnSource(); iterator.hasNext();) {
+		for (Iterator<EObject> iterator = papyrusClipboard.iterateOnSource(); iterator.hasNext();) {
 			EObject eObjectSource = iterator.next();
-			if(eObjectSource instanceof Element) {
-				Element elementSource = (Element)eObjectSource;
+			if (eObjectSource instanceof Element) {
+				Element elementSource = (Element) eObjectSource;
 				IClipboardAdditionalData clipboardAdditionalData = null;
-				if(elementSource instanceof Property && UMLUtil.getStereotypeApplication(elementSource.getOwner(), Block.class) != null) { // is part 
-					Property propertySource = (Property)elementSource;
+				if (elementSource instanceof Property && UMLUtil.getStereotypeApplication(elementSource.getOwner(), Block.class) != null) { // is part
+					Property propertySource = (Property) elementSource;
 					Association association = propertySource.getAssociation();
-					if (association != null){
+					if (association != null) {
 						clipboardAdditionalData = new PartAdditionalData(association);
 					}
-				} else if(elementSource instanceof Classifier && UMLUtil.getStereotypeApplication(elementSource, Block.class) != null) {// is Block
-					Classifier block = (Classifier)elementSource;
+				} else if (elementSource instanceof Classifier && UMLUtil.getStereotypeApplication(elementSource, Block.class) != null) {// is Block
+					Classifier block = (Classifier) elementSource;
 					clipboardAdditionalData = new PartBlockAdditionalData(block);
 				}
-				if(clipboardAdditionalData != null) {
+				if (clipboardAdditionalData != null) {
 					Object copy = papyrusClipboard.getCopyFromSource(eObjectSource);
 					mapCopyPartData.put(copy, clipboardAdditionalData);
 				}
@@ -269,6 +274,7 @@ public class PartPasteStrategy implements IPasteStrategy {
 
 	/**
 	 * Duplicate the association
+	 * 
 	 * @param association
 	 * @return
 	 */
@@ -276,18 +282,19 @@ public class PartPasteStrategy implements IPasteStrategy {
 		EcoreUtil.Copier copier = new EcoreUtil.Copier();
 		copier.copy(association);
 		EObject eObject = copier.get(association);
-		return (Association)eObject;
+		return (Association) eObject;
 	}
 
 	/**
 	 * Init the association in the new context
+	 * 
 	 * @param classifier
 	 * @param property
 	 * @param association
 	 */
 	protected void restoreAssociationPartContext(Classifier classifier, Property property, Association association) {
 		EList<Property> memberEnds = association.getMemberEnds(); // should have only one element
-		if (memberEnds != null && !memberEnds.isEmpty()){
+		if (memberEnds != null && !memberEnds.isEmpty()) {
 			Property blockProperty = memberEnds.get(0);
 			blockProperty.setType(classifier);
 		}
@@ -333,7 +340,7 @@ public class PartPasteStrategy implements IPasteStrategy {
 		public PartBlockAdditionalData(Classifier block) {
 			this.mapPropertyNameToAssociation = new HashMap<String, Association>();
 			EList<Property> allAttributes = block.getAllAttributes();
-			for(Property property : allAttributes) {
+			for (Property property : allAttributes) {
 				Association association = property.getAssociation();
 				Association newAssociation = duplicateAssociation(association);
 				mapPropertyNameToAssociation.put(property.getName(), newAssociation);
@@ -343,7 +350,7 @@ public class PartPasteStrategy implements IPasteStrategy {
 
 		/**
 		 * @param propertyName
-		 * @return  a copy of the association
+		 * @return a copy of the association
 		 */
 		public Association getDuplicatedAssociationByPropertyName(String propertyName) {
 			Association association = mapPropertyNameToAssociation.get(propertyName);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/ConstraintBlockHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/ConstraintBlockHelper.java
index b60d6ba58c9..bb21d0c7240 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/ConstraintBlockHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/ConstraintBlockHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,12 +26,12 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 public class ConstraintBlockHelper extends ElementHelper {
 
 	public static boolean couldBeConstraintParameter(EObject possibleContraintParameter, EObject ownerConstraintBlock) {
-		if (!(ownerConstraintBlock instanceof org.eclipse.uml2.uml.Class && UMLUtil.getStereotypeApplication((Element)ownerConstraintBlock, ConstraintBlock.class) != null)) {
+		if (!(ownerConstraintBlock instanceof org.eclipse.uml2.uml.Class && UMLUtil.getStereotypeApplication((Element) ownerConstraintBlock, ConstraintBlock.class) != null)) {
 			return false;
 		}
-		return UMLUtil.getStereotypeApplication((Element)possibleContraintParameter, ConstraintProperty.class) == null;
+		return UMLUtil.getStereotypeApplication((Element) possibleContraintParameter, ConstraintProperty.class) == null;
 	}
-	
+
 	public static boolean isConstraintParameter(Element element, View view) {
 		if (element instanceof Property) {
 			Property constraintProperty = (Property) element;
@@ -40,17 +40,17 @@ public class ConstraintBlockHelper extends ElementHelper {
 				// check for graphics : owned by a constraintProperty
 				if (view != null) {
 					View containerView = ViewUtil.getContainerView(view);
-					Element containerElement = (Element)containerView.getElement();
+					Element containerElement = (Element) containerView.getElement();
 					// Owned by a ConstraintProperty
-					if (containerElement instanceof Property 
-							&& UMLUtil.getStereotypeApplication(containerElement, ConstraintProperty.class) != null 
-							&& ((Property)containerElement).getType() == ownerConstraintBlock) { 
+					if (containerElement instanceof Property
+							&& UMLUtil.getStereotypeApplication(containerElement, ConstraintProperty.class) != null
+							&& ((Property) containerElement).getType() == ownerConstraintBlock) {
 						return true;
 					}
 					// Owned by a ConstraintBlock
-					if (containerElement instanceof org.eclipse.uml2.uml.Class 
-							&& UMLUtil.getStereotypeApplication(containerElement, ConstraintBlock.class) != null 
-							&& containerElement == ownerConstraintBlock) { 
+					if (containerElement instanceof org.eclipse.uml2.uml.Class
+							&& UMLUtil.getStereotypeApplication(containerElement, ConstraintBlock.class) != null
+							&& containerElement == ownerConstraintBlock) {
 						return true;
 					}
 				}
@@ -58,5 +58,5 @@ public class ConstraintBlockHelper extends ElementHelper {
 		}
 		return false;
 	}
-	
+
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLCreateOrShowExistingElementHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLCreateOrShowExistingElementHelper.java
index 4486341296e..40a2c7afc50 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLCreateOrShowExistingElementHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLCreateOrShowExistingElementHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -36,9 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage;
 

 /**

  * Show Existing Link Helper for SysML. This class provides specific management for SysML Association.

- * 

+ *

  * @author VL222926

- * 

+ *

  */

 public class SysMLCreateOrShowExistingElementHelper extends CreateOrShowExistingElementHelper {

 

@@ -48,18 +48,18 @@ public class SysMLCreateOrShowExistingElementHelper extends CreateOrShowExisting
 	private ConnectorUtils sysmlConnectorUtils = new ConnectorUtils();

 

 	/**

-	 * 

+	 *

 	 * Constructor.

-	 * 

+	 *

 	 */

 	public SysMLCreateOrShowExistingElementHelper() {

 		super();

 	}

 

 	/**

-	 * 

+	 *

 	 * Constructor.

-	 * 

+	 *

 	 * @param linkHelper

 	 */

 	public SysMLCreateOrShowExistingElementHelper(final ILinkMappingHelper linkHelper) {

@@ -67,7 +67,7 @@ public class SysMLCreateOrShowExistingElementHelper extends CreateOrShowExisting
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper#getIElementTypeNameToDisplay(org.eclipse.gmf.runtime.emf.type.core.IElementType)

 	 *

 	 * @param elementType

@@ -75,46 +75,45 @@ public class SysMLCreateOrShowExistingElementHelper extends CreateOrShowExisting
 	 */

 	@Override

 	protected String getIElementTypeNameToDisplay(final IElementType elementType) {

-		if(SysMLElementTypes.ASSOCIATION_NONE.equals(elementType) || SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.equals(elementType)) {

+		if (SysMLElementTypes.ASSOCIATION_NONE.equals(elementType) || SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.equals(elementType)) {

 			return "Association/DirectAssociation"; //$NON-NLS-1$

-		} else if(SysMLElementTypes.ASSOCIATION_COMPOSITE.equals(elementType) || SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.equals(elementType)) {

+		} else if (SysMLElementTypes.ASSOCIATION_COMPOSITE.equals(elementType) || SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.equals(elementType)) {

 			return "Composition/DirectComposition"; //$NON-NLS-1$

-		} else if(SysMLElementTypes.ASSOCIATION_SHARED.equals(elementType) || SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.equals(elementType)) {

+		} else if (SysMLElementTypes.ASSOCIATION_SHARED.equals(elementType) || SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.equals(elementType)) {

 			return "Aggregation/DirectAggregation"; //$NON-NLS-1$

 		}

 		return super.getIElementTypeNameToDisplay(elementType);

 	}

-	

+

 	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper#hasWantedType(org.eclipse.emf.ecore.EObject,

-	 *      org.eclipse.gmf.runtime.emf.type.core.IElementType)

-	 * 

+	 *

+	 * @see org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper#hasWantedType(org.eclipse.emf.ecore.EObject, org.eclipse.gmf.runtime.emf.type.core.IElementType)

+	 *

 	 * @param eobject

-	 *        an eobject

+	 *            an eobject

 	 * @param wantedType

-	 *        the wanted element type

+	 *            the wanted element type

 	 * @return

 	 *         true if the eobject is an instance of the wanted element type.

-	 * 

+	 *

 	 *         Add test for SysML Association

 	 */

 	@Override

 	protected boolean hasWantedType(final EObject eobject, final IElementType wantedType) {

 		boolean result = super.hasWantedType(eobject, wantedType);

-		if(result) {

-			if(eobject instanceof Association) {

-				final AggregationKind current = getAssociationAggregationKind((Association)eobject);

-				if(current == AggregationKind.NONE_LITERAL) {

-					if(SysMLElementTypes.ASSOCIATION_NONE.equals(current) || SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.equals(wantedType)) {

+		if (result) {

+			if (eobject instanceof Association) {

+				final AggregationKind current = getAssociationAggregationKind((Association) eobject);

+				if (current == AggregationKind.NONE_LITERAL) {

+					if (SysMLElementTypes.ASSOCIATION_NONE.equals(current) || SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.equals(wantedType)) {

 						result = true;

 					}

-				} else if(current == AggregationKind.COMPOSITE_LITERAL) {

-					if(SysMLElementTypes.ASSOCIATION_COMPOSITE.equals(current) || SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.equals(wantedType)) {

+				} else if (current == AggregationKind.COMPOSITE_LITERAL) {

+					if (SysMLElementTypes.ASSOCIATION_COMPOSITE.equals(current) || SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.equals(wantedType)) {

 						result = true;

 					}

-				} else if(current == AggregationKind.SHARED_LITERAL) {

-					if(SysMLElementTypes.ASSOCIATION_SHARED.equals(current) || SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.equals(wantedType)) {

+				} else if (current == AggregationKind.SHARED_LITERAL) {

+					if (SysMLElementTypes.ASSOCIATION_SHARED.equals(current) || SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.equals(wantedType)) {

 						result = true;

 					}

 				} else {

@@ -126,18 +125,18 @@ public class SysMLCreateOrShowExistingElementHelper extends CreateOrShowExisting
 	}

 

 	/**

-	 * 

+	 *

 	 * @param association

-	 *        an association

+	 *            an association

 	 * @return

 	 *         the association kind for the association

 	 */

 	private static final AggregationKind getAssociationAggregationKind(final Association association) {

 		final Property source = association.getMemberEnds().get(0);

 		final Property target = association.getMemberEnds().get(1);

-		if(source.getAggregation() == AggregationKind.NONE_LITERAL && target.getAggregation() == AggregationKind.NONE_LITERAL) {

+		if (source.getAggregation() == AggregationKind.NONE_LITERAL && target.getAggregation() == AggregationKind.NONE_LITERAL) {

 			return AggregationKind.NONE_LITERAL;

-		} else if((source.getAggregation() == AggregationKind.COMPOSITE_LITERAL) || (target.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {

+		} else if ((source.getAggregation() == AggregationKind.COMPOSITE_LITERAL) || (target.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {

 			return AggregationKind.COMPOSITE_LITERAL;

 		} else {

 			return AggregationKind.SHARED_LITERAL;

@@ -147,25 +146,26 @@ public class SysMLCreateOrShowExistingElementHelper extends CreateOrShowExisting
 

 	/**

 	 * @param request

-	 *        the request for the creation

+	 *            the request for the creation

 	 * @param wantedEClass

 	 * @return

 	 *         a list of {@link EdgeEndsMapper} referencing the existing links between the source and the target

 	 */

+	@Override

 	protected List<EdgeEndsMapper> getExistingLinksBetweenSourceAndTarget(final CreateRelationshipRequest request, final IElementType wantedElementType) {

-		if(wantedElementType.getEClass() == UMLPackage.eINSTANCE.getConnector()) {

+		if (wantedElementType.getEClass() == UMLPackage.eINSTANCE.getConnector()) {

 			final List<EdgeEndsMapper> existingElement = new ArrayList<EdgeEndsMapper>();

-			for(final Element current : ((Element)request.getContainer()).getOwnedElements()) {

-				if(hasWantedType(current, wantedElementType)) {

+			for (final Element current : ((Element) request.getContainer()).getOwnedElements()) {

+				if (hasWantedType(current, wantedElementType)) {

 					final Collection<?> sources = this.linkMappingHelper.getSource(current);

 					final Collection<?> targets = this.linkMappingHelper.getTarget(current);

 

-					if(sources.contains(request.getSource()) && targets.contains(request.getTarget())) {

-						//we verify the nestedPath before to propose to restore a connector

-						View sourceView = (View)request.getParameter(RequestParameterConstants.EDGE_CREATE_REQUEST_SOURCE_VIEW);

-						View targetView = (View)request.getParameter(RequestParameterConstants.EDGE_CREATE_REQUEST_TARGET_VIEW);

-						boolean canBeDisplayed = this.sysmlConnectorUtils.canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths((Connector)current, sourceView, targetView);

-						if(canBeDisplayed) {

+					if (sources.contains(request.getSource()) && targets.contains(request.getTarget())) {

+						// we verify the nestedPath before to propose to restore a connector

+						View sourceView = (View) request.getParameter(RequestParameterConstants.EDGE_CREATE_REQUEST_SOURCE_VIEW);

+						View targetView = (View) request.getParameter(RequestParameterConstants.EDGE_CREATE_REQUEST_TARGET_VIEW);

+						boolean canBeDisplayed = ConnectorUtils.canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths((Connector) current, sourceView, targetView);

+						if (canBeDisplayed) {

 							existingElement.add(new EdgeEndsMapper(current, sources, null, null));

 						}

 					}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java
index 93e96ee7244..3a514c70f76 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java
@@ -28,7 +28,7 @@ import org.eclipse.uml2.uml.Package;
  * This class is used in order to create test for deciding whether a diagram creation command should be visible or not.
  * This property tester assumes that currently active editor is Papyrus, it should be used with care (simultaneously with a test to ensure Papyrus is
  * currently opened and active).
- * 
+ *
  */
 public class SysMLSelectionTester extends PropertyTester {
 
@@ -46,17 +46,18 @@ public class SysMLSelectionTester extends PropertyTester {
 	}
 
 	/** Test the receiver against the selected property */
+	@Override
 	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
 
 		// Ensure Papyrus is the active editor
 		Object currentValue = null;
-		if(IS_SYSML_MODEL.equals(property)) {
+		if (IS_SYSML_MODEL.equals(property)) {
 			currentValue = testSysMLModelNature(receiver);
 			return (currentValue == expectedValue);
-		} else if(IS_SYSML_BLOCKS_MODEL.equals(property)) {
+		} else if (IS_SYSML_BLOCKS_MODEL.equals(property)) {
 			currentValue = testSysMLBlocksModelNature(receiver);
 			return (currentValue == expectedValue);
-		} else if(IS_SYSML_REQUIREMENTS_MODEL.equals(property)) {
+		} else if (IS_SYSML_REQUIREMENTS_MODEL.equals(property)) {
 			currentValue = testSysMLRequirementsModelNature(receiver);
 			return (currentValue == expectedValue);
 		}
@@ -69,16 +70,16 @@ public class SysMLSelectionTester extends PropertyTester {
 		boolean isSysMLModel = false;
 
 		EObject root = getRoot(receiver);
-		if(root instanceof Package) {
+		if (root instanceof Package) {
 
-			return (((Package)root).getAppliedProfile("SysML") != null);
+			return (((Package) root).getAppliedProfile("SysML") != null);
 
-			//FIX: UMLUtil.getProfile() loads the profile into the resource set. This is not desired.
+			// FIX: UMLUtil.getProfile() loads the profile into the resource set. This is not desired.
 			//
-			//			Profile sysml = UMLUtil.getProfile(SysmlPackage.eINSTANCE, root);
-			//			if(((Package)root).isProfileApplied(sysml)) {
-			//				isSysMLModel = true;
-			//			}
+			// Profile sysml = UMLUtil.getProfile(SysmlPackage.eINSTANCE, root);
+			// if(((Package)root).isProfileApplied(sysml)) {
+			// isSysMLModel = true;
+			// }
 		}
 
 		return isSysMLModel;
@@ -89,14 +90,14 @@ public class SysMLSelectionTester extends PropertyTester {
 		boolean isSysMLModel = false;
 
 		EObject root = getRoot(receiver);
-		if(root instanceof Package) {
-			return (((Package)root).getAppliedProfile("SysML::Requirements") != null);
-
-			//FIX: UMLUtil.getProfile() loads the profile into the resource set. This is not desired.
-			//			Profile sysml = UMLUtil.getProfile(RequirementsPackage.eINSTANCE, root);
-			//			if(((Package)root).isProfileApplied(sysml)) {
-			//				isSysMLModel = true;
-			//			}
+		if (root instanceof Package) {
+			return (((Package) root).getAppliedProfile("SysML::Requirements") != null);
+
+			// FIX: UMLUtil.getProfile() loads the profile into the resource set. This is not desired.
+			// Profile sysml = UMLUtil.getProfile(RequirementsPackage.eINSTANCE, root);
+			// if(((Package)root).isProfileApplied(sysml)) {
+			// isSysMLModel = true;
+			// }
 		}
 
 		return isSysMLModel;
@@ -107,13 +108,13 @@ public class SysMLSelectionTester extends PropertyTester {
 		boolean isSysMLModel = false;
 
 		EObject root = getRoot(receiver);
-		if(root instanceof Package) {
-			return (((Package)root).getAppliedProfile("SysML::Blocks") != null);
-			//FIX: UMLUtil.getProfile() loads the profile into the resource set. This is not desired.
-			//			Profile sysml = UMLUtil.getProfile(BlocksPackage.eINSTANCE, root);
-			//			if(((Package)root).isProfileApplied(sysml)) {
-			//				isSysMLModel = true;
-			//			}
+		if (root instanceof Package) {
+			return (((Package) root).getAppliedProfile("SysML::Blocks") != null);
+			// FIX: UMLUtil.getProfile() loads the profile into the resource set. This is not desired.
+			// Profile sysml = UMLUtil.getProfile(BlocksPackage.eINSTANCE, root);
+			// if(((Package)root).isProfileApplied(sysml)) {
+			// isSysMLModel = true;
+			// }
 		}
 
 		return isSysMLModel;
@@ -123,20 +124,20 @@ public class SysMLSelectionTester extends PropertyTester {
 	private EObject getRoot(Object receiver) {
 		EObject root = null;
 
-		if(receiver instanceof ISelection) {
-			ISelection selection = (ISelection)receiver;
-			if(selection.isEmpty()) {
+		if (receiver instanceof ISelection) {
+			ISelection selection = (ISelection) receiver;
+			if (selection.isEmpty()) {
 				return null;
 			}
 
 			try {
 				ServiceUtilsForSelection serviceUtils = ServiceUtilsForSelection.getInstance();
-				UmlModel openedModel = (UmlModel)serviceUtils.getModelSet(selection).getModel(UmlModel.MODEL_ID);
-				if(openedModel != null) {
+				UmlModel openedModel = (UmlModel) serviceUtils.getModelSet(selection).getModel(UmlModel.MODEL_ID);
+				if (openedModel != null) {
 					root = openedModel.lookupRoot();
 				}
 			} catch (ServiceException e) {
-				//Ignored: The selection cannot be used to retrieve the ServicesRegistry
+				// Ignored: The selection cannot be used to retrieve the ServicesRegistry
 			} catch (NotFoundException e) {
 				Activator.log.error(e);
 			}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/Activator.java
index 903b83174f8..1d7864d20af 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/Activator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/Activator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,6 +45,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -65,6 +66,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
@@ -72,7 +74,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getInstance() {
@@ -81,10 +83,10 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 * 
+	 *
 	 * @generated
 	 * @param path
-	 *        the path
+	 *            the path
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getBundledImageDescriptor(String path) {
@@ -92,9 +94,9 @@ public class Activator extends AbstractUIPlugin {
 	}
 
 	/**
-	 * 
+	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 * 
+	 *
 	 * @return Shared Preference Store.
 	 */
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
index c19ef904233..8be7fcb7812 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
@@ -35,10 +35,11 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
  * Represents the creation command for a SysML internal block diagram
+ * 
  * @author Laurent Wouters
  */
 public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -75,7 +76,7 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
 		Block block = UMLUtil.getStereotypeApplication(cOwner, Block.class);
 
 		if (block != null) {
-			canvasDomainElement = (EObject) element;
+			canvasDomainElement = element;
 			Package owningPackage = ((Element) element).getNearestPackage();
 			diagram = super.doCreateDiagram(diagramResource, owner, owningPackage, prototype, name);
 		}
@@ -103,9 +104,9 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
 	 */
 	@Override
 	protected void initializeDiagram(EObject diagram) {
-		if(diagram instanceof Diagram) {
-			Diagram currentDiagram = (Diagram)diagram;
-			if(canvasDomainElement != null) {
+		if (diagram instanceof Diagram) {
+			Diagram currentDiagram = (Diagram) diagram;
+			if (canvasDomainElement != null) {
 				currentDiagram.setElement(canvasDomainElement);
 				initializeDiagramContent(currentDiagram);
 			}
@@ -114,19 +115,19 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
 
 	/**
 	 * Initialize the diagram with the canvas domain element shown.
-	 * 
+	 *
 	 * @param diagram
-	 *        the diagram to initialize
+	 *            the diagram to initialize
 	 */
 	protected void initializeDiagramContent(Diagram diagram) {
 
 		// Create a view for the canvasDomainElement in the new diagram
 		View view =
-			ViewService.getInstance().createNode(new SemanticAdapter(canvasDomainElement, null), diagram, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+				ViewService.getInstance().createNode(new SemanticAdapter(canvasDomainElement, null), diagram, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
 		view.setElement(diagram.getElement());
 
 		// Update the view position and size (should adapt to canvas current size)
-		Bounds viewBounds = (Bounds)((Node)view).getLayoutConstraint();
+		Bounds viewBounds = (Bounds) ((Node) view).getLayoutConstraint();
 		viewBounds.setX(DEFAULT_MARGIN);
 		viewBounds.setY(DEFAULT_MARGIN);
 		viewBounds.setHeight(DEFAULT_HEIGHT);
@@ -135,12 +136,12 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
 
 	/**
 	 * {@inheritDoc}
-	 * 
+	 *
 	 * @generated NOT
 	 */
 	@Override
 	public boolean isParentReassignable() {
-		// Bug 374626: [Model Explorer] Moving an IBD from a block to another block shall be forbidden 
+		// Bug 374626: [Model Explorer] Moving an IBD from a block to another block shall be forbidden
 		return false;
 	}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java
index 9e7be491718..3aa198a1b72 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramForMultiEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramForMultiEditor.java
index ad4eccd907e..8155867ca48 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramForMultiEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramForMultiEditor.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *	 CEA LIST - Initial API and implementation
  *   Christian W. Damus (CEA) - bug 392301
  *
@@ -33,7 +33,7 @@ import org.eclipse.ui.PartInitException;
 
 /**
  * An editor to be used in multitabs editor. This editor extends the original UML Diagram.
- * 
+ *
  */
 public class InternalBlockDiagramForMultiEditor extends InternalBlockDiagramEditor {
 
@@ -49,16 +49,16 @@ public class InternalBlockDiagramForMultiEditor extends InternalBlockDiagramEdit
 
 	/** The editor splitter. */
 	private Composite splitter;
-	
+
 	private Image titleImage;
 
 	/**
 	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
 	 * ServiceRegistry.
-	 * 
+	 *
 	 * @throws BackboneException
 	 * @throws ServiceException
-	 * 
+	 *
 	 */
 	public InternalBlockDiagramForMultiEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws BackboneException, ServiceException {
 		super(servicesRegistry, diagram);
@@ -77,11 +77,11 @@ public class InternalBlockDiagramForMultiEditor extends InternalBlockDiagramEdit
 
 	@Override
 	public void dispose() {
-		if(titleImage != null) {
+		if (titleImage != null) {
 			titleImage.dispose();
 			titleImage = null;
 		}
-		
+
 		super.dispose();
 	}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/part/InternalBlockDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/part/InternalBlockDiagramEditPart.java
index 1c84ee39210..8a06cefecc5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/part/InternalBlockDiagramEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/part/InternalBlockDiagramEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -32,6 +32,7 @@ public class InternalBlockDiagramEditPart extends DiagramEditPart {
 		super(view);
 	}
 
+	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DiagramSemanticEditPolicy());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/DiagramSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/DiagramSemanticEditPolicy.java
index b8e2ad23734..afaf98aa3d0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/DiagramSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/DiagramSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java
index 9888b1a3e34..66aeb39f5cc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -31,7 +31,7 @@ public class InternalBlockDiagramDragDropEditPolicy extends CustomDiagramDragDro
 	@Override
 	public int getNodeVisualID(View containerView, EObject domainElement) {
 		String domainType = registry.getNodeGraphicalType(domainElement, containerView.getType());
-		if(IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
+		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
 			return -1; // undefined
 		}
 		return new Integer(domainType);
@@ -43,7 +43,7 @@ public class InternalBlockDiagramDragDropEditPolicy extends CustomDiagramDragDro
 	@Override
 	public int getLinkWithClassVisualID(EObject domainElement) {
 		String domainType = registry.getEdgeGraphicalType(domainElement);
-		if(IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
+		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
 			return -1; // undefined
 		}
 		return new Integer(domainType);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
index 8c1773bb779..baa79966e65 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -31,51 +31,52 @@ public class DiagramPaletteFactory extends PaletteFactory.Adapter {
 	private static HashMap<String, IElementType[]> nodesToolIdTypesMap = new HashMap<String, IElementType[]>() {
 
 		{
-			put("internalblock.tool.blockcomposite", new IElementType[]{ SysMLElementTypes.BLOCK });
-			put("internalblock.tool.blockpropertycomposite", new IElementType[]{ SysMLElementTypes.PART_PROPERTY, SysMLElementTypes.REFERENCE_PROPERTY, SysMLElementTypes.ACTOR_PART_PROPERTY,
-				SysMLElementTypes.VALUE_PROPERTY, UMLElementTypes.PROPERTY });
-			put("internalblock.tool.flowport", new IElementType[]{ SysMLElementTypes.FLOW_PORT });
-			put("internalblock.tool.port", new IElementType[]{ UMLElementTypes.PORT });
-			//Start of user code Custom nodes
-			put("internalblock.tool.part", new IElementType[]{ SysMLElementTypes.PART_PROPERTY });
-			put("internalblock.tool.reference", new IElementType[]{ SysMLElementTypes.REFERENCE_PROPERTY });
-			put("internalblock.tool.actorpart", new IElementType[]{ SysMLElementTypes.ACTOR_PART_PROPERTY });
-			put("internalblock.tool.value", new IElementType[]{ SysMLElementTypes.VALUE_PROPERTY });
-			put("internalblock.tool.property", new IElementType[]{ UMLElementTypes.PROPERTY });
+			put("internalblock.tool.blockcomposite", new IElementType[] { SysMLElementTypes.BLOCK });
+			put("internalblock.tool.blockpropertycomposite", new IElementType[] { SysMLElementTypes.PART_PROPERTY, SysMLElementTypes.REFERENCE_PROPERTY, SysMLElementTypes.ACTOR_PART_PROPERTY,
+					SysMLElementTypes.VALUE_PROPERTY, UMLElementTypes.PROPERTY });
+			put("internalblock.tool.flowport", new IElementType[] { SysMLElementTypes.FLOW_PORT });
+			put("internalblock.tool.port", new IElementType[] { UMLElementTypes.PORT });
+			// Start of user code Custom nodes
+			put("internalblock.tool.part", new IElementType[] { SysMLElementTypes.PART_PROPERTY });
+			put("internalblock.tool.reference", new IElementType[] { SysMLElementTypes.REFERENCE_PROPERTY });
+			put("internalblock.tool.actorpart", new IElementType[] { SysMLElementTypes.ACTOR_PART_PROPERTY });
+			put("internalblock.tool.value", new IElementType[] { SysMLElementTypes.VALUE_PROPERTY });
+			put("internalblock.tool.property", new IElementType[] { UMLElementTypes.PROPERTY });
 
-			put("internalblock.tool.flowport_na", new IElementType[]{ SysMLElementTypes.FLOW_PORT_NA });
-			put("internalblock.tool.flowport_in", new IElementType[]{ SysMLElementTypes.FLOW_PORT_IN });
-			put("internalblock.tool.flowport_out", new IElementType[]{ SysMLElementTypes.FLOW_PORT_OUT });
-			put("internalblock.tool.flowport_inout", new IElementType[]{ SysMLElementTypes.FLOW_PORT_IN_OUT });
+			put("internalblock.tool.flowport_na", new IElementType[] { SysMLElementTypes.FLOW_PORT_NA });
+			put("internalblock.tool.flowport_in", new IElementType[] { SysMLElementTypes.FLOW_PORT_IN });
+			put("internalblock.tool.flowport_out", new IElementType[] { SysMLElementTypes.FLOW_PORT_OUT });
+			put("internalblock.tool.flowport_inout", new IElementType[] { SysMLElementTypes.FLOW_PORT_IN_OUT });
 
-			put("internalblock.tool.constraint", new IElementType[]{ UMLElementTypes.CONSTRAINT });
-			put("internalblock.tool.comment", new IElementType[]{ UMLElementTypes.COMMENT });
-			//End of user code
+			put("internalblock.tool.constraint", new IElementType[] { UMLElementTypes.CONSTRAINT });
+			put("internalblock.tool.comment", new IElementType[] { UMLElementTypes.COMMENT });
+			// End of user code
 		}
 	};
 
 	private static HashMap<String, IElementType[]> edgesToolIdTypesMap = new HashMap<String, IElementType[]>() {
 
 		{
-			put("internalblock.tool.connector", new IElementType[]{ UMLElementTypes.CONNECTOR });
-			put("internalblock.tool.dependency", new IElementType[]{ UMLElementTypes.DEPENDENCY });
-			//Start of user code Custom edges
-			put("internalblock.tool.comment_constraint_link", new IElementType[]{ ElementTypes.COMMENT_ANNOTATED_ELEMENT, ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT });
-			//End of user code
+			put("internalblock.tool.connector", new IElementType[] { UMLElementTypes.CONNECTOR });
+			put("internalblock.tool.dependency", new IElementType[] { UMLElementTypes.DEPENDENCY });
+			// Start of user code Custom edges
+			put("internalblock.tool.comment_constraint_link", new IElementType[] { ElementTypes.COMMENT_ANNOTATED_ELEMENT, ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT });
+			// End of user code
 		}
 	};
 
+	@Override
 	public Tool createTool(String toolId) {
 
 		IElementType[] types;
 
 		types = nodesToolIdTypesMap.get(toolId);
-		if(types != null) {
+		if (types != null) {
 			return new AspectUnspecifiedTypeCreationTool(Arrays.asList(types));
 		}
 
 		types = edgesToolIdTypesMap.get(toolId);
-		if(types != null) {
+		if (types != null) {
 			return new AspectUnspecifiedTypeConnectionTool(Arrays.asList(types));
 		}
 		return null;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java
index a9703681dda..120a1c00a5a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
index b2937e7c59d..353b599257d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -129,8 +129,8 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	protected void verifyDiagramCompatibilityVersion(Diagram diagram) {
 		IDiagramVersionUpdater updater = new DiagramVersionUpdater();
 
-		String currentVersion = DiagramVersioningUtils.getCompatibilityVersion(diagram);
-		if(!InternalBlockDiagramViewFactory.INTERNAL_VERSION.equals(currentVersion)) {
+		String currentVersion = org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils.getCompatibilityVersion(diagram);
+		if (!InternalBlockDiagramViewFactory.INTERNAL_VERSION.equals(currentVersion)) {
 			updater.update(diagram, currentVersion, InternalBlockDiagramViewFactory.INTERNAL_VERSION);
 		}
 	}
@@ -141,7 +141,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	@Override
 	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
 		PaletteRoot paletteRoot;
-		if(existingPaletteRoot == null) {
+		if (existingPaletteRoot == null) {
 			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());
 		} else {
 			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());
@@ -154,6 +154,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	protected PreferencesHint getPreferencesHint() {
 		return Activator.DIAGRAM_PREFERENCES_HINT;
 	}
@@ -161,6 +162,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	public String getContributorId() {
 		return Activator.PLUGIN_ID;
 	}
@@ -168,6 +170,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
 		return documentProvider;
 	}
@@ -175,6 +178,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	public TransactionalEditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -182,6 +186,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	protected final void setDocumentProvider(IEditorInput input) {
 		// Already set in the constructor
 	}
@@ -196,6 +201,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	public boolean isSaveAsAllowed() {
 		return true;
 	}
@@ -203,6 +209,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	public void doSaveAs() {
 		performSaveAs(new NullProgressMonitor());
 	}
@@ -210,6 +217,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	protected void performSaveAs(IProgressMonitor progressMonitor) {
 		// Nothing
 	}
@@ -217,6 +225,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	public ShowInContext getShowInContext() {
 		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
 	}
@@ -224,12 +233,13 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	protected void configureGraphicalViewer() {
 		super.configureGraphicalViewer();
 
 		// Replace diagram contextual menu removing default
 		// delete from model action.
-		DiagramContextMenuProvider provider = (DiagramContextMenuProvider)getDiagramGraphicalViewer().getContextMenu();
+		DiagramContextMenuProvider provider = (DiagramContextMenuProvider) getDiagramGraphicalViewer().getContextMenu();
 		Set<String> menuExclusions = provider.getExclusionSet();
 		menuExclusions.add(ActionIds.ACTION_DELETE_FROM_MODEL);
 		provider.setExclusionSet(menuExclusions);
@@ -238,6 +248,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	protected TransactionalEditingDomain createEditingDomain() {
 		// Already configured
 		return editingDomain;
@@ -246,6 +257,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	protected void configureDiagramEditDomain() {
 		super.configureDiagramEditDomain();
 		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
@@ -259,6 +271,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	public void doSave(IProgressMonitor progressMonitor) {
 		// The saving of the resource is done by the CoreMultiDiagramEditor
 		getDirtyState().saved();
@@ -268,7 +281,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	 * @generated
 	 */
 	protected OperationHistoryDirtyState getDirtyState() {
-		if(dirtyState == null) {
+		if (dirtyState == null) {
 			dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory());
 		}
 		return dirtyState;
@@ -279,17 +292,18 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	 */
 	@Override
 	protected void setUndoContext(IUndoContext context) {
-		if(dirtyState != null) {
+		if (dirtyState != null) {
 			dirtyState.dispose();
 			dirtyState = null;
 		}
-		
+
 		super.setUndoContext(context);
 	}
-	
+
 	/**
 	 * @generated
 	 */
+	@Override
 	public boolean isDirty() {
 		return getDirtyState().isDirty();
 	}
@@ -299,7 +313,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	 */
 	public void providerChanged(ProviderChangeEvent event) {
 		// update the palette if the palette service has changed
-		if(PapyrusPaletteService.getInstance().equals(event.getSource())) {
+		if (PapyrusPaletteService.getInstance().equals(event.getSource())) {
 			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, getDefaultPaletteContent());
 		}
 	}
@@ -307,16 +321,17 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		// remove palette service listener
 		// remove preference listener
 		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
 
-		if(dirtyState != null) {
+		if (dirtyState != null) {
 			dirtyState.dispose();
 			dirtyState = null;
 		}
-		
+
 		super.dispose();
 	}
 
@@ -330,6 +345,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	protected PaletteViewer constructPaletteViewer() {
 		return new PapyrusPaletteViewer();
 	}
@@ -337,6 +353,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	/**
 	 * @generated
 	 */
+	@Override
 	protected PaletteViewerProvider createPaletteViewerProvider() {
 		getEditDomain().setPaletteRoot(createPaletteRoot(null));
 		return new PaletteViewerProvider(getEditDomain()) {
@@ -348,6 +365,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 			 * with a defaultTool that is the SelectToolEx that undestands how to handle the enter
 			 * key which will result in the creation of the shape also.
 			 */
+			@Override
 			protected void configurePaletteViewer(PaletteViewer viewer) {
 				super.configurePaletteViewer(viewer);
 
@@ -365,6 +383,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 				viewer.setCustomizer(createPaletteCustomizer());
 			}
 
+			@Override
 			public PaletteViewer createPaletteViewer(Composite parent) {
 				PaletteViewer pViewer = constructPaletteViewer();
 				pViewer.createControl(parent);
@@ -378,7 +397,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 			 */
 			private KeyHandler getPaletteKeyHandler() {
 
-				if(paletteKeyHandler == null) {
+				if (paletteKeyHandler == null) {
 
 					paletteKeyHandler = new KeyHandler() {
 
@@ -387,18 +406,19 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 						 * whenever a key is released, and the Tool is in the proper state. Override
 						 * to support pressing the enter key to create a shape or connection
 						 * (between two selected shapes)
-						 * 
+						 *
 						 * @param event
-						 *        the KeyEvent
+						 *            the KeyEvent
 						 * @return <code>true</code> if KeyEvent was handled in some way
 						 */
+						@Override
 						public boolean keyReleased(KeyEvent event) {
 
-							if(event.keyCode == SWT.Selection) {
+							if (event.keyCode == SWT.Selection) {
 
 								Tool tool = getPaletteViewer().getActiveTool().createTool();
 
-								if(toolSupportsAccessibility(tool)) {
+								if (toolSupportsAccessibility(tool)) {
 
 									tool.keyUp(event, getDiagramGraphicalViewer());
 
@@ -423,7 +443,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 			 */
 			private MouseListener getPaletteMouseListener() {
 
-				if(paletteMouseListener == null) {
+				if (paletteMouseListener == null) {
 
 					paletteMouseListener = new MouseListener() {
 
@@ -436,13 +456,13 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 						/**
 						 * Override to support double-clicking a palette tool entry to create a
 						 * shape or connection (between two selected shapes).
-						 * 
+						 *
 						 * @see MouseListener#mouseDoubleClick(MouseEvent)
 						 */
 						public void mouseDoubleClick(MouseEvent e) {
 							Tool tool = getPaletteViewer().getActiveTool().createTool();
 
-							if(toolSupportsAccessibility(tool)) {
+							if (toolSupportsAccessibility(tool)) {
 
 								tool.setViewer(getDiagramGraphicalViewer());
 								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());
@@ -463,7 +483,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 						public void mouseUp(MouseEvent e) {
 							// Deactivate current active tool here if a
 							// double-click was handled.
-							if(clearActiveTool) {
+							if (clearActiveTool) {
 								getPaletteViewer().setActiveTool(null);
 								clearActiveTool = false;
 							}
@@ -514,10 +534,10 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 	 */
 	@Override
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if(getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
-			IMultiDiagramEditor editor = (IMultiDiagramEditor)getSite().getPage().getActiveEditor();
+		if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
+			IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();
 			// If not the active editor, ignore selection changed.
-			if(this.equals(editor.getActiveEditor())) {
+			if (this.equals(editor.getActiveEditor())) {
 				updateActions(getSelectionActions());
 				super.selectionChanged(part, selection);
 			} else {
@@ -529,7 +549,7 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
 		// from
 		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,
 		// ISelection)
-		if(part == this) {
+		if (part == this) {
 			rebuildStatusLine();
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
index fe4fb96ef90..007b7281324 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,7 +36,7 @@ public class BlockCompositePreferencePage extends InternalBlockDiagramNodePrefer
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
@@ -64,13 +64,13 @@ public class BlockCompositePreferencePage extends InternalBlockDiagramNodePrefer
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -81,7 +81,7 @@ public class BlockCompositePreferencePage extends InternalBlockDiagramNodePrefer
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -91,7 +91,7 @@ public class BlockCompositePreferencePage extends InternalBlockDiagramNodePrefer
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java
index 503f11a0a16..5a5c23309ca 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -29,9 +29,9 @@ public class CommentAnnotatedElementPreferencePage extends InternalBlockDiagramL
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java
index 2bcc6d949e7..c5d7285000f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -29,9 +29,9 @@ public class CommentPreferencePage extends InternalBlockDiagramNodePreferencePag
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java
index bcad61f171a..ad326f4f3ee 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -29,9 +29,9 @@ public class ConstraintConstrainedElementPreferencePage extends InternalBlockDia
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java
index 8df60a963cf..9bc68477487 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -29,9 +29,9 @@ public class ConstraintPreferencePage extends InternalBlockDiagramNodePreference
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java
index b5b625b5ab9..bb8f08b1c60 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -30,7 +30,7 @@ public class DependencyPreferencePage extends InternalBlockDiagramLinkPreference
 
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations		
+		// Start of user code custom default initializations
 		// End of user code
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java
index 78ef9927b17..45c53e95ea5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramLinkPreferencePage.java
index 827abf0c4e6..855d84a24e1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramLinkPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramLinkPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -43,7 +43,7 @@ public class InternalBlockDiagramLinkPreferencePage extends AbstractPapyrusLinkP
 		super.createPageContents(parent);
 
 		// Add label visibility group
-		if(!labelsList.isEmpty()) {
+		if (!labelsList.isEmpty()) {
 			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
 			addAbstractGroup(compartmentGroup);
 		}
@@ -60,7 +60,7 @@ public class InternalBlockDiagramLinkPreferencePage extends AbstractPapyrusLinkP
 
 	/** Initialize the list containing names of labels. */
 	protected void initializeLabelsList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramNodePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramNodePreferencePage.java
index 7e443612ba9..3f75ef71c9b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramNodePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramNodePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -58,13 +58,13 @@ public class InternalBlockDiagramNodePreferencePage extends AbstractPapyrusNodeP
 		super.createPageContents(parent);
 
 		// Add compartments visibility group
-		if(!compartmentNamesList.isEmpty()) {
+		if (!compartmentNamesList.isEmpty()) {
 			OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());
 			addAbstractGroup(compartmentGroup);
 		}
 
 		// Add label visibility group
-		if(!labelsList.isEmpty()) {
+		if (!labelsList.isEmpty()) {
 			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
 			addAbstractGroup(compartmentGroup);
 		}
@@ -80,17 +80,17 @@ public class InternalBlockDiagramNodePreferencePage extends AbstractPapyrusNodeP
 
 	/** Initialize the list containing names of labels. */
 	protected void initializeLabelsList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/** Initialize the list containing the names of compartments. */
 	protected void initializeCompartmentNamesList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/** Initialize the list containing the names of compartment that have titles. */
 	protected void initializeCompartmentTitlesList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramPreferenceInitializer.java
index 989e78e7192..ba447cfd8d1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramPreferenceInitializer.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPartProvider.java
index 0cce2942e04..d21af3c65b4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPartProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -88,19 +88,19 @@ public class CustomEditPartProvider extends CustomAbstractEditPartProvider {
 	 */
 	@Override
 	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View newView = ((IEditPartOperation)operation).getView();
-			if(newView == null) {
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View newView = ((IEditPartOperation) operation).getView();
+			if (newView == null) {
 				return false;
 			}
 
 			String graphicalType = newView.getType();
 
-			if((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
+			if ((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
 				return false;
 			}
 
-			if((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
+			if ((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
 				return false;
 			}
 		}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java
index 69bae7b4d94..4333a8fa8cd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -56,82 +56,82 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 	 */
 	@Override
 	public String getNodeGraphicalType(EObject domainElement, String containerType) {
-		// Start of user code getNodeGraphicalType(EObject domainElement, String containerType)	
-		if(((ISpecializationType)SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)
-			|| ((ISpecializationType)SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)
-			|| ((ISpecializationType)SysMLElementTypes.ACTOR_PART_PROPERTY).getMatcher().matches(domainElement)
-			|| ((ISpecializationType)SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)
-			|| ((domainElement instanceof org.eclipse.uml2.uml.Property) && !(domainElement instanceof org.eclipse.uml2.uml.Port))) {
+		// Start of user code getNodeGraphicalType(EObject domainElement, String containerType)
+		if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)
+				|| ((ISpecializationType) SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)
+				|| ((ISpecializationType) SysMLElementTypes.ACTOR_PART_PROPERTY).getMatcher().matches(domainElement)
+				|| ((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)
+				|| ((domainElement instanceof org.eclipse.uml2.uml.Property) && !(domainElement instanceof org.eclipse.uml2.uml.Port))) {
 
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
-			
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
-			
+
 			return UNDEFINED_TYPE;
 		}
 
-		if(((ISpecializationType)SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)
-			|| ((ISpecializationType)SysMLElementTypes.FLOW_PORT_IN).getMatcher().matches(domainElement)
-			|| ((ISpecializationType)SysMLElementTypes.FLOW_PORT_OUT).getMatcher().matches(domainElement)
-			|| ((ISpecializationType)SysMLElementTypes.FLOW_PORT_IN_OUT).getMatcher().matches(domainElement)
-			|| ((ISpecializationType)SysMLElementTypes.FLOW_PORT_NA).getMatcher().matches(domainElement)) {
+		if (((ISpecializationType) SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)
+				|| ((ISpecializationType) SysMLElementTypes.FLOW_PORT_IN).getMatcher().matches(domainElement)
+				|| ((ISpecializationType) SysMLElementTypes.FLOW_PORT_OUT).getMatcher().matches(domainElement)
+				|| ((ISpecializationType) SysMLElementTypes.FLOW_PORT_IN_OUT).getMatcher().matches(domainElement)
+				|| ((ISpecializationType) SysMLElementTypes.FLOW_PORT_NA).getMatcher().matches(domainElement)) {
 
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
 			/*
-			if(SysMLGraphicalTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			*/
+			 * if(SysMLGraphicalTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
+			 * return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
+			 * }
+			 */
 			return UNDEFINED_TYPE;
 		}
 		// End of user code
 
-		if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)) {
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
 			/*
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			*/
+			 * if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+			 * return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
+			 * }
+			 */
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)) {
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
+		if (((ISpecializationType) SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.PORT.getEClass().isInstance(domainElement)) {
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
+		if (UMLElementTypes.PORT.getEClass().isInstance(domainElement)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
 			}
 			return UNDEFINED_TYPE;
@@ -142,34 +142,35 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getNodeGraphicalType(String proposedType, String containerType) {
 		// Start of user code getNodeGraphicalType(String proposedType, String containerType)
-		if(SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)
-			|| SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)
-			|| SysMLElementTypes.ACTOR_PART_PROPERTY.getSemanticHint().equals(proposedType)
-			|| SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)
-			|| UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
+		if (SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)
+				|| SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)
+				|| SysMLElementTypes.ACTOR_PART_PROPERTY.getSemanticHint().equals(proposedType)
+				|| SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)
+				|| UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
 
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
 
 			return UNDEFINED_TYPE;
 		}
 
-		if(SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)
-			|| SysMLElementTypes.FLOW_PORT_IN.getSemanticHint().equals(proposedType)
-			|| SysMLElementTypes.FLOW_PORT_OUT.getSemanticHint().equals(proposedType)
-			|| SysMLElementTypes.FLOW_PORT_IN_OUT.getSemanticHint().matches(proposedType)
-			|| SysMLElementTypes.FLOW_PORT_NA.getSemanticHint().matches(proposedType)) {
+		if (SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)
+				|| SysMLElementTypes.FLOW_PORT_IN.getSemanticHint().equals(proposedType)
+				|| SysMLElementTypes.FLOW_PORT_OUT.getSemanticHint().equals(proposedType)
+				|| SysMLElementTypes.FLOW_PORT_IN_OUT.getSemanticHint().matches(proposedType)
+				|| SysMLElementTypes.FLOW_PORT_NA.getSemanticHint().matches(proposedType)) {
 
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
 
@@ -178,43 +179,43 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 
 		// End of user code
 
-		if(SysMLElementTypes.BLOCK.getSemanticHint().equals(proposedType)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		if (SysMLElementTypes.BLOCK.getSemanticHint().equals(proposedType)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
+		if (SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
 			}
 			/*
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			*/
+			 * if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+			 * return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
+			 * }
+			 */
 			return UNDEFINED_TYPE;
 		}
-		if(SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
+		if (SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
-		if(UMLElementTypes.PORT.getSemanticHint().equals(proposedType)) {
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
+		if (UMLElementTypes.PORT.getSemanticHint().equals(proposedType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
 			}
-			if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
 			}
 			return UNDEFINED_TYPE;
@@ -227,13 +228,13 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 	 */
 	@Override
 	public String getEdgeGraphicalType(EObject domainElement) {
-		// Start of user code getEdgeGraphicalType(EObject domainElement)	
+		// Start of user code getEdgeGraphicalType(EObject domainElement)
 		// End of user code
 
-		if(UMLElementTypes.CONNECTOR.getEClass().isInstance(domainElement)) {
+		if (UMLElementTypes.CONNECTOR.getEClass().isInstance(domainElement)) {
 			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;
 		}
-		if(UMLElementTypes.DEPENDENCY.getEClass().isInstance(domainElement)) {
+		if (UMLElementTypes.DEPENDENCY.getEClass().isInstance(domainElement)) {
 			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
 		}
 		return super.getEdgeGraphicalType(domainElement);
@@ -242,14 +243,15 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getEdgeGraphicalType(String proposedType) {
 		// Start of user code getEdgeGraphicalType(String proposedType)
 		// End of user code
 
-		if(UMLElementTypes.CONNECTOR.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.CONNECTOR.getSemanticHint().equals(proposedType)) {
 			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;
 		}
-		if(UMLElementTypes.DEPENDENCY.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.DEPENDENCY.getSemanticHint().equals(proposedType)) {
 			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
 		}
 		return super.getEdgeGraphicalType(proposedType);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomViewProvider.java
index f7ade19a846..3a842a2f148 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomViewProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
index 2aeea753ac5..f1c365d9fe6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -30,33 +30,33 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
 	/** ********************************************************* */
 
 	/** CompositeDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$
 
 	public static final String CONSTRAINT_LABEL_NAME_HINT = "5197"; //$NON-NLS-1$
 
 	public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = "6039"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_3097"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_3097"); //$NON-NLS-1$
 
 	public static final String COMMENT_CN_LABEL_BODY_HINT = "5150"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
+	public static final IHintedType COMMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
 
 	public static final String COMMENT_LABEL_BODY_HINT = "5192"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"); //$NON-NLS-1$
 
 	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "6048"; //$NON-NLS-1$
 
 	public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = "6049"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
 
 	/** CompositeDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"); //$NON-NLS-1$
 
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java
index 99e6d497de1..1956448e6cc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -63,7 +63,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	public String getEdgeGraphicalType(EObject domainElement) {
 
 		String graphicalType = UNDEFINED_TYPE;
-		if(domainElement == null) {
+		if (domainElement == null) {
 			return UNDEFINED_TYPE;
 		}
 		return graphicalType;
@@ -73,8 +73,8 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getEdgeGraphicalType(IElementType elementType) {
-		if(elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType)elementType).getSemanticHint();
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
 			return getEdgeGraphicalType(semanticHint);
 		}
 
@@ -85,7 +85,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getEdgeGraphicalType(String proposedType) {
-		if(isKnownEdgeType(proposedType)) {
+		if (isKnownEdgeType(proposedType)) {
 			return proposedType;
 		}
 
@@ -98,28 +98,28 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	public String getNodeGraphicalType(EObject domainElement, String containerType) {
 
 		String graphicalType = UNDEFINED_TYPE;
-		if((containerType == null) || (domainElement == null)) {
+		if ((containerType == null) || (domainElement == null)) {
 			return UNDEFINED_TYPE;
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Constraint) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				graphicalType = ElementTypes.CONSTRAINT.getSemanticHint();
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Comment) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
 				graphicalType = ElementTypes.COMMENT.getSemanticHint();
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
 
@@ -132,8 +132,8 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getNodeGraphicalType(IElementType elementType, String containerType) {
-		if(elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType)elementType).getSemanticHint();
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
 			return getNodeGraphicalType(semanticHint, containerType);
 		}
 
@@ -144,35 +144,35 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getNodeGraphicalType(String proposedType, String containerType) {
-		if((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
+		if ((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				return ElementTypes.COMMENT.getSemanticHint();
 			}
 
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return ElementTypes.COMMENT_CN.getSemanticHint();
 			}
 
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return ElementTypes.COMMENT_CN.getSemanticHint();
 			}
 
 			return UNDEFINED_TYPE;
 		}
 
-		if(UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				return ElementTypes.CONSTRAINT.getSemanticHint();
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
 
 			return UNDEFINED_TYPE;
 		}
-		if(isKnownNodeType(proposedType)) {
+		if (isKnownNodeType(proposedType)) {
 			return proposedType;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java
index 73838a1a96e..b48b56a78af 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,11 +24,11 @@ public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvid
 
 	@Override
 	public synchronized boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View view = ((IEditPartOperation) operation).getView();
 
 			// Ensure current diagram is a InternalBlock Diagram
-			if(!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
+			if (!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
 				return false;
 			}
 
@@ -36,10 +36,10 @@ public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvid
 			EObject eobject = view.getElement();
 
 			/** Nodes (and ChildLabelNodes) *********** */
-			if(eobject instanceof org.eclipse.uml2.uml.Constraint) {
+			if (eobject instanceof org.eclipse.uml2.uml.Constraint) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Comment) {
+			if (eobject instanceof org.eclipse.uml2.uml.Comment) {
 				return true;
 			}
 
@@ -50,11 +50,11 @@ public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvid
 			String hint = view.getType();
 
 			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
+			if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
 				return true;
 			}
 			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
+			if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
 				return true;
 			}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
index bf121a6a00d..cba9dc72e42 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -43,27 +43,27 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 	@Override
 	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
 		Edge createdEdge = null;
-		IElementType elementType = (IElementType)semanticAdapter.getAdapter(IElementType.class);
-		if(elementType != null) {
+		IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
+		if (elementType != null) {
 			createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
 		} else {
 			EObject domainElement = EMFHelper.getEObject(semanticAdapter);
 			String domainElementGraphicalType = semanticHint;
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
 				// Cannot use createEdge from super class as it never take the graphical type (semanticHint) into account.
 				// createdEdge = super.createEdge(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
-				if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createCommentAnnotatedElement_4002(containerView, index, persisted, preferencesHint);
 				}
-				if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createConstraintConstrainedElement_4003(containerView, index, persisted, preferencesHint);
 				}
 			}
 		}
-		if(createdEdge == null) {
+		if (createdEdge == null) {
 			Activator.log.error(new Exception("Could not create Edge."));
 		}
 		return createdEdge;
@@ -73,7 +73,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 	protected boolean provides(CreateViewForKindOperation op) {
 		// Never use this method (often incorrectly implemented due to GMF Tooling choices).
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 		throw new UnsupportedOperationException("Should never be called by the " + diagramType + " diagram.");
@@ -82,44 +82,44 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 	@Override
 	protected boolean provides(CreateEdgeViewOperation op) {
 		// Must have a container
-		if(op.getContainerView() == null) {
+		if (op.getContainerView() == null) {
 			return false;
 		}
 		// This provider is registered for InternalBlock Diagram only
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if(elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
+		if (elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
 			return true;
 		}
-		if(elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
+		if (elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
 			return true;
 		}
 		// /////////////////////////////////////////////////////////////////////
 		// Test possibility to provide a view based on the semantic nature and its expected container.
 		// /////////////////////////////////////////////////////////////////////
 		// IElementType may be an extended type. Check for a view based on this element type
-		if(elementType instanceof IExtendedHintedElementType) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		if (elementType instanceof IExtendedHintedElementType) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
 		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.	
-		if(elementType == null) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		// In such a case, test the semantic EObject instead.
+		if (elementType == null) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
@@ -129,36 +129,36 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 	@Override
 	protected boolean provides(CreateNodeViewOperation op) {
 		// Must have a container
-		if(op.getContainerView() == null) {
+		if (op.getContainerView() == null) {
 			return false;
 		}
 		// Get the type of the container
 		String containerGraphicalType = op.getContainerView().getType();
 		// This provider is registered for InternalBlock Diagram only
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 		// /////////////////////////////////////////////////////////////////////
 		// Test possibility to provide a view based on the ElementType and its expected container.
 		// /////////////////////////////////////////////////////////////////////
-		IElementType elementType = (IElementType)op.getSemanticAdapter().getAdapter(IElementType.class);
-		if(elementType == UMLElementTypes.CONSTRAINT) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		IElementType elementType = (IElementType) op.getSemanticAdapter().getAdapter(IElementType.class);
+		if (elementType == UMLElementTypes.CONSTRAINT) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == UMLElementTypes.COMMENT) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == UMLElementTypes.COMMENT) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerGraphicalType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
@@ -166,30 +166,30 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 		// Test possibility to provide a view based on the semantic nature and its expected container.
 		// /////////////////////////////////////////////////////////////////////
 		// IElementType may be an extended type. Check for a view based on this element type
-		if(elementType instanceof IExtendedHintedElementType) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		if (elementType instanceof IExtendedHintedElementType) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 			} else {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
-		
+
 		// IElementType may be null (especially when drop from ModelExplorer).
 		// In such a case, test the semantic EObject instead.
-		if(elementType == null) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		if (elementType == null) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 			} else {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
 			}
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
@@ -203,14 +203,14 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 		String containerGraphicalType = containerView.getType();
 		// Get the type of the domain element
 		EObject domainElement = EMFHelper.getEObject(semanticAdapter);
-		if(semanticHint != null) {
+		if (semanticHint != null) {
 			// Look for a possible graphicalType replacement
 			String graphicalType = registry.getNodeGraphicalType(semanticHint, containerGraphicalType);
 			return super.createNode(new SemanticAdapter(domainElement, null), containerView, graphicalType, index, persisted, preferencesHint);
 		}
 		String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 		// Create the expected node
-		if(!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
+		if (!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
 			return super.createNode(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
 		}
 		Activator.log.error(new Exception("Could not create Node."));
@@ -219,7 +219,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 
 	@Override
 	protected void stampShortcut(View containerView, Node target) {
-		if(!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
+		if (!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
 			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
 			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
 			shortcutAnnotation.getDetails().put("modelID", ElementTypes.DIAGRAM_ID); //$NON-NLS-1$
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPartProvider.java
index 84d67b42283..41f6aeccc8e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPartProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -25,11 +25,11 @@ public class InternalBlockDiagramEditPartProvider extends AbstractEditPartProvid
 
 	@Override
 	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View view = ((IEditPartOperation) operation).getView();
 
 			// Ensure current diagram is InternalBlock Diagram
-			if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+			if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
 				return true;
 			}
 		}
@@ -39,7 +39,7 @@ public class InternalBlockDiagramEditPartProvider extends AbstractEditPartProvid
 
 	@Override
 	protected Class<?> getDiagramEditPartClass(View view) {
-		if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+		if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
 			return InternalBlockDiagramEditPart.class;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPolicyProvider.java
index d4a77313f63..ae877b5581a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPolicyProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPolicyProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -26,26 +26,26 @@ public class InternalBlockDiagramEditPolicyProvider extends AbstractProvider imp
 
 	public boolean provides(IOperation operation) {
 
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;
-		if(!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
 			return false;
 		}
-		GraphicalEditPart gep = (GraphicalEditPart)epOperation.getEditPart();
+		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();
 		String diagramType = gep.getNotationView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPartCN) {
 			return true;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramViewProvider.java
index 57def76cfd7..bd137698953 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramViewProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,7 +24,7 @@ public class InternalBlockDiagramViewProvider extends AbstractViewProvider {
 	@Override
 	protected boolean provides(CreateDiagramViewOperation operation) {
 
-		if(ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
+		if (ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
 			return true;
 		}
 
@@ -33,7 +33,7 @@ public class InternalBlockDiagramViewProvider extends AbstractViewProvider {
 
 	@Override
 	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if(ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
+		if (ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
 			return InternalBlockDiagramViewFactory.class;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java
index 8d3e42398e6..823b7ee6e15 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -18,6 +18,7 @@ import org.eclipse.papyrus.gmf.diagram.common.compatibility.IDiagramVersionUpdat
 

 /**

  * Diagram version updater for the Internal Block Diagram.*

+ * 

  * @Deprecated

  * @link org.eclipse.papyrus.sysml.diagram.internalblock.migration.InternalBlockDiagramReconcilierUndefinedTo100

  */

@@ -25,44 +26,44 @@ import org.eclipse.papyrus.gmf.diagram.common.compatibility.IDiagramVersionUpdat
 public class DiagramVersionUpdater implements IDiagramVersionUpdater {

 

 	public static final String VERSION_0_9_1 = "0.9.1";

-	

+

 	public final static String VERSION_0_8_1 = "0.8.1";

-	

+

 	/** Constructor */

 	public DiagramVersionUpdater() {

 	}

 

 	public int update(Diagram diagram, String oldVersion, String newVersion) {

-//		TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(diagram);

-//

-//		if(DiagramVersioningUtils.UNDEFINED_VERSION.equals(oldVersion)) {

-//			if(VERSION_0_8_1.equals(newVersion)) {

-//				try {

-//					editingDomain.getCommandStack().execute(getUpdateCommandFromUndefinedTo_081(diagram));

-//				} catch (Exception e) {

-//					e.printStackTrace();

-//				}

-//			} else if(VERSION_0_9_1.equals(newVersion)) {

-//				try {

-//					CompoundCommand cc = new CompoundCommand("Update Diagram");

-//					cc.append(getUpdateCommandFromUndefinedTo_081(diagram));

-//					cc.append(getUpdateCommandFrom081To_091(diagram));

-//					editingDomain.getCommandStack().execute(cc);

-//				} catch (Exception e) {

-//					e.printStackTrace();

-//				}

-//			}

-//			

-//		}

-//

-//		if(VERSION_0_8_1.equals(oldVersion) && (VERSION_0_9_1.equals(newVersion))) {

-//			try {

-//				editingDomain.getCommandStack().execute(getUpdateCommandFrom081To_091(diagram));

-//			} catch (Exception e) {

-//				e.printStackTrace();

-//			}

-//		}

-//		

+		// TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(diagram);

+		//

+		// if(DiagramVersioningUtils.UNDEFINED_VERSION.equals(oldVersion)) {

+		// if(VERSION_0_8_1.equals(newVersion)) {

+		// try {

+		// editingDomain.getCommandStack().execute(getUpdateCommandFromUndefinedTo_081(diagram));

+		// } catch (Exception e) {

+		// e.printStackTrace();

+		// }

+		// } else if(VERSION_0_9_1.equals(newVersion)) {

+		// try {

+		// CompoundCommand cc = new CompoundCommand("Update Diagram");

+		// cc.append(getUpdateCommandFromUndefinedTo_081(diagram));

+		// cc.append(getUpdateCommandFrom081To_091(diagram));

+		// editingDomain.getCommandStack().execute(cc);

+		// } catch (Exception e) {

+		// e.printStackTrace();

+		// }

+		// }

+		//

+		// }

+		//

+		// if(VERSION_0_8_1.equals(oldVersion) && (VERSION_0_9_1.equals(newVersion))) {

+		// try {

+		// editingDomain.getCommandStack().execute(getUpdateCommandFrom081To_091(diagram));

+		// } catch (Exception e) {

+		// e.printStackTrace();

+		// }

+		// }

+		//

 		return 0;

 	}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/dnd/helper/CustomLinkMappingHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/dnd/helper/CustomLinkMappingHelper.java
index ea85d7a115f..ae5f98afe52 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/dnd/helper/CustomLinkMappingHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/dnd/helper/CustomLinkMappingHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -35,16 +35,17 @@ public class CustomLinkMappingHelper implements ILinkMappingHelper {
 	public Collection<?> getSource(Element link) {

 		CommonSourceUMLSwitch umlSwitch = new CommonSourceUMLSwitch() {

 

+			@Override

 			public java.util.Collection<?> caseConnector(org.eclipse.uml2.uml.Connector object) {

 

 				java.util.Collection<?> ends = Collections.emptySet();

 

 				// Support for binary Connector only in this diagram.

 

-				if(object.getEnds().size() == 2) {

+				if (object.getEnds().size() == 2) {

 

 					ConnectorEnd semanticSource = object.getEnds().get(0);

-					ends = Arrays.asList(new EObject[]{ semanticSource });

+					ends = Arrays.asList(new EObject[] { semanticSource });

 

 				} else {

 					// TODO: log warning here - can only drop binary associations in this diagram...

@@ -63,16 +64,17 @@ public class CustomLinkMappingHelper implements ILinkMappingHelper {
 	public Collection<?> getTarget(Element link) {

 		CommonTargetUMLSwitch umlSwitch = new CommonTargetUMLSwitch() {

 

+			@Override

 			public java.util.Collection<?> caseConnector(org.eclipse.uml2.uml.Connector object) {

 

 				java.util.Collection<?> ends = Collections.emptySet();

 

-				// Support for binary Connector only in this diagram.			

+				// Support for binary Connector only in this diagram.

 

-				if(object.getEnds().size() == 2) {

+				if (object.getEnds().size() == 2) {

 

 					ConnectorEnd semanticTarget = object.getEnds().get(1);

-					ends = Arrays.asList(new EObject[]{ semanticTarget });

+					ends = Arrays.asList(new EObject[] { semanticTarget });

 

 				} else {

 					// TODO: log warning here - can only drop binary associations in this diagram...

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
index 54ecea7486f..ac6f3163a9d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -32,7 +32,7 @@ import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;
 /**

  * <pre>

  * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference 

+ * in order to manage Class Diagram specific elements (reference

  * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

  * </pre>

  */

@@ -50,21 +50,21 @@ public class CustomBlockCompositeSemanticEditPolicy extends BlockCompositeSemant
 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

 

-		if(inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

-		if(!registry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

@@ -77,14 +77,14 @@ public class CustomBlockCompositeSemanticEditPolicy extends BlockCompositeSemant
 	@Override

 	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

 

-		View reconnectedView = (View)req.getParameter(RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : IGraphicalTypeRegistry.UNDEFINED_TYPE;

+		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

+		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeDropEditPolicy.java
index 5c2ad50852d..21e16a34700 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -38,7 +38,7 @@ import org.eclipse.uml2.uml.Port;
 

 /**

  * <pre>

- * Customization of the DND edit policy for BlockPropertyComposite that enables 

+ * Customization of the DND edit policy for BlockPropertyComposite that enables

  * type modification, or creation of new Port and FlowPort by a drop on target.

  * </pre>

  */

@@ -67,9 +67,9 @@ public class CustomBlockPropertyCompositeDropEditPolicy extends CustomDragDropEd
 	 */

 	@Override

 	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {

-		if((UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(nodeType)) || (SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(nodeType))) {

+		if ((UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(nodeType)) || (SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(nodeType))) {

 			PortDropHelper portDropHelper = new PortDropHelper(getEditingDomain());

-			Command portDropCommand = portDropHelper.getDropPortOnPart((Port)droppedEObject, dropRequest.getLocation().getCopy(), (GraphicalEditPart)getHost());

+			Command portDropCommand = portDropHelper.getDropPortOnPart((Port) droppedEObject, dropRequest.getLocation().getCopy(), (GraphicalEditPart) getHost());

 			return new CommandProxy(portDropCommand);

 		}

 

@@ -84,54 +84,54 @@ public class CustomBlockPropertyCompositeDropEditPolicy extends CustomDragDropEd
 		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());

 

 		// Single drop management possible drop action list can be proposed

-		if(dropRequest.getObjects().size() == 1) {

+		if (dropRequest.getObjects().size() == 1) {

 

 			// List of available drop commands

 			final List<Command> commandChoice = new ArrayList<Command>();

 

 			// 1. Try to set the target element type with dropped object

-			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart)getHost());

-			if((dropAsSetType != null) && (dropAsSetType.canExecute())) {

+			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart) getHost());

+			if ((dropAsSetType != null) && (dropAsSetType.canExecute())) {

 				commandChoice.add(dropAsSetType);

 			}

 

 			// 2. Try to create a Port typed by the dropped object

-			Command dropAsTypedPort = helper.getDropAsTypedPortOnPart(dropRequest, (GraphicalEditPart)getHost());

-			if((dropAsTypedPort != null) && (dropAsTypedPort.canExecute())) {

+			Command dropAsTypedPort = helper.getDropAsTypedPortOnPart(dropRequest, (GraphicalEditPart) getHost());

+			if ((dropAsTypedPort != null) && (dropAsTypedPort.canExecute())) {

 				commandChoice.add(dropAsTypedPort);

 			}

 

-			// 3. Try to create a FlowPort (In - Out - InOut) typed by the dropped object 

-			Command dropAsTypedFlowPort_In = helper.getDropAsTypedFlowPortOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.FLOW_PORT);

-			if((dropAsTypedFlowPort_In != null) && (dropAsTypedFlowPort_In.canExecute())) {

+			// 3. Try to create a FlowPort (In - Out - InOut) typed by the dropped object

+			Command dropAsTypedFlowPort_In = helper.getDropAsTypedFlowPortOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT);

+			if ((dropAsTypedFlowPort_In != null) && (dropAsTypedFlowPort_In.canExecute())) {

 				commandChoice.add(dropAsTypedFlowPort_In);

 			}

-			Command dropAsTypedFlowPort_Out = helper.getDropAsTypedFlowPortOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.FLOW_PORT_IN);

-			if((dropAsTypedFlowPort_Out != null) && (dropAsTypedFlowPort_Out.canExecute())) {

+			Command dropAsTypedFlowPort_Out = helper.getDropAsTypedFlowPortOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT_IN);

+			if ((dropAsTypedFlowPort_Out != null) && (dropAsTypedFlowPort_Out.canExecute())) {

 				commandChoice.add(dropAsTypedFlowPort_Out);

 			}

-			Command dropAsTypedFlowPort_InOut = helper.getDropAsTypedFlowPortOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.FLOW_PORT_OUT);

-			if((dropAsTypedFlowPort_InOut != null) && (dropAsTypedFlowPort_InOut.canExecute())) {

+			Command dropAsTypedFlowPort_InOut = helper.getDropAsTypedFlowPortOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT_OUT);

+			if ((dropAsTypedFlowPort_InOut != null) && (dropAsTypedFlowPort_InOut.canExecute())) {

 				commandChoice.add(dropAsTypedFlowPort_InOut);

 			}

 

-			//			Same behavior for 4 & 5

-			//			// 4. Build command to drop Port and FlowPort

-			//			PortDropHelper portDropHelper = new PortDropHelper(getEditingDomain());

-			//			Command dropPortOnPart = portDropHelper.getDropPortOnPart(dropRequest, (GraphicalEditPart)getHost());

-			//			if ((dropPortOnPart != null) && (dropPortOnPart.canExecute())) {

-			//				commandChoice.add(dropPortOnPart);

-			//			}

+			// Same behavior for 4 & 5

+			// // 4. Build command to drop Port and FlowPort

+			// PortDropHelper portDropHelper = new PortDropHelper(getEditingDomain());

+			// Command dropPortOnPart = portDropHelper.getDropPortOnPart(dropRequest, (GraphicalEditPart)getHost());

+			// if ((dropPortOnPart != null) && (dropPortOnPart.canExecute())) {

+			// commandChoice.add(dropPortOnPart);

+			// }

 

 			// 5. Build default drop command (show view of the dropped object)

 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);

 			defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");

-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

 				commandChoice.add(defaultDropCommand);

 			}

 

 			// Prepare the selection command (if several command are available) or return the drop command

-			if(commandChoice.size() > 1) {

+			if (commandChoice.size() > 1) {

 				RunnableWithResult<ICommand> runnable;

 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {

 

@@ -143,7 +143,7 @@ public class CustomBlockPropertyCompositeDropEditPolicy extends CustomDragDropEd
 				ICommand selectCommand = runnable.getResult();

 

 				return new ICommandProxy(selectCommand);

-			} else if(commandChoice.size() == 1) {

+			} else if (commandChoice.size() == 1) {

 				return commandChoice.get(0);

 			}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java
index 9a45070753c..1cd30a71c7e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -36,7 +36,7 @@ import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;
 /**

  * <pre>

  * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference 

+ * in order to manage Class Diagram specific elements (reference

  * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

  * </pre>

  */

@@ -52,37 +52,38 @@ public class CustomBlockPropertyCompositeSemanticEditPolicy extends BlockPropert
 

 	/** the sysml link helper to use for specific case */

 	private CreateOrShowExistingElementHelper sysmlLinkHelper = new SysMLCreateOrShowExistingElementHelper();

+

 	/**

 	 * {@inheritDoc}

 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

 

-		if(inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

-		if(!registry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		final Command defaultCommand = super.getCreateRelationshipCommand(req);

-		if(defaultCommand.canExecute()) {

+		if (defaultCommand.canExecute()) {

 			final IElementType elementType = req.getElementType();

-			if(UMLElementTypes.CONNECTOR.equals(req.getElementType())) {

+			if (UMLElementTypes.CONNECTOR.equals(req.getElementType())) {

 				return this.sysmlLinkHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

 			}

-			if(UMLElementTypes.DEPENDENCY.equals(req.getElementType())) {

+			if (UMLElementTypes.DEPENDENCY.equals(req.getElementType())) {

 				return this.linkHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

 			}

 		}

@@ -95,14 +96,14 @@ public class CustomBlockPropertyCompositeSemanticEditPolicy extends BlockPropert
 	@Override

 	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

 

-		View reconnectedView = (View)req.getParameter(RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : IGraphicalTypeRegistry.UNDEFINED_TYPE;

+		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

+		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
index 53392f36866..85f0a1ffe56 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -35,7 +35,7 @@ import org.eclipse.ui.PlatformUI;
 

 /**

  * <pre>

- * Customization of the DND edit policy for BlockPropertyComposite that enables 

+ * Customization of the DND edit policy for BlockPropertyComposite that enables

  * type modification, or creation of new Port and FlowPort by a drop on target.

  * </pre>

  */

@@ -55,57 +55,57 @@ public class CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy exten
 		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());

 

 		// Single drop management possible drop action list can be proposed

-		if(dropRequest.getObjects().size() == 1) {

+		if (dropRequest.getObjects().size() == 1) {

 

 			// List of available drop commands

 			final List<Command> commandChoice = new ArrayList<Command>();

 

 			// 1. Build command to drop BlockProperty

 			PartDropHelper partDropHelper = new PartDropHelper(getEditingDomain());

-			Command dropPartOnPart = partDropHelper.getDropPartOnPart(dropRequest, (GraphicalEditPart)getHost());

-			if((dropPartOnPart != null) && (dropPartOnPart.canExecute())) {

+			Command dropPartOnPart = partDropHelper.getDropPartOnPart(dropRequest, (GraphicalEditPart) getHost());

+			if ((dropPartOnPart != null) && (dropPartOnPart.canExecute())) {

 				commandChoice.add(dropPartOnPart);

 			}

 

 			// 2. Try to create a Part typed by the dropped object

-			Command dropAsTypedPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.PART_PROPERTY);

-			if((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {

+			Command dropAsTypedPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);

+			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {

 				commandChoice.add(dropAsTypedPart);

 			}

 

 			// 3. Try to create a Reference typed by the dropped object

-			Command dropAsTypedReference = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.REFERENCE_PROPERTY);

-			if((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {

+			Command dropAsTypedReference = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);

+			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {

 				commandChoice.add(dropAsTypedReference);

 			}

 

 			// 4. Try to create an ActorPart typed by the dropped object

-			Command dropAsTypedActorPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);

-			if((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {

+			Command dropAsTypedActorPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);

+			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {

 				commandChoice.add(dropAsTypedActorPart);

 			}

 

 			// 5. Try to create a Value typed by the dropped object

-			Command dropAsTypedValue = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.VALUE_PROPERTY);

-			if((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {

+			Command dropAsTypedValue = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);

+			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {

 				commandChoice.add(dropAsTypedValue);

 			}

 

 			// 6. Try to create a Property typed by the dropped object

-			Command dropAsTypedProperty = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), UMLElementTypes.PROPERTY);

-			if((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {

+			Command dropAsTypedProperty = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);

+			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {

 				commandChoice.add(dropAsTypedProperty);

 			}

 

 			// 7. Build default drop command (show view of the dropped object)

 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);

 			defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");

-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

 				commandChoice.add(defaultDropCommand);

 			}

 

 			// Prepare the selection command (if several command are available) or return the drop command

-			if(commandChoice.size() > 1) {

+			if (commandChoice.size() > 1) {

 				RunnableWithResult<ICommand> runnable;

 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {

 

@@ -117,7 +117,7 @@ public class CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy exten
 				ICommand selectCommand = runnable.getResult();

 

 				return new ICommandProxy(selectCommand);

-			} else if(commandChoice.size() == 1) {

+			} else if (commandChoice.size() == 1) {

 				return commandChoice.get(0);

 			}

 

@@ -128,7 +128,7 @@ public class CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy exten
 

 		return super.getDropObjectsCommand(dropRequest);

 	}

-	

+

 	/**

 	 * {@inheritDoc}

 	 */

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java
index c6737301de0..430de139eac 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -36,7 +36,7 @@ import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;
 /**

  * <pre>

  * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference 

+ * in order to manage Class Diagram specific elements (reference

  * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

  * </pre>

  */

@@ -60,32 +60,32 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

 

-		if(inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

-		if(!registry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		final Command defaultCommand = super.getCreateRelationshipCommand(req);

-		if(defaultCommand.canExecute()) {

+		if (defaultCommand.canExecute()) {

 			final IElementType elementType = req.getElementType();

-			if(UMLElementTypes.CONNECTOR.equals(req.getElementType())) {

+			if (UMLElementTypes.CONNECTOR.equals(req.getElementType())) {

 				return this.sysmlLinkHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

 			}

 

-			if(UMLElementTypes.DEPENDENCY.equals(req.getElementType())) {

+			if (UMLElementTypes.DEPENDENCY.equals(req.getElementType())) {

 				return this.linkHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

 			}

 		}

@@ -98,14 +98,14 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 	@Override

 	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

 

-		View reconnectedView = (View)req.getParameter(RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : IGraphicalTypeRegistry.UNDEFINED_TYPE;

+		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

+		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDiagramDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDiagramDropEditPolicy.java
index 0713f4cbc0d..b0d3fa3dcbf 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDiagramDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDiagramDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -28,8 +28,7 @@ import org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher;
 /**

  * Custom drag'n'drop edit policy when the target edit part is the diagram itself.

  * <P>

- * In this case, it should be impossible to drop elements in this Internal Block Diagram, except the block context of that diagram, if it is not

- * already displayed in the diagram.

+ * In this case, it should be impossible to drop elements in this Internal Block Diagram, except the block context of that diagram, if it is not already displayed in the diagram.

  * </P>

  */

 public class CustomDiagramDropEditPolicy extends CustomDragDropEditPolicy {

@@ -49,26 +48,26 @@ public class CustomDiagramDropEditPolicy extends CustomDragDropEditPolicy {
 	 */

 	@Override

 	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {

-		if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(nodeType)) {

-			// should not be possible to execute, unless 2 conditions: 

+		if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(nodeType)) {

+			// should not be possible to execute, unless 2 conditions:

 			// 1. the block is the context of the diagram

 			// 2. the block is not already displayed in the diagram

 			BlockMatcher matcher = new BlockMatcher();

-			if(!matcher.matches(droppedEObject)) { // should check for additional free elements, like comments, constraints.

+			if (!matcher.matches(droppedEObject)) { // should check for additional free elements, like comments, constraints.

 				return UnexecutableCommand.INSTANCE;

 			}

 

 			// this is a block. checking if the element context of the diagram is the block dropped

 			Object model = getHost().getModel();

-			if(model instanceof Diagram) { // should be...

-				EObject element = ((Diagram)model).getElement();

-				if(droppedEObject.equals(element)) {

+			if (model instanceof Diagram) { // should be...

+				EObject element = ((Diagram) model).getElement();

+				if (droppedEObject.equals(element)) {

 					// check no view exists for this block already

 					@SuppressWarnings("unchecked")

-					Iterator<View> it = ((Diagram)model).getChildren().iterator();

-					while(it.hasNext()) {

+					Iterator<View> it = ((Diagram) model).getChildren().iterator();

+					while (it.hasNext()) {

 						View view = it.next();

-						if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(view.getType())) {

+						if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(view.getType())) {

 							// there is already a block displayed in the diagram. Should be unexecutable.

 							return UnexecutableCommand.INSTANCE;

 						}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDragDropEditPolicy.java
index 0f7bc345b0f..280184a1883 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDragDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -50,7 +50,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {

 

 	private ConnectorUtils utils = new ConnectorUtils();

-	

+

 	/** Default constructor. */

 	public CustomDragDropEditPolicy() {

 		super(new CustomLinkMappingHelper());

@@ -74,8 +74,8 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 	 */

 	@Override

 	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {

-		if((UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(edgeType)) && (droppedEObject instanceof Connector)) {

-			return getConnectorDropCommand(dropRequest, (Connector)droppedEObject, edgeType);

+		if ((UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(edgeType)) && (droppedEObject instanceof Connector)) {

+			return getConnectorDropCommand(dropRequest, (Connector) droppedEObject, edgeType);

 		}

 

 		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

@@ -84,14 +84,14 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 	protected ICommand getConnectorDropCommand(DropObjectsRequest dropRequest, Connector droppedEObject, String edgeType) {

 

 		// Only manage binary link during drop

-		if(droppedEObject.getEnds().size() != 2) {

+		if (droppedEObject.getEnds().size() != 2) {

 			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

 		}

 

 		ConnectorEnd source = droppedEObject.getEnds().get(0);

 		ConnectorEnd target = droppedEObject.getEnds().get(1);

 

-		// Find views in current diagram representing source and target 

+		// Find views in current diagram representing source and target

 		Collection<View> sourceViews = getViewsForConnectorEnd(source);

 		Collection<View> targetViews = getViewsForConnectorEnd(target);

 

@@ -99,32 +99,32 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 		IAdaptable targetViewAdapter = null;

 

 		// If either a source or target lacks create view for these elements, abort...

-		if(sourceViews.isEmpty() || targetViews.isEmpty()) {

+		if (sourceViews.isEmpty() || targetViews.isEmpty()) {

 			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

 		}

 

 		View selectedSourceView = null;

 		View selectedTargetView = null;

 		// until a correct one is found, check that source and target views selected are correct given the current path for the connector...

-		for(View sourceView : sourceViews) {

+		for (View sourceView : sourceViews) {

 			View targetView = getFirstValidTargetViewForSource(sourceView, targetViews, droppedEObject);

-			if(targetView !=null) {

+			if (targetView != null) {

 				selectedSourceView = sourceView;

 				selectedTargetView = targetView;

 				break;

 			}

 		}

-		

-		

+

+

 		// Create source adapter

-		if(selectedSourceView!=null) { // sourceViewAdapter should still be null in this case

+		if (selectedSourceView != null) { // sourceViewAdapter should still be null in this case

 			sourceViewAdapter = new SemanticAdapter(null, selectedSourceView);

 		} else {

 			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

 		}

 

 		// Create target adapter

-		if(selectedTargetView!=null) { // targetViewAdapter should still be null in this case

+		if (selectedTargetView != null) { // targetViewAdapter should still be null in this case

 			targetViewAdapter = new SemanticAdapter(null, selectedTargetView);

 		} else {

 			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

@@ -143,54 +143,55 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 

 	/**

 	 * get the first valid target view for the given source. the couple source/target is valid if the path to them from the future container is valid

+	 * 

 	 * @param sourceView

 	 * @param targetViews

 	 * @return

 	 */

 	private View getFirstValidTargetViewForSource(View sourceView, Collection<View> targetViews, Connector droppedConnector) {

-		for(View targetView : targetViews) {

-			if(isValidTargetViewForSource(sourceView, targetView, droppedConnector)) {

+		for (View targetView : targetViews) {

+			if (isValidTargetViewForSource(sourceView, targetView, droppedConnector)) {

 				return targetView;

 			}

 		}

-		 

+

 		return null;

 	}

-	

+

 	private boolean isValidTargetViewForSource(View sourceView, View targetView, Connector droppedConnector) {

-		if(!(utils.isCrossingEncapsulation(sourceView, targetView))) {

+		if (!(utils.isCrossingEncapsulation(sourceView, targetView))) {

 			// no encapsulation. Computes the end paths

 			List<Property> sourceNestedPaths = utils.getNestedPropertyPath(sourceView, targetView);

 			List<Property> targetNestedPaths = utils.getNestedPropertyPath(targetView, sourceView);

-			

+

 			// check this is compatible with current connector

 			ConnectorEnd sourceConnectorEnd = utils.getSourceConnectorEnd(droppedConnector);

 			NestedConnectorEnd nestedSourceConnectorEnd = UMLUtil.getStereotypeApplication(sourceConnectorEnd, NestedConnectorEnd.class);

-			if(nestedSourceConnectorEnd!=null) {

+			if (nestedSourceConnectorEnd != null) {

 				List<Property> currentSourceConnectorPropertyPath = nestedSourceConnectorEnd.getPropertyPath();

 				// compare the 2 list

-				if(!sourceNestedPaths.equals(currentSourceConnectorPropertyPath)) {

+				if (!sourceNestedPaths.equals(currentSourceConnectorPropertyPath)) {

 					return false;

 				}

-				

-			} else { // no end for the current connector, so the sourceNestedPath should be empty 

-				if(!sourceNestedPaths.isEmpty()) {

+

+			} else { // no end for the current connector, so the sourceNestedPath should be empty

+				if (!sourceNestedPaths.isEmpty()) {

 					return false;

 				}

 			}

-			

-			

+

+

 			ConnectorEnd targetConnectorEnd = utils.getTargetConnectorEnd(droppedConnector);

 			NestedConnectorEnd nestedTargetConnectorEnd = UMLUtil.getStereotypeApplication(targetConnectorEnd, NestedConnectorEnd.class);

-			if(nestedTargetConnectorEnd!=null) {

+			if (nestedTargetConnectorEnd != null) {

 				List<Property> currentTargetConnectorPropertyPath = nestedTargetConnectorEnd.getPropertyPath();

 				// compare the 2 list

-				if(!targetNestedPaths.equals(currentTargetConnectorPropertyPath)) {

+				if (!targetNestedPaths.equals(currentTargetConnectorPropertyPath)) {

 					return false;

 				}

-				

-			} else { // no end for the current connector, so the targetNestedPaths should be empty 

-				if(!targetNestedPaths.isEmpty()) {

+

+			} else { // no end for the current connector, so the targetNestedPaths should be empty

+				if (!targetNestedPaths.isEmpty()) {

 					return false;

 				}

 			}

@@ -200,16 +201,16 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 

 	/**

 	 * This methods looks for views representing a given {@link ConnectorEnd} in the host diagram.

-	 * 

+	 *

 	 * @param end

-	 *        the {@link ConnectorEnd} to look for.

+	 *            the {@link ConnectorEnd} to look for.

 	 * @return the list of {@link View} representing the eObject.

 	 */

 	protected Set<View> getViewsForConnectorEnd(ConnectorEnd end) {

 		Set<View> views = new HashSet<View>();

 

 		// Retrieve host diagram

-		View hostView = ((IGraphicalEditPart)getHost()).getNotationView();

+		View hostView = ((IGraphicalEditPart) getHost()).getNotationView();

 		View hostDiagram = (hostView instanceof Diagram) ? hostView : hostView.getDiagram();

 

 		// Retrieve all views for the ConnectorEnd role

@@ -218,43 +219,43 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 		Collection<View> relatedViews = EMFCoreUtil.getReferencers(end.getRole(), refs);

 

 		// TODO: We should filter views not only for the current diagram,

-		//       but also consider only views nested within the owner of the connector that are closest to the host view

-		//       (in case there are several instances of a Part within which the connector could appear).

+		// but also consider only views nested within the owner of the connector that are closest to the host view

+		// (in case there are several instances of a Part within which the connector could appear).

 		// Connector connector = (Connector)end.getOwner();

 		// StructuredClassifier connectorOwner = (StructuredClassifier)connector.getOwner();

-		// Parse and select views from host diagram only	

+		// Parse and select views from host diagram only

 		Iterator<View> it = relatedViews.iterator();

-		while(it.hasNext()) {

+		while (it.hasNext()) {

 			View currentView = it.next();

-			if(currentView.getDiagram() == hostDiagram) { // FIXME: Cf TODO above.

+			if (currentView.getDiagram() == hostDiagram) { // FIXME: Cf TODO above.

 

 				boolean isInView = false;

 				View containerView = currentView;

-				while(containerView != null && !(containerView instanceof Diagram)) {

-					if(containerView == getReferenceViewForConnectorEnd()) {

+				while (containerView != null && !(containerView instanceof Diagram)) {

+					if (containerView == getReferenceViewForConnectorEnd()) {

 						isInView = true;

 					}

 					containerView = ViewUtil.getContainerView(containerView);

 				}

 

-				if(isInView) {

+				if (isInView) {

 

 					EObject containerElement = ViewUtil.getContainerView(currentView).getElement();

 

-					// If the ConnectorEnd partWithPort is not null, only select Views for which 

+					// If the ConnectorEnd partWithPort is not null, only select Views for which

 					// the graphical parent reference partWithPort.

-					if(end.getPartWithPort() != null) {

-						if(containerElement == end.getPartWithPort()) {

+					if (end.getPartWithPort() != null) {

+						if (containerElement == end.getPartWithPort()) {

 							views.add(currentView);

 						}

 					} else {

 						// If the role is a Port, its graphical parent is a EncapsulatedClassifier

-						if(end.getRole() instanceof Port) {

-							if(containerElement instanceof EncapsulatedClassifier) {

+						if (end.getRole() instanceof Port) {

+							if (containerElement instanceof EncapsulatedClassifier) {

 								views.add(currentView);

-							} else if(containerElement instanceof Property) {

-								Property property = (Property)containerElement;

-								if(property.getType() == end.getRole().getOwner()) {

+							} else if (containerElement instanceof Property) {

+								Property property = (Property) containerElement;

+								if (property.getType() == end.getRole().getOwner()) {

 									views.add(currentView);

 								}

 							}

@@ -271,7 +272,7 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 	}

 

 	protected View getReferenceViewForConnectorEnd() {

-		return ((IGraphicalEditPart)getHost()).getNotationView();

+		return ((IGraphicalEditPart) getHost()).getNotationView();

 	}

 

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java
index 4784e4a11c9..410db379a57 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -32,7 +32,7 @@ import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;
 /**

  * <pre>

  * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference 

+ * in order to manage Class Diagram specific elements (reference

  * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

  * </pre>

  */

@@ -51,21 +51,21 @@ public class CustomNestedBlockPropertyCompositeSemanticEditPolicy extends Nested
 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

 

-		if(inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

-		if(!registry.isKnownEdgeType(newEdgeGraphicalType)) {

+		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

@@ -78,14 +78,14 @@ public class CustomNestedBlockPropertyCompositeSemanticEditPolicy extends Nested
 	@Override

 	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

 

-		View reconnectedView = (View)req.getParameter(RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : IGraphicalTypeRegistry.UNDEFINED_TYPE;

+		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

+		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

 		}

 

-		if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

+		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

 			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/EncapsulatedClassifierDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/EncapsulatedClassifierDropEditPolicy.java
index 7f89985f17f..b3a3d743049 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/EncapsulatedClassifierDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/EncapsulatedClassifierDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -51,40 +51,40 @@ public class EncapsulatedClassifierDropEditPolicy extends CustomDragDropEditPoli
 		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());

 

 		// Single drop management possible drop action list can be proposed

-		if(dropRequest.getObjects().size() == 1) {

+		if (dropRequest.getObjects().size() == 1) {

 

 			// List of available drop commands

 			final List<Command> commandChoice = new ArrayList<Command>();

 

 			// 1. Try to create a Port typed by the dropped object

-			Command dropAsTypedPort = helper.getDropAsTypedPort(dropRequest, (GraphicalEditPart)getHost());

-			if((dropAsTypedPort != null) && (dropAsTypedPort.canExecute())) {

+			Command dropAsTypedPort = helper.getDropAsTypedPort(dropRequest, (GraphicalEditPart) getHost());

+			if ((dropAsTypedPort != null) && (dropAsTypedPort.canExecute())) {

 				commandChoice.add(dropAsTypedPort);

 			}

 

-			// 2. Try to create a FlowPort (In - Out - InOut) typed by the dropped object 

-			Command dropAsTypedFlowPort_In = helper.getDropAsTypedFlowPort(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.FLOW_PORT);

-			if((dropAsTypedFlowPort_In != null) && (dropAsTypedFlowPort_In.canExecute())) {

+			// 2. Try to create a FlowPort (In - Out - InOut) typed by the dropped object

+			Command dropAsTypedFlowPort_In = helper.getDropAsTypedFlowPort(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT);

+			if ((dropAsTypedFlowPort_In != null) && (dropAsTypedFlowPort_In.canExecute())) {

 				commandChoice.add(dropAsTypedFlowPort_In);

 			}

-			Command dropAsTypedFlowPort_Out = helper.getDropAsTypedFlowPort(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.FLOW_PORT_IN);

-			if((dropAsTypedFlowPort_Out != null) && (dropAsTypedFlowPort_Out.canExecute())) {

+			Command dropAsTypedFlowPort_Out = helper.getDropAsTypedFlowPort(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT_IN);

+			if ((dropAsTypedFlowPort_Out != null) && (dropAsTypedFlowPort_Out.canExecute())) {

 				commandChoice.add(dropAsTypedFlowPort_Out);

 			}

-			Command dropAsTypedFlowPort_InOut = helper.getDropAsTypedFlowPort(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.FLOW_PORT_OUT);

-			if((dropAsTypedFlowPort_InOut != null) && (dropAsTypedFlowPort_InOut.canExecute())) {

+			Command dropAsTypedFlowPort_InOut = helper.getDropAsTypedFlowPort(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT_OUT);

+			if ((dropAsTypedFlowPort_InOut != null) && (dropAsTypedFlowPort_InOut.canExecute())) {

 				commandChoice.add(dropAsTypedFlowPort_InOut);

 			}

 

 			// 3. Build default drop command (show view of the dropped object)

 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);

 			defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");

-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

 				commandChoice.add(defaultDropCommand);

 			}

 

 			// Prepare the selection command (if several command are available) or return the drop command

-			if(commandChoice.size() > 1) {

+			if (commandChoice.size() > 1) {

 				RunnableWithResult<ICommand> runnable;

 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {

 

@@ -97,7 +97,7 @@ public class EncapsulatedClassifierDropEditPolicy extends CustomDragDropEditPoli
 

 				return new ICommandProxy(selectCommand);

 

-			} else if(commandChoice.size() == 1) {

+			} else if (commandChoice.size() == 1) {

 				return commandChoice.get(0);

 			}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/ShowHideRelatedLinkEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/ShowHideRelatedLinkEditPolicy.java
index ffe737d9267..3ecb31ec561 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/ShowHideRelatedLinkEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/ShowHideRelatedLinkEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,10 +45,7 @@ import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;
 import org.eclipse.uml2.uml.ConnectableElement;
 import org.eclipse.uml2.uml.Connector;
 import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.TypedElement;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -59,7 +56,8 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	/**
 	 * Constructor.
 	 *
-	 * @param host the host
+	 * @param host
+	 *            the host
 	 */
 	public ShowHideRelatedLinkEditPolicy(DiagramEditPart host) {
 		super(host);
@@ -88,7 +86,8 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	/**
 	 * Gets the semantic hint.
 	 *
-	 * @param eobject the eobject
+	 * @param eobject
+	 *            the eobject
 	 * @return the semantic hint
 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#getSemanticHint(org.eclipse.emf.ecore.EObject)
 	 */
@@ -100,12 +99,15 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	/**
 	 * Clean add.
 	 *
-	 * @param result the result
-	 * @param view the view
-	 * @param descriptors the descriptors
-	 * @param domain2NotationMap the domain2 notation map
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#cleanAdd(java.util.Collection,
-	 * org.eclipse.gmf.runtime.notation.View, java.util.List, java.util.Map)
+	 * @param result
+	 *            the result
+	 * @param view
+	 *            the view
+	 * @param descriptors
+	 *            the descriptors
+	 * @param domain2NotationMap
+	 *            the domain2 notation map
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#cleanAdd(java.util.Collection, org.eclipse.gmf.runtime.notation.View, java.util.List, java.util.Map)
 	 */
 	@Override
 	protected void cleanAdd(final Collection<UpdaterLinkDescriptor> result, final View view, final List<? extends UpdaterLinkDescriptor> descriptors, final Domain2Notation domain2NotationMap) {
@@ -121,24 +123,29 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	 * the link descriptor is removed from descriptors and added to result</li>
 	 * <li>
 	 * the view associated to the role of the connector are added to domain2NotationMap (using the ConnectorEnd as key)</li>
-	 * </ul>.
+	 * </ul>
+	 * .
 	 *
-	 * @param result the result of the method
-	 * @param view a view
-	 * @param descriptors the link descriptors
-	 * @param domain2NotationMap the map between model element and views
+	 * @param result
+	 *            the result of the method
+	 * @param view
+	 *            a view
+	 * @param descriptors
+	 *            the link descriptors
+	 * @param domain2NotationMap
+	 *            the map between model element and views
 	 */
 	protected void cleanAddForConnector(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Domain2Notation domain2NotationMap) {
 		final List<UpdaterLinkDescriptor> toRemove = new ArrayList<UpdaterLinkDescriptor>();
-		for(final Object current : descriptors) {
-			if(current instanceof UpdaterLinkDescriptor) {
-				final UpdaterLinkDescriptor descriptor = (UpdaterLinkDescriptor)current;
+		for (final Object current : descriptors) {
+			if (current instanceof UpdaterLinkDescriptor) {
+				final UpdaterLinkDescriptor descriptor = (UpdaterLinkDescriptor) current;
 				final EObject element = descriptor.getModelElement();
-				if(element instanceof Connector) {
-					if(canBeDisplayed((Connector)element, view, domain2NotationMap)) {
-						result.add((UpdaterLinkDescriptor)current);
+				if (element instanceof Connector) {
+					if (canBeDisplayed((Connector) element, view, domain2NotationMap)) {
+						result.add((UpdaterLinkDescriptor) current);
 					}
-					toRemove.add((UpdaterLinkDescriptor)current);
+					toRemove.add((UpdaterLinkDescriptor) current);
 				}
 			}
 		}
@@ -148,11 +155,13 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	/**
 	 * Checks if is correct graphical view.
 	 *
-	 * @param connectorEnd a connector end
-	 * @param view a view
+	 * @param connectorEnd
+	 *            a connector end
+	 * @param view
+	 *            a view
 	 * @return <code>true</code> if the view represents the role of the
-	 * connector AND if the view is encapsulated as required by the
-	 * nested path of the connector end
+	 *         connector AND if the view is encapsulated as required by the
+	 *         nested path of the connector end
 	 */
 	protected boolean isCorrectGraphicalView(final ConnectorEnd connectorEnd, final View view) {
 		final NestedConnectorEnd nestedConnectorEnd = org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication(connectorEnd, NestedConnectorEnd.class);
@@ -162,39 +171,42 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 		View localView = getTopViewWithSameSemanticElement(view);
 
 		// 2. we verify the part with port
-		if(partWithPort != null) {
+		if (partWithPort != null) {
 			View parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(localView));
-			if(parent.getElement() != partWithPort) {
+			if (parent.getElement() != partWithPort) {
 				return false;
 			}
 		}
-		
+
 		// 3. we verify the nested path
-		if(nestedConnectorEnd != null && nestedConnectorEnd.getPropertyPath().size() > 0) {
+		if (nestedConnectorEnd != null && nestedConnectorEnd.getPropertyPath().size() > 0) {
 			View parent = view;
 			final List<Property> paths = nestedConnectorEnd.getPropertyPath();
-			for(int i = paths.size() - 1; i >= 0; i--) {
+			for (int i = paths.size() - 1; i >= 0; i--) {
 				final Property currentProperty = paths.get(i);
 				parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(parent));
-				if(parent.getElement() != currentProperty) {
+				if (parent.getElement() != currentProperty) {
 					return false;
 				}
 			}
 		}
 		return true;
 	}
-	
+
 	/**
 	 * Can be displayed.
 	 *
-	 * @param connector a connector
-	 * @param selectedView a view used as source or target for the connector to display
-	 * @param domain2NotationMap the map to complete if we found source and target View on the
-	 * diagram to diplsay the connector
+	 * @param connector
+	 *            a connector
+	 * @param selectedView
+	 *            a view used as source or target for the connector to display
+	 * @param domain2NotationMap
+	 *            the map to complete if we found source and target View on the
+	 *            diagram to diplsay the connector
 	 * @return <code>true</code> if the view can be used as source/target for
-	 * the connector according to the nested path AND if we found a
-	 * second view for the 2nd connector end according to the nested
-	 * path
+	 *         the connector according to the nested path AND if we found a
+	 *         second view for the 2nd connector end according to the nested
+	 *         path
 	 */
 	protected boolean canBeDisplayed(final Connector connector, final View selectedView, final Domain2Notation domain2NotationMap) {
 		// we need to verify the selected view
@@ -202,34 +214,34 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 		ConnectorEnd endForView = null;
 
 		// 1. look for the connector end represented by the selected view
-		for(final ConnectorEnd current : connector.getEnds()) {
-			if(current.getRole() == semanticElement) {
+		for (final ConnectorEnd current : connector.getEnds()) {
+			if (current.getRole() == semanticElement) {
 				endForView = current;
 				break;
 			}
 		}
 		Assert.isNotNull(endForView);
 		// 2. verify the view of the selected connector end
-		if(!isCorrectGraphicalView(endForView, selectedView)) {
+		if (!isCorrectGraphicalView(endForView, selectedView)) {
 			return false;
 		}
 
 		// 3. try to find a view for the second connector end
 		View secondView = null;
-		for(final ConnectorEnd end : connector.getEnds()) {
+		for (final ConnectorEnd end : connector.getEnds()) {
 			final ConnectableElement role = end.getRole();
-			if(role==null){
+			if (role == null) {
 				return false;
 			}
-			if(end == endForView) {
+			if (end == endForView) {
 				continue;
 			}
 
 			final Set<View> views = CrossReferencerUtil.getCrossReferencingViewsInDiagram(role, getCurrentDiagram());
 			final Iterator<View> iterOnView = views.iterator();
-			while(secondView == null && iterOnView.hasNext()) {
+			while (secondView == null && iterOnView.hasNext()) {
 				final View currentView = iterOnView.next();
-				if(isCorrectGraphicalView(end, currentView)) {
+				if (isCorrectGraphicalView(end, currentView)) {
 					domain2NotationMap.putView(endForView, selectedView);
 					domain2NotationMap.putView(end, currentView);
 					secondView = currentView;
@@ -242,144 +254,154 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	/**
 	 * Gets the show link command.
 	 *
-	 * @param domain the editing domain to use for this command
-	 * @param linkToShow a link to show
-	 * @param domain2NotationMap the domain2 notation map
-	 * @param linkDescriptors the link descriptors
+	 * @param domain
+	 *            the editing domain to use for this command
+	 * @param linkToShow
+	 *            a link to show
+	 * @param domain2NotationMap
+	 *            the domain2 notation map
+	 * @param linkDescriptors
+	 *            the link descriptors
 	 * @return the command to display the link on the diagram
 	 */
+	@Override
 	protected ICommand getShowLinkCommand(final TransactionalEditingDomain domain, final EObject linkToShow, final Domain2Notation domain2NotationMap, final Collection<? extends UpdaterLinkDescriptor> linkDescriptors) {
-		
-		if(!(linkToShow instanceof Connector)) {
+
+		if (!(linkToShow instanceof Connector)) {
 			return super.getShowLinkCommand(domain, linkToShow, domain2NotationMap, linkDescriptors);
 		}
-		domain2NotationMap.mapModel((View)getHost().getAdapter(View.class));
-		
+		domain2NotationMap.mapModel((View) getHost().getAdapter(View.class));
+
 		// we look for the link descriptor
 		UpdaterLinkDescriptor updaterLinkDescriptor = getLinkDescriptor(linkToShow, linkDescriptors);
 		ICommand showLinkCommandFromUpdaterLinkDescriptor = getShowLinkCommandFromUpdaterLinkDescriptor(linkToShow, domain2NotationMap, updaterLinkDescriptor);
 		return showLinkCommandFromUpdaterLinkDescriptor;
 	}
 
-	
+
 	/**
 	 * Gets the show link command from updater link descriptor.
 	 *
-	 * @param linkToShow the link to show
-	 * @param domain2NotationMap the domain2 notation map
-	 * @param descriptor the descriptor
+	 * @param linkToShow
+	 *            the link to show
+	 * @param domain2NotationMap
+	 *            the domain2 notation map
+	 * @param descriptor
+	 *            the descriptor
 	 * @return the show link command from updater link descriptor
 	 */
 	private ICommand getShowLinkCommandFromUpdaterLinkDescriptor(final EObject linkToShow, final Domain2Notation domain2NotationMap, UpdaterLinkDescriptor descriptor) {
 		ConnectorUtils connectorUtils = new ConnectorUtils();
-		
-		if(descriptor != null) {
-			
+
+		if (descriptor != null) {
+
 			Set<View> sourceViewList = domain2NotationMap.get(descriptor.getSource());
 			Set<View> targetViewList = domain2NotationMap.get(descriptor.getDestination());
-			
+
 
 			final Set<View> linkSet = domain2NotationMap.get(linkToShow);
-			
+
 			CompositeCommand compositeCommand = new CompositeCommand("Restore All Related Links");
 			for (View sourceView : sourceViewList) {
-					for (View targetView : targetViewList) {
-						if (canDisplayExistingLinkBetweenViews((Connector) linkToShow, sourceView, targetView)){
-							
-							if (connectorUtils.canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths((Connector) linkToShow, sourceView, targetView)){
-								boolean alreadyDisplayed = false;
-								if (linkSet != null){
-									for (View viewLink : linkSet) {	
-										boolean linkForViews = isLinkForViews((org.eclipse.gmf.runtime.notation.Connector) viewLink, sourceView, targetView);
-										alreadyDisplayed = alreadyDisplayed || linkForViews;
-									}
+				for (View targetView : targetViewList) {
+					if (canDisplayExistingLinkBetweenViews(linkToShow, sourceView, targetView)) {
+
+						if (ConnectorUtils.canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths((Connector) linkToShow, sourceView, targetView)) {
+							boolean alreadyDisplayed = false;
+							if (linkSet != null) {
+								for (View viewLink : linkSet) {
+									boolean linkForViews = isLinkForViews((org.eclipse.gmf.runtime.notation.Connector) viewLink, sourceView, targetView);
+									alreadyDisplayed = alreadyDisplayed || linkForViews;
 								}
-								
-								if (!alreadyDisplayed){
-									EditPart sourceEditPart = getEditPartFromView(sourceView);
-									EditPart targetEditPart = getEditPartFromView(targetView);
-	
-									// If the parts are still null...
-									if(sourceEditPart == null || targetEditPart == null) {
-										return null;
-									}
-									String semanticHint = getSemanticHint(linkToShow);
-									CreateConnectionViewRequest.ConnectionViewDescriptor viewDescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(descriptor.getSemanticAdapter(), semanticHint, ViewUtil.APPEND, false, ((GraphicalEditPart)getHost()).getDiagramPreferencesHint());
-									CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(viewDescriptor);
-									ccr.setType(RequestConstants.REQ_CONNECTION_START);
-									ccr.setSourceEditPart(sourceEditPart);
-									sourceEditPart.getCommand(ccr);
-									ccr.setTargetEditPart(targetEditPart);
-									ccr.setType(RequestConstants.REQ_CONNECTION_END);
-									CommandProxy commandProxy = new CommandProxy(targetEditPart.getCommand(ccr));
-									compositeCommand.add(commandProxy);
+							}
+
+							if (!alreadyDisplayed) {
+								EditPart sourceEditPart = getEditPartFromView(sourceView);
+								EditPart targetEditPart = getEditPartFromView(targetView);
+
+								// If the parts are still null...
+								if (sourceEditPart == null || targetEditPart == null) {
+									return null;
 								}
-							}	
+								String semanticHint = getSemanticHint(linkToShow);
+								CreateConnectionViewRequest.ConnectionViewDescriptor viewDescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(descriptor.getSemanticAdapter(), semanticHint, ViewUtil.APPEND, false,
+										((GraphicalEditPart) getHost()).getDiagramPreferencesHint());
+								CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(viewDescriptor);
+								ccr.setType(org.eclipse.gef.RequestConstants.REQ_CONNECTION_START);
+								ccr.setSourceEditPart(sourceEditPart);
+								sourceEditPart.getCommand(ccr);
+								ccr.setTargetEditPart(targetEditPart);
+								ccr.setType(org.eclipse.gef.RequestConstants.REQ_CONNECTION_END);
+								CommandProxy commandProxy = new CommandProxy(targetEditPart.getCommand(ccr));
+								compositeCommand.add(commandProxy);
+							}
 						}
 					}
+				}
 			}
 			return compositeCommand;
 		}
 		return null;
 	}
-	
-	
 
-	
-	
 
-	
-		
-		
-	
+
+
+
 	/**
 	 * Can display existing link between views.
 	 *
-	 * @param connector the connector
-	 * @param sourceView the source view
-	 * @param targetView the target view
+	 * @param connector
+	 *            the connector
+	 * @param sourceView
+	 *            the source view
+	 * @param targetView
+	 *            the target view
 	 * @return true, if successful
 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#canDisplayExistingLinkBetweenViews(org.eclipse.uml2.uml.Connector, org.eclipse.gmf.runtime.notation.View, org.eclipse.gmf.runtime.notation.View)
 	 */
-	
-	@Override 
+
+	@Override
 	public boolean canDisplayExistingLinkBetweenViews(final EObject element, final View sourceView, final View targetView) {
 		return (element instanceof Connector) && ConnectorUtils.canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths((Connector) element, sourceView, targetView);
 	}
-	
+
 	/**
 	 * Checks if is link for views.
 	 *
-	 * @param link a connector existing in the model
-	 * @param sourceView a potential source for this connector
-	 * @param targetView a potential target for this connector
-	 * @return true, if is link for views
-	 * <code>true</code> if displaying the existing connector between this source and this target view is correct
+	 * @param link
+	 *            a connector existing in the model
+	 * @param sourceView
+	 *            a potential source for this connector
+	 * @param targetView
+	 *            a potential target for this connector
+	 * @return true, if is link for views <code>true</code> if displaying the existing connector between this source and this target view is correct
 	 */
 	public final boolean isLinkForViews(final org.eclipse.gmf.runtime.notation.Connector link, final View sourceView, final View targetView) {
 		View source = link.getSource();
 		View target = link.getTarget();
 		boolean isDrawingAllowed = source.equals(sourceView) && target.equals(targetView);
 		boolean isReverseDrawingAllowed = source.equals(targetView) && target.equals(sourceView);
-		return isDrawingAllowed || isReverseDrawingAllowed ;
-	}	
-	
-	
-	
+		return isDrawingAllowed || isReverseDrawingAllowed;
+	}
+
+
+
 	/**
 	 * Gets the top view with same semantic element.
 	 *
-	 * @param view a view
+	 * @param view
+	 *            a view
 	 * @return the last parent of this view referencing the same semantic
-	 * element
+	 *         element
 	 */
 	protected View getTopViewWithSameSemanticElement(final View view) {
 		final EObject semanticElement = view.getElement();
 		View parent = view;
 		View lastParent = view;
-		while(parent.getElement() == semanticElement) {
+		while (parent.getElement() == semanticElement) {
 			lastParent = parent;
-			parent = (View)parent.eContainer();
+			parent = (View) parent.eContainer();
 		}
 		return lastParent;
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/StructureClassifierDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/StructureClassifierDropEditPolicy.java
index 3f9ec28bbc8..f9b86223667 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/StructureClassifierDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/StructureClassifierDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -54,50 +54,50 @@ public class StructureClassifierDropEditPolicy extends CustomDragDropEditPolicy
 		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());

 

 		// Single drop management possible drop action list can be proposed

-		if(dropRequest.getObjects().size() == 1) {

+		if (dropRequest.getObjects().size() == 1) {

 

 			// List of available drop commands

 			final List<Command> commandChoice = new ArrayList<Command>();

 

 			// 1. Try to create a Part typed by the dropped object

-			Command dropAsTypedPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.PART_PROPERTY);

-			if((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {

+			Command dropAsTypedPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);

+			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {

 				commandChoice.add(dropAsTypedPart);

 			}

 

 			// 2. Try to create a Reference typed by the dropped object

-			Command dropAsTypedReference = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.REFERENCE_PROPERTY);

-			if((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {

+			Command dropAsTypedReference = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);

+			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {

 				commandChoice.add(dropAsTypedReference);

 			}

 

 			// 3. Try to create an ActorPart typed by the dropped object

-			Command dropAsTypedActorPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);

-			if((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {

+			Command dropAsTypedActorPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);

+			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {

 				commandChoice.add(dropAsTypedActorPart);

 			}

 

 			// 4. Try to create a Value typed by the dropped object

-			Command dropAsTypedValue = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.VALUE_PROPERTY);

-			if((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {

+			Command dropAsTypedValue = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);

+			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {

 				commandChoice.add(dropAsTypedValue);

 			}

 

 			// 5. Try to create a Property typed by the dropped object

-			Command dropAsTypedProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), UMLElementTypes.PROPERTY);

-			if((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {

+			Command dropAsTypedProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);

+			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {

 				commandChoice.add(dropAsTypedProperty);

 			}

 

 			// 6. Build default drop command (show view of the dropped object)

 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);

 			defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");

-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

 				commandChoice.add(defaultDropCommand);

 			}

 

 			// Prepare the selection command (if several command are available) or return the drop command

-			if(commandChoice.size() > 1) {

+			if (commandChoice.size() > 1) {

 				RunnableWithResult<ICommand> runnable;

 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {

 

@@ -110,7 +110,7 @@ public class StructureClassifierDropEditPolicy extends CustomDragDropEditPolicy
 

 				return new ICommandProxy(selectCommand);

 

-			} else if(commandChoice.size() == 1) {

+			} else if (commandChoice.size() == 1) {

 				return commandChoice.get(0);

 			}

 

@@ -121,7 +121,7 @@ public class StructureClassifierDropEditPolicy extends CustomDragDropEditPolicy
 

 		return super.getDropObjectsCommand(dropRequest);

 	}

-	

+

 	/**

 	 * {@inheritDoc}

 	 */

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/TypedElementDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/TypedElementDropEditPolicy.java
index b07c3dd4c34..d6e29cb8e40 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/TypedElementDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/TypedElementDropEditPolicy.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -30,7 +30,7 @@ import org.eclipse.ui.PlatformUI;
 

 /**

  * <pre>

- * Customization of the DND edit policy for TypedElement (Port, Part, Reference, FlowPort), that enables 

+ * Customization of the DND edit policy for TypedElement (Port, Part, Reference, FlowPort), that enables

  * type modification by a drop on target.

  * </pre>

  */

@@ -49,26 +49,26 @@ public class TypedElementDropEditPolicy extends CustomDragDropEditPolicy {
 		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());

 

 		// Single drop management possible drop action list can be proposed

-		if(dropRequest.getObjects().size() == 1) {

+		if (dropRequest.getObjects().size() == 1) {

 

 			// List of available drop commands

 			final List<Command> commandChoice = new ArrayList<Command>();

 

 			// 1. Try to set the target element type with dropped object

-			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart)getHost());

-			if((dropAsSetType != null) && (dropAsSetType.canExecute())) {

+			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart) getHost());

+			if ((dropAsSetType != null) && (dropAsSetType.canExecute())) {

 				commandChoice.add(dropAsSetType);

 			}

 

 			// 3. Build default drop command (show view of the dropped object)

 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);

 			defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");

-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {

 				commandChoice.add(defaultDropCommand);

 			}

 

 			// Prepare the selection command (if several command are available) or return the drop command

-			if(commandChoice.size() > 1) {

+			if (commandChoice.size() > 1) {

 				RunnableWithResult<ICommand> runnable;

 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {

 

@@ -80,7 +80,7 @@ public class TypedElementDropEditPolicy extends CustomDragDropEditPolicy {
 				ICommand selectCommand = runnable.getResult();

 

 				return new ICommandProxy(selectCommand);

-			} else if(commandChoice.size() == 1) {

+			} else if (commandChoice.size() == 1) {

 				return commandChoice.get(0);

 			}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/InternalBlockManageInterfacesHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/InternalBlockManageInterfacesHandler.java
index 8a4c4d2ae1d..d3a6bfd50ce 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/InternalBlockManageInterfacesHandler.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/InternalBlockManageInterfacesHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,8 +23,8 @@ import org.eclipse.uml2.uml.Usage;
 
 /**
  * <pre>
- * This handler provides the handler to manage the provided and required {@link Interface} 
- * of a {@link Port} without graphically creating {@link InterfaceRealization} and 
+ * This handler provides the handler to manage the provided and required {@link Interface}
+ * of a {@link Port} without graphically creating {@link InterfaceRealization} and
  * {@link Usage} relationships.
  * </pre>
  */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsAction.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsAction.java
index 08dd668484a..86b6498219e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsAction.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsAction.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -35,57 +35,57 @@ public class ShowHideRelatedContentsAction extends ShowHideContentsAction {
 	protected void initAction() {

 		super.initAction();

 

-		for(IGraphicalEditPart current : this.selectedElements) {

+		for (IGraphicalEditPart current : this.selectedElements) {

 			// the selected elements which aren't Classifier are ignored

-			if(((View)current.getModel()).getElement() instanceof Property) {

-				Property property = (Property)((View)current.getModel()).getElement();

-				if(property.getType() instanceof Classifier) {

-					this.representations.add(new RootEditPartRepresentation(current, (Classifier)property.getType()));

+			if (((View) current.getModel()).getElement() instanceof Property) {

+				Property property = (Property) ((View) current.getModel()).getElement();

+				if (property.getType() instanceof Classifier) {

+					this.representations.add(new RootEditPartRepresentation(current, (Classifier) property.getType()));

 				}

 			}

 		}

-		//		setEditorLabelProvider(new EditorLabelProvider());

-		//		this.representations = new ArrayList<AbstractShowHideAction.EditPartRepresentation>();

+		// setEditorLabelProvider(new EditorLabelProvider());

+		// this.representations = new ArrayList<AbstractShowHideAction.EditPartRepresentation>();

 		//

-		//		for(EditPart current : this.selectedElements) {

-		//			//the selected elements which aren't Classifier are ignored

-		//			EObject element = ((View)current.getModel()).getElement();

-		//			if(element instanceof Property) {

-		//				Type type = ((Property)element).getType();

-		//				if(type instanceof Classifier) {

-		//					this.representations.add(new CustomEditPartRepresentation(current, (Classifier)type));

-		//				}

-		//			}

-		//		}

-		//		this.setEditorLabelProvider(new CustomEditorLabelProvider());

-		//		this.setContentProvider(new CustomContentProvider());

+		// for(EditPart current : this.selectedElements) {

+		// //the selected elements which aren't Classifier are ignored

+		// EObject element = ((View)current.getModel()).getElement();

+		// if(element instanceof Property) {

+		// Type type = ((Property)element).getType();

+		// if(type instanceof Classifier) {

+		// this.representations.add(new CustomEditPartRepresentation(current, (Classifier)type));

+		// }

+		// }

+		// }

+		// this.setEditorLabelProvider(new CustomEditorLabelProvider());

+		// this.setContentProvider(new CustomContentProvider());

 

 	}

 

-	//	protected class CustomContentProvider extends ShowHideContentsAction.ContentProvider {

+	// protected class CustomContentProvider extends ShowHideContentsAction.ContentProvider {

 	//

-	//		/**

-	//		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

-	//		 * 

-	//		 * @param element

-	//		 * @return

-	//		 */

-	//		@Override

-	//		public Object getParent(Object element) {

-	//			if(!(element instanceof EditPartRepresentation)) {

-	//				EditPartRepresentation rep = findEditPartRepresentation(element);

-	//				if(rep != null) {

-	//					//element can be owned by the class (rep), or by a superclass (ClassifierRepresentation)

-	//					List<ClassifierRepresentation> classes = ((CustomEditPartRepresentation)rep).getSuperClasses();

-	//					for(ClassifierRepresentation classifierRepresentation : classes) {

-	//						if(classifierRepresentation.getRepresentedClassifier().getOwnedMembers().contains(element)) {

-	//							return classifierRepresentation;

-	//						}

-	//					}

-	//				}

-	//				return rep;

-	//			}

-	//			return null;

-	//		}

-	//	}

+	// /**

+	// * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

+	// *

+	// * @param element

+	// * @return

+	// */

+	// @Override

+	// public Object getParent(Object element) {

+	// if(!(element instanceof EditPartRepresentation)) {

+	// EditPartRepresentation rep = findEditPartRepresentation(element);

+	// if(rep != null) {

+	// //element can be owned by the class (rep), or by a superclass (ClassifierRepresentation)

+	// List<ClassifierRepresentation> classes = ((CustomEditPartRepresentation)rep).getSuperClasses();

+	// for(ClassifierRepresentation classifierRepresentation : classes) {

+	// if(classifierRepresentation.getRepresentedClassifier().getOwnedMembers().contains(element)) {

+	// return classifierRepresentation;

+	// }

+	// }

+	// }

+	// return rep;

+	// }

+	// return null;

+	// }

+	// }

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsHandler.java
index f0051553fd5..382fbcf2207 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsHandler.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsHandler.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/DeleteViewDuringMoveHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/DeleteViewDuringMoveHelperAdvice.java
index 49e2188bf80..c90492eaf8f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/DeleteViewDuringMoveHelperAdvice.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/DeleteViewDuringMoveHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -35,7 +35,7 @@ import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;
  * Edit helper advice that delete views from diagram when an element is

  * moved in a new container (in the model explorer).

  * 

- * Block is an exception as the IBD is attached to the Block itself, removing it 

+ * Block is an exception as the IBD is attached to the Block itself, removing it

  * would result in an unusable IBD.

  * </pre>

  */

@@ -50,18 +50,18 @@ public class DeleteViewDuringMoveHelperAdvice extends AbstractEditHelperAdvice {
 

 		@SuppressWarnings("unchecked")

 		Iterator<EObject> it = request.getElementsToMove().keySet().iterator();

-		while(it.hasNext()) {

+		while (it.hasNext()) {

 			EObject eObject = it.next();

 

 			// If current eObject is a Block do nothing.

-			if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(eObject)) {

+			if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(eObject)) {

 				continue;

 			}

 

 			viewsToDestroy.addAll(getViewsToDestroy(eObject));

 		}

 

-		if(!viewsToDestroy.isEmpty()) {

+		if (!viewsToDestroy.isEmpty()) {

 			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getTargetContainer(), false);

 			ddr.setClientContext(request.getClientContext());

 			ddr.addParameters(request.getParameters());

@@ -74,24 +74,24 @@ public class DeleteViewDuringMoveHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * This methods looks for inconsistent views to delete in case a semantic move done in the model explorer.

-	 * 

+	 *

 	 * @param movedObject

-	 *        the moved {@link EObject}

+	 *            the moved {@link EObject}

 	 * @return the list of {@link View} to delete

 	 */

 	protected Set<View> getViewsToDestroy(EObject movedObject) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(movedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while(viewIt.hasNext()) {

-			View view = (View)viewIt.next();

+		while (viewIt.hasNext()) {

+			View view = viewIt.next();

 

 			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

 

 			// Views are to be destroyed if they are not the diagram itself (containerType == null)

-			// and not a view directly owned by the diagram (the current policy in Papyrus allows 

+			// and not a view directly owned by the diagram (the current policy in Papyrus allows

 			// to drop nearly anything in the diagram whatever the semantic container).

-			if((containerType != null) && !ElementTypes.DIAGRAM_ID.equals(containerType)) {

+			if ((containerType != null) && !ElementTypes.DIAGRAM_ID.equals(containerType)) {

 				viewsToDestroy.add(view);

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/PropertyHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/PropertyHelperAdvice.java
index c02df0c5d5e..2b1d599b867 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/PropertyHelperAdvice.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/PropertyHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -37,22 +37,22 @@ import org.eclipse.uml2.uml.Type;
 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

- * 

+ *

  * This advice is used to remove the view of the parts which become inconsistent when we change the type of the property

- * 

+ *

  */

 public class PropertyHelperAdvice extends AbstractEditHelperAdvice {

 

 	/**

 	 * Returns the command to destroy the views of the parts which are not owned by the new type

-	 * 

+	 *

 	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeSetCommand(org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest)

-	 * 

+	 *

 	 * @param request

-	 *        the request to modify the model

+	 *            the request to modify the model

 	 * @return

 	 *         the command to destroy the views of the parts which are not owned by the new type

-	 * 

+	 *

 	 */

 	@Override

 	protected ICommand getBeforeSetCommand(SetRequest request) {

@@ -61,17 +61,17 @@ public class PropertyHelperAdvice extends AbstractEditHelperAdvice {
 

 		EObject elementToEdit = request.getElementToEdit();

 		Set<View> viewsToDelete = new HashSet<View>();

-		if((elementToEdit instanceof Property) && (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && ((request.getValue() == null) || (request.getValue() instanceof Type))) {

+		if ((elementToEdit instanceof Property) && (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && ((request.getValue() == null) || (request.getValue() instanceof Type))) {

 

-			Property propertyToEdit = (Property)elementToEdit;

+			Property propertyToEdit = (Property) elementToEdit;

 

 			oldType = propertyToEdit.getType();

-			newType = (Type)request.getValue();

+			newType = (Type) request.getValue();

 

-			if((oldType != null) && (oldType instanceof Classifier) && ((request.getValue() == null) || (newType instanceof Classifier))) {

+			if ((oldType != null) && (oldType instanceof Classifier) && ((request.getValue() == null) || (newType instanceof Classifier))) {

 

-				EList<NamedElement> newTypeMembers = (newType != null) ? ((Classifier)newType).getMembers() : new BasicEList<NamedElement>();

-				EList<NamedElement> oldTypeMembers = ((Classifier)oldType).getMembers();

+				EList<NamedElement> newTypeMembers = (newType != null) ? ((Classifier) newType).getMembers() : new BasicEList<NamedElement>();

+				EList<NamedElement> oldTypeMembers = ((Classifier) oldType).getMembers();

 

 				// Remove members of the new type from the list.

 				// oldTypeMembers now contains the list of members for which views will become

@@ -80,22 +80,22 @@ public class PropertyHelperAdvice extends AbstractEditHelperAdvice {
 				possiblyInconsistentMembers.addAll(oldTypeMembers);

 				possiblyInconsistentMembers.removeAll(newTypeMembers);

 

-				if(!possiblyInconsistentMembers.isEmpty()) {

+				if (!possiblyInconsistentMembers.isEmpty()) {

 

 					Set<View> propertyToEditViews = null;

 

 					// Parse the list of possibly inconsistent members

-					for(NamedElement possiblyInconsistentMember : possiblyInconsistentMembers) {

+					for (NamedElement possiblyInconsistentMember : possiblyInconsistentMembers) {

 

 						// Retrieve views of the current possiblyInconsistentMember

 						Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(possiblyInconsistentMember, ElementTypes.DIAGRAM_ID).iterator();

-						while(viewIt.hasNext()) {

-							if(propertyToEditViews == null) {

+						while (viewIt.hasNext()) {

+							if (propertyToEditViews == null) {

 								propertyToEditViews = CrossReferencerUtil.getCrossReferencingViews(propertyToEdit, ElementTypes.DIAGRAM_ID);

 							}

 

 							View possiblyInconsistentMemberView = viewIt.next();

-							if(isConcerned(possiblyInconsistentMemberView, propertyToEditViews)) {

+							if (isConcerned(possiblyInconsistentMemberView, propertyToEditViews)) {

 								viewsToDelete.add(possiblyInconsistentMemberView);

 							}

 						}

@@ -104,7 +104,7 @@ public class PropertyHelperAdvice extends AbstractEditHelperAdvice {
 			}

 		}

 

-		if((viewsToDelete != null) && !(viewsToDelete.isEmpty())) {

+		if ((viewsToDelete != null) && !(viewsToDelete.isEmpty())) {

 			DestroyDependentsRequest req = new DestroyDependentsRequest(request.getEditingDomain(), elementToEdit, false);

 			req.setClientContext(request.getClientContext());

 			req.addParameters(request.getParameters());

@@ -116,18 +116,18 @@ public class PropertyHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Tests if the view must be deleted

-	 * 

+	 *

 	 * @param view

-	 *        the view to test

+	 *            the view to test

 	 * @param list

-	 *        the list of the property view

+	 *            the list of the property view

 	 * @return

 	 *         <code>true</code> if the view need to be removed <code>false</code> if not

 	 */

 	protected boolean isConcerned(View view, Set<View> propertyViews) {

 

 		EObject parentView = view.eContainer();

-		if(parentView instanceof DecorationNode) {

+		if (parentView instanceof DecorationNode) {

 			parentView = parentView.eContainer();

 		}

 		return propertyViews.contains(parentView);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/messages/Messages.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/messages/Messages.java
index 4b47caf1ee0..d0d0e618f72 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/messages/Messages.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/messages/Messages.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilierUndefinedTo100.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilierUndefinedTo100.java
index 5a985eef70d..31060d40c1f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilierUndefinedTo100.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilierUndefinedTo100.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2014 CEA LIST

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -51,21 +51,21 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
 	@Override

 	public ICommand getReconcileCommand(Diagram diagram) {

 		try {

-			

+

 			CompoundCommand cc = new CompoundCommand("Update Internal Block Diagram From Undefined To 1.0.0");

-			

+

 			Command updateCommandFromUndefinedTo_081 = getUpdateCommandFromUndefinedTo_081(diagram);

 			Command updateCommandFrom081To_091 = getUpdateCommandFrom081To_091(diagram);

 			cc.append(updateCommandFromUndefinedTo_081);

 			cc.append(updateCommandFrom081To_091);

-			

+

 			return EMFtoGMFCommandWrapper.wrap(cc);

 		} catch (Exception e) {

 			Activator.log.error(e);

 			return UnexecutableCommand.INSTANCE;

 		}

 	}

-	

+

 

 	public static Command getUpdateCommandFromUndefinedTo_081(final Diagram diagram) throws Exception {

 

@@ -101,17 +101,17 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
 				List<View> portViews = new ArrayList<View>();

 

 				// Update diagram compatibility version

-				//DiagramVersioningUtils.setCompatibilityVersion(diagram, "0.8.1");

+				// DiagramVersioningUtils.setCompatibilityVersion(diagram, "0.8.1");

 

 				// Update view types

 				Iterator<EObject> it = diagram.eAllContents();

-				while(it.hasNext()) {

+				while (it.hasNext()) {

 					EObject currentEObject = it.next();

-					if(currentEObject instanceof View) {

-						View currentView = (View)currentEObject;

+					if (currentEObject instanceof View) {

+						View currentView = (View) currentEObject;

 

-						if(conversionMapping.containsKey(currentView.getType())) {

-							if(currentView.getType().equals(OldElementTypes.CLASS.getSemanticHint())) {

+						if (conversionMapping.containsKey(currentView.getType())) {

+							if (currentView.getType().equals(OldElementTypes.CLASS.getSemanticHint())) {

 								blockViews.add(currentView);

 							}

 

@@ -119,40 +119,40 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
 						}

 

 						// Port require specific conversion

-						if(currentView.getType().equals(OldElementTypes.PORT_CN.getSemanticHint()) || currentView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {

+						if (currentView.getType().equals(OldElementTypes.PORT_CN.getSemanticHint()) || currentView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {

 							portViews.add(currentView);

 						}

 					}

 				}

 

 				// Specific conversion cases

-				for(View portView : portViews) {

+				for (View portView : portViews) {

 					EObject eObject = portView.getElement();

 

-					if(((ISpecializationType)SysMLElementTypes.FLOW_PORT).getMatcher().matches(eObject)) {

+					if (((ISpecializationType) SysMLElementTypes.FLOW_PORT).getMatcher().matches(eObject)) {

 

-						if(portView.getType().equals(OldElementTypes.PORT_CN.getSemanticHint())) {

+						if (portView.getType().equals(OldElementTypes.PORT_CN.getSemanticHint())) {

 							portView.setType(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID);

 						}

 

-						if(portView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {

+						if (portView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {

 							portView.setType(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID);

 						}

 

 					} else { // if (eObject instanceof Port)

 

-						if(portView.getType().equals(OldElementTypes.PORT_CN.getSemanticHint())) {

+						if (portView.getType().equals(OldElementTypes.PORT_CN.getSemanticHint())) {

 							portView.setType(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID);

 						}

 

-						if(portView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {

+						if (portView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {

 							portView.setType(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID);

 						}

 					}

 				}

 

 				// Update settings

-				for(View blockView : blockViews) {

+				for (View blockView : blockViews) {

 					EAnnotation stereotypeAnnotation = blockView.getEAnnotation("Stereotype_Annotation");

 					blockView.getEAnnotations().remove(stereotypeAnnotation);

 				}

@@ -166,7 +166,7 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
 

 		return command;

 	}

-	

+

 	public static Command getUpdateCommandFrom081To_091(final Diagram diagram) throws Exception {

 

 		Command command = new RecordingCommand(TransactionUtil.getEditingDomain(diagram), "Diagram version updater (from 0.8.1 to 0.9.1)") {

@@ -174,7 +174,7 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
 			private Map<String, String> conversionMapping = new HashMap<String, String>();

 

 			private List<IStatus> results = new ArrayList<IStatus>();

-			

+

 			private void initializeMappings() {

 

 				conversionMapping.put(OldElementTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID, SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID);

@@ -189,34 +189,34 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
 				List<View> failedPropertyUpdates = new ArrayList<View>();

 

 				// Update diagram compatibility version

-				//DiagramVersioningUtils.setCompatibilityVersion(diagram, "0.8.1");

+				// DiagramVersioningUtils.setCompatibilityVersion(diagram, "0.8.1");

 

 				// Update view types

 				Iterator<EObject> it = diagram.eAllContents();

-				while(it.hasNext()) {

+				while (it.hasNext()) {

 					EObject currentEObject = it.next();

-					if(currentEObject instanceof View) {

-						View currentView = (View)currentEObject;

+					if (currentEObject instanceof View) {

+						View currentView = (View) currentEObject;

 						String currentViewType = currentView.getType();

-						if(conversionMapping.containsKey(currentViewType)) {

-							

+						if (conversionMapping.containsKey(currentViewType)) {

+

 							// update nested properties

-							if(OldElementTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID.equals(currentViewType)) {

+							if (OldElementTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID.equals(currentViewType)) {

 								currentView.setType(conversionMapping.get(currentView.getType()));

 								nestedPropertyViews.add(currentView);

 								// need to create child structure compartment, enven not visible

-								

+

 								Node compartment = ViewService.createNode(currentView, SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, PreferencesHint.USE_DEFAULTS);

-								if(compartment ==null) {

+								if (compartment == null) {

 									failedPropertyUpdates.add(currentView);

 								}

 							}

 						}

 					}

 				}

-				

-				if(!failedPropertyUpdates.isEmpty()) {

-					org.eclipse.papyrus.sysml.diagram.internalblock.Activator.log.warn("Impossible to create a compartment for the properties: "+failedPropertyUpdates);

+

+				if (!failedPropertyUpdates.isEmpty()) {

+					org.eclipse.papyrus.sysml.diagram.internalblock.Activator.log.warn("Impossible to create a compartment for the properties: " + failedPropertyUpdates);

 				}

 

 			}

@@ -225,13 +225,14 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
 			public boolean canUndo() {

 				return false;

 			}

-			

+

+			@Override

 			public java.util.Collection<IStatus> getResult() {

 				return results;

 			};

 		};

 

 		return command;

-	}	

-	

+	}

+

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java
index b5dee9d4723..8aef5d4843c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -22,28 +22,28 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 public class OldElementTypes extends AbstractElementTypeEnumerator {
 
 	/** CompositeDiagram :: CLASS */
-	public static final IHintedType CLASS = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_2073"); //$NON-NLS-1$
+	public static final IHintedType CLASS = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_2073"); //$NON-NLS-1$
 
 	public static final String CLASS_COMPARTMENT_STRUCTURE_HINT = "7073"; //$NON-NLS-1$
 
 	public static final String CLASS_LABEL_COMPOSITE_NAME_HINT = "5156"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: PORT_CN */
-	public static final IHintedType PORT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Port_3069"); //$NON-NLS-1$
+	public static final IHintedType PORT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Port_3069"); //$NON-NLS-1$
 
 	public static final String PORT_CN_LABEL_NAME_HINT = "5125"; //$NON-NLS-1$
 
 	public static final String PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT = "6029"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: PROPERTY_CN */
-	public static final IHintedType PROPERTY_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Property_3070"); //$NON-NLS-1$
+	public static final IHintedType PROPERTY_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Property_3070"); //$NON-NLS-1$
 
 	public static final String PROPERTY_CN_COMPARTMENT_STRUCTURE_HINT = "7077"; //$NON-NLS-1$
 
 	public static final String PROPERTY_CN_LABEL_PART_NAME_HINT = "5126"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: CONNECTOR */
-	public static final IHintedType CONNECTOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Connector_4013"); //$NON-NLS-1$
+	public static final IHintedType CONNECTOR = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Connector_4013"); //$NON-NLS-1$
 
 	public static final String CONNECTOR_LABEL_APPLIED_STEREOTYPE_HINT = "6025"; //$NON-NLS-1$
 
@@ -52,9 +52,9 @@ public class OldElementTypes extends AbstractElementTypeEnumerator {
 	public static final String CONNECTOR_LABEL_MULTIPLICITY_SOURCE_HINT = "6051"; //$NON-NLS-1$
 
 	public static final String CONNECTOR_LABEL_MULTIPLICITY_TARGET_HINT = "6052"; //$NON-NLS-1$
-	
-	
+
+
 	// 0.8.1 --> 0.9.1
-	public static final String SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID = "shape_sysml_nestedblockproperty_as_composite";//$NON-NLS-1$ 
+	public static final String SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID = "shape_sysml_nestedblockproperty_as_composite";//$NON-NLS-1$
 
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java
index 98ca7a70b1d..e1e58a22cdd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *      Christian W. Damus (CEA) - bug 410909

  *

@@ -51,7 +51,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 

 

 /**

- * 

+ *

  * @author vl222926

  *         Adapted code from generated code for UML Diagram

  *         The name of the methods are not java compliant, but it is done to be consistent with the generated classes which use the id of the elements

@@ -64,9 +64,9 @@ public class SysMLDiagramUpdater {
 	public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() {

 

 		/**

-		 * 

+		 *

 		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getSemanticChildren(org.eclipse.gmf.runtime.notation.View)

-		 * 

+		 *

 		 * @param view

 		 * @return

 		 */

@@ -75,9 +75,9 @@ public class SysMLDiagramUpdater {
 		}

 

 		/**

-		 * 

+		 *

 		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getContainedLinks(org.eclipse.gmf.runtime.notation.View)

-		 * 

+		 *

 		 * @param view

 		 * @return

 		 */

@@ -86,9 +86,9 @@ public class SysMLDiagramUpdater {
 		}

 

 		/**

-		 * 

+		 *

 		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getIncomingLinks(org.eclipse.gmf.runtime.notation.View)

-		 * 

+		 *

 		 * @param view

 		 * @return

 		 */

@@ -97,9 +97,9 @@ public class SysMLDiagramUpdater {
 		}

 

 		/**

-		 * 

+		 *

 		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getOutgoingLinks(org.eclipse.gmf.runtime.notation.View)

-		 * 

+		 *

 		 * @param view

 		 * @return

 		 */

@@ -117,91 +117,91 @@ public class SysMLDiagramUpdater {
 	}

 

 	/**

-	 * 

+	 *

 	 * @param view

-	 *        a view

+	 *            a view

 	 * @return

 	 *         the list of the incoming links for this view

 	 */

 	public static List<UpdaterLinkDescriptor> getIncomingLinks(final View view) {

-		final String id = view.getType();//TODO : could be done by the SysMLVisualIdRegistry...

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

+		final String id = view.getType();// TODO : could be done by the SysMLVisualIdRegistry...

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

 			return getPort_shape_uml_port_as_affixed_IncominkLink(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

 			return getFlowPort_shape_sysml_flowport_as_affixed_IncominkLink(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID)) {

 			return getProperty_shape_sysml_blockproperty_as_composite_IncomingLink(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID)) {

 			return getBlock_shape_sysml_block_as_composite_IncomingLink(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

 			return getDependency_link_uml_dependency_IncomingLink(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID)) {

 			return getConnector_link_uml_connector_IncomingLink(view);

 		}

-		if(id.equals(Integer.toString(CommentEditPart.VISUAL_ID))) {

+		if (id.equals(Integer.toString(CommentEditPart.VISUAL_ID))) {

 			return getComment_2109IncomingLinks(view);

 		}

-		if(id.equals(Integer.toString(CommentEditPartCN.VISUAL_ID))) {

+		if (id.equals(Integer.toString(CommentEditPartCN.VISUAL_ID))) {

 			return getComment_3097IncomingLinks(view);

 		}

-		if(id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID))) {

+		if (id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID))) {

 			return getConstraint_2114IncomingLinks(view);

 		}

-		if(id.equals(Integer.toString(ConstraintEditPartCN.VISUAL_ID))) {

+		if (id.equals(Integer.toString(ConstraintEditPartCN.VISUAL_ID))) {

 			return getConstraint_3120IncomingLinks(view);

 		}

 		return Collections.emptyList();

 	}

 

 	/**

-	 * 

+	 *

 	 * @param view

-	 *        a view

+	 *            a view

 	 * @return

 	 *         the list of the outgoing links for this view

 	 */

 	public static List<UpdaterLinkDescriptor> getOutgoingLinks(final View view) {

-		final String id = view.getType();//TODO : could be done by the SysMLVisualIdRegistry...

-		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

+		final String id = view.getType();// TODO : could be done by the SysMLVisualIdRegistry...

+		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

 			return getPort_shape_uml_port_as_affixed_OutgoingLink(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

 			return getFlowPort_shape_sysml_flowport_as_affixed_OutgoingLink(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID)) {

 			return getProperty_shape_sysml_blockproperty_as_composite_OutgoingLink(view);

 		}

-		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID)) {

+		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID)) {

 			return getBlock_shape_sysml_block_as_composite_OutgoingLink(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

 			return getDependency_link_uml_dependency_OutgoingLink(view);

 		}

-		if(id.equals(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID)) {

+		if (id.equals(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID)) {

 			return getConnector_link_uml_connector_OutgoingLink(view);

 		}

-		if(id.equals(Integer.toString(CommentEditPart.VISUAL_ID))) {

+		if (id.equals(Integer.toString(CommentEditPart.VISUAL_ID))) {

 			return getComment_2109OutgoingLinks(view);

 		}

-		if(id.equals(Integer.toString(CommentEditPartCN.VISUAL_ID))) {

+		if (id.equals(Integer.toString(CommentEditPartCN.VISUAL_ID))) {

 			return getComment_3097OutgoingLinks(view);

 		}

-		if(id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID))) {

+		if (id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID))) {

 			return getConstraint_2114OutgoingLinks(view);

 		}

-		if(id.equals(Integer.toString(ConstraintEditPartCN.VISUAL_ID))) {

+		if (id.equals(Integer.toString(ConstraintEditPartCN.VISUAL_ID))) {

 			return getConstraint_3120OutgoingLinks(view);

 		}

 		return Collections.emptyList();

 	}

 

 	private static List<UpdaterLinkDescriptor> getConnector_link_uml_connector_IncomingLink(View view) {

-		Connector modelElement = (Connector)view.getElement();

+		Connector modelElement = (Connector) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

@@ -212,14 +212,14 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getConnector_link_uml_connector_OutgoingLink(View view) {

-		Connector modelElement = (Connector)view.getElement();

+		Connector modelElement = (Connector) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		return result;

 	}

 

 	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_IncomingLink(View view) {

-		Dependency modelElement = (Dependency)view.getElement();

+		Dependency modelElement = (Dependency) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

@@ -229,7 +229,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_OutgoingLink(View view) {

-		Dependency modelElement = (Dependency)view.getElement();

+		Dependency modelElement = (Dependency) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		return result;

@@ -237,7 +237,7 @@ public class SysMLDiagramUpdater {
 

 

 	private static List<UpdaterLinkDescriptor> getComment_3097IncomingLinks(View view) {

-		Comment modelElement = (Comment)view.getElement();

+		Comment modelElement = (Comment) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

@@ -246,14 +246,14 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getComment_3097OutgoingLinks(View view) {

-		Comment modelElement = (Comment)view.getElement();

+		Comment modelElement = (Comment) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

 		return result;

 	}

 

 	private static List<UpdaterLinkDescriptor> getComment_2109IncomingLinks(View view) {

-		Comment modelElement = (Comment)view.getElement();

+		Comment modelElement = (Comment) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

@@ -262,14 +262,14 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getComment_2109OutgoingLinks(View view) {

-		Comment modelElement = (Comment)view.getElement();

+		Comment modelElement = (Comment) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

 		return result;

 	}

 

 	private static List<UpdaterLinkDescriptor> getConstraint_2114IncomingLinks(View view) {

-		Constraint modelElement = (Constraint)view.getElement();

+		Constraint modelElement = (Constraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

@@ -279,7 +279,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getConstraint_2114OutgoingLinks(View view) {

-		Constraint modelElement = (Constraint)view.getElement();

+		Constraint modelElement = (Constraint) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

@@ -287,7 +287,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getConstraint_3120IncomingLinks(View view) {

-		Constraint modelElement = (Constraint)view.getElement();

+		Constraint modelElement = (Constraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

@@ -298,7 +298,7 @@ public class SysMLDiagramUpdater {
 

 

 	private static List<UpdaterLinkDescriptor> getConstraint_3120OutgoingLinks(View view) {

-		Constraint modelElement = (Constraint)view.getElement();

+		Constraint modelElement = (Constraint) view.getElement();

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

@@ -306,7 +306,7 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_composite_IncomingLink(final View view) {

-		final Class modelElement = (Class)view.getElement();

+		final Class modelElement = (Class) view.getElement();

 		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));

@@ -316,21 +316,21 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_composite_OutgoingLink(final View view) {

-		final Class modelElement = (Class)view.getElement();

+		final Class modelElement = (Class) view.getElement();

 		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

 		return result;

 	}

 

 	/**

-	 * 

+	 *

 	 * @param view

-	 *        a view

+	 *            a view

 	 * @return

 	 *         common method to get the incoming link for a property in the SysML IBD Diagram

 	 */

 	private static List<UpdaterLinkDescriptor> getProperty_IncomingLink(final View view) {

-		final Property modelElement = (Property)view.getElement();

+		final Property modelElement = (Property) view.getElement();

 		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

@@ -341,14 +341,14 @@ public class SysMLDiagramUpdater {
 	}

 

 	/**

-	 * 

+	 *

 	 * @param view

-	 *        a view

+	 *            a view

 	 * @return

 	 *         common method to get the outgoing link for a property in the SysML IBD Diagram

 	 */

 	private static List<UpdaterLinkDescriptor> getProperty_OutgoingLink(final View view) {

-		final Property modelElement = (Property)view.getElement();

+		final Property modelElement = (Property) view.getElement();

 		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetsLinks_Connector_link_uml_connector(modelElement, crossReferencer));

@@ -359,8 +359,8 @@ public class SysMLDiagramUpdater {
 	private static Collection<? extends UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(final Element target, final CrossReferenceAdapter crossReferencer) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

 				result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));

 			}

 		}

@@ -370,8 +370,8 @@ public class SysMLDiagramUpdater {
 

 	private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Comment source) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for(Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

-			Element destination = (Element)destinations.next();

+		for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element) destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));

 		}

 		return result;

@@ -380,8 +380,8 @@ public class SysMLDiagramUpdater {
 	private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Element target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

 				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));

 			}

 		}

@@ -391,8 +391,8 @@ public class SysMLDiagramUpdater {
 

 	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Constraint source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for(Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

-			Element destination = (Element)destinations.next();

+		for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element) destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));

 		}

 		return result;

@@ -425,19 +425,19 @@ public class SysMLDiagramUpdater {
 	private static Collection<? extends UpdaterLinkDescriptor> getIncomingTypeModelFacetsLinks_Connector_link_uml_connector(final ConnectableElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getConnectorEnd_Role() || false == setting.getEObject() instanceof ConnectorEnd) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getConnectorEnd_Role() || false == setting.getEObject() instanceof ConnectorEnd) {

 				continue;

 			}

-			final ConnectorEnd connectorEnd = (ConnectorEnd)setting.getEObject();

-			if(!UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(connectorEnd.eContainer()))) {

+			final ConnectorEnd connectorEnd = (ConnectorEnd) setting.getEObject();

+			if (!UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(connectorEnd.eContainer()))) {

 				continue;

 			}

-			final Connector connector = (Connector)connectorEnd.eContainer();

+			final Connector connector = (Connector) connectorEnd.eContainer();

 

-			//FIXME : verify the path

-			for(final ConnectorEnd current : connector.getEnds()) {

-				if(current == connectorEnd) {

+			// FIXME : verify the path

+			for (final ConnectorEnd current : connector.getEnds()) {

+				if (current == connectorEnd) {

 					continue;

 				}

 				final ConnectableElement src = current.getRole();

@@ -448,28 +448,28 @@ public class SysMLDiagramUpdater {
 	}

 

 	private static Collection<? extends UpdaterLinkDescriptor> getOutgoingTypeModelFacetsLinks_Connector_link_uml_connector(final ConnectableElement source, CrossReferenceAdapter crossReferencer) {

-		//I don't know how to adapt the common case to connector, so this way works properly...

+		// I don't know how to adapt the common case to connector, so this way works properly...

 		return getIncomingTypeModelFacetsLinks_Connector_link_uml_connector(source, crossReferencer);

 	}

 

 	private static Collection<? extends UpdaterLinkDescriptor> getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for(EStructuralFeature.Setting setting : settings) {

-			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency)setting.getEObject();

-			if(!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			Dependency link = (Dependency) setting.getEObject();

+			if (!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

 

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			if(false == theSource instanceof NamedElement) {

+			if (false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement)theSource;

+			NamedElement src = (NamedElement) theSource;

 			result.add(new UpdaterLinkDescriptor(src, target, link, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Dependency_4010, -1));

 		}

 		return result;

@@ -480,37 +480,37 @@ public class SysMLDiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if(element instanceof Package) {

-				container = (Package)element;

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

 			}

 		}

-		if(container == null) {

+		if (container == null) {

 			return Collections.emptyList();

 		}

 		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

-			EObject linkObject = (EObject)links.next();

-			if(false == linkObject instanceof Dependency) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency)linkObject;

-			if(!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+			Dependency link = (Dependency) linkObject;

+			if (!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if(false == theTarget instanceof NamedElement) {

+			if (false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement)theTarget;

+			NamedElement dst = (NamedElement) theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			if(false == theSource instanceof NamedElement) {

+			if (false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement)theSource;

-			if(src != source) {

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

 				continue;

 			}

 			result.add(new UpdaterLinkDescriptor(src, dst, link, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Dependency_4010, -1));

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLVisualIDRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLVisualIDRegistry.java
index d482b9b3bbd..f71aef60794 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLVisualIDRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLVisualIDRegistry.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -20,7 +20,7 @@ import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

- * 

+ *

  * @author vl222926

  *         Adapted code for the code generated for the UML Diagrams

  */

@@ -29,105 +29,111 @@ public class SysMLVisualIDRegistry {
 	private static final String UNKNOWN = "-1"; //$NON-NLS-1$

 

 	public static String getLinkWithClassVisualID(EObject domainElement) {

-		if(domainElement == null) {

+		if (domainElement == null) {

 			return UNKNOWN;

 		}

-		if(UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(domainElement.eClass())) {

+		if (UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(domainElement.eClass())) {

 			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;

 		}

-		//		if(UMLPackage.eINSTANCE.getAssociationClass().isSuperTypeOf(domainElement.eClass())) {

-		//			return AssociationClassLinkEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-		//			return AssociationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-		//			return AssociationBranchEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

-		//			return GeneralizationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

-		//			return InterfaceRealizationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

-		//			return SubstitutionEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

-		//			return RealizationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

-		//			return AbstractionEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

-		//			return UsageEditPart.VISUAL_ID;

-		//		}

-		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

+		// if(UMLPackage.eINSTANCE.getAssociationClass().isSuperTypeOf(domainElement.eClass())) {

+		// return AssociationClassLinkEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

+		// return AssociationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

+		// return AssociationBranchEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

+		// return GeneralizationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

+		// return InterfaceRealizationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

+		// return SubstitutionEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

+		// return RealizationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

+		// return AbstractionEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

+		// return UsageEditPart.VISUAL_ID;

+		// }

+		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

 			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;

 		}

-		//		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

-		//			return DependencyBranchEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {

-		//			return ElementImportEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) {

-		//			return PackageImportEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getPackageMerge().isSuperTypeOf(domainElement.eClass())) {

-		//			return PackageMergeEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) {

-		//			return ProfileApplicationEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getTemplateBinding().isSuperTypeOf(domainElement.eClass())) {

-		//			return TemplateBindingEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getGeneralizationSet().isSuperTypeOf(domainElement.eClass())) {

-		//			return GeneralizationSetEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-		//			return InstanceSpecificationLinkEditPart.VISUAL_ID;

-		//		}

-		//		if(UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

-		//			return InformationFlowEditPart.VISUAL_ID;

-		//		}

+		// if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

+		// return DependencyBranchEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {

+		// return ElementImportEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) {

+		// return PackageImportEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getPackageMerge().isSuperTypeOf(domainElement.eClass())) {

+		// return PackageMergeEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) {

+		// return ProfileApplicationEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getTemplateBinding().isSuperTypeOf(domainElement.eClass())) {

+		// return TemplateBindingEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getGeneralizationSet().isSuperTypeOf(domainElement.eClass())) {

+		// return GeneralizationSetEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

+		// return InstanceSpecificationLinkEditPart.VISUAL_ID;

+		// }

+		// if(UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

+		// return InformationFlowEditPart.VISUAL_ID;

+		// }

 		return UNKNOWN;

 	}

 

-	//TODO : this class as not been tested...

+	// TODO : this class as not been tested...

 	public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {

 

 		public String getVisualIDAsString(final View view) {

 			return view.getType();

 		}

 

-		public int getVisualID(View view) {//TODO : not useful with sysml, because we are using String!

+		@Override

+		public int getVisualID(View view) {// TODO : not useful with sysml, because we are using String!

 			final String type = view.getType();

 			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view);

 		}

 

 

+		@Override

 		public String getModelID(View view) {

 			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(view);

 		}

 

 

+		@Override

 		public int getNodeVisualID(View containerView, EObject domainElement) {

 			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

 		}

 

 

+		@Override

 		public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

 			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

 		}

 

 

+		@Override

 		public boolean isCompartmentVisualID(int visualID) {

 			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isCompartmentVisualID(visualID);

 		}

 

 

+		@Override

 		public boolean isSemanticLeafVisualID(int visualID) {

 			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isSemanticLeafVisualID(visualID);

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockPropertyCompositePreferencePage.java
index 36f363ca8a1..11ba36d852a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockPropertyCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockPropertyCompositePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -27,7 +27,7 @@ public class BlockPropertyCompositePreferencePage extends AbstractPreferencePage
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		CustomBlockPropertyCompositePreferencePage.initDefaults(store);
-		/*CustomNestedBlockPropertyCompositePreferencePage.initDefaults(store);*/
+		/* CustomNestedBlockPropertyCompositePreferencePage.initDefaults(store); */
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java
index 147f49b4eb9..4b0f5df8347 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java
@@ -70,13 +70,13 @@ public class CustomBlockPropertyCompositePreferencePage extends InternalBlockDia
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -87,7 +87,7 @@ public class CustomBlockPropertyCompositePreferencePage extends InternalBlockDia
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -97,7 +97,7 @@ public class CustomBlockPropertyCompositePreferencePage extends InternalBlockDia
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java
index 79ee770ade3..519f2418b64 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java
index 33260a76b51..0f0eff9a4ac 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -25,6 +25,7 @@ import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
  */

 public class CustomPreferenceInitializer extends InternalBlockDiagramPreferenceInitializer {

 

+	@Override

 	protected IPreferenceStore getPreferenceStore() {

 		return Activator.getInstance().getPreferenceStore();

 	}

@@ -58,11 +59,11 @@ public class CustomPreferenceInitializer extends InternalBlockDiagramPreferenceI
 

 	/**

 	 * Initialize default position of a link label in preferences.

-	 * 

+	 *

 	 * @param parentGraphicalType

-	 *        the graphical type of the view owning the label

+	 *            the graphical type of the view owning the label

 	 * @param graphicalType

-	 *        the graphical type of the label

+	 *            the graphical type of the label

 	 * @param x

 	 * @param y

 	 */

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ActionStateSourceProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ActionStateSourceProvider.java
index 614dc54fe76..c8f11aeb056 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ActionStateSourceProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ActionStateSourceProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -20,7 +20,7 @@ import org.eclipse.ui.ISources;
 /**

  * This class provides the state of the actions. It's used to refresh

  * the status of these actions in the menu. (in toolbar and popup, it's not needed)

- * 

+ *

  * To get the status, we listen the selection service AND the part service!

  * The part service is used to know if the selection is in the Model Explorer or not!

  * When the selection is not in the model explorer, the handlers listening the variable need to be disabled

@@ -33,9 +33,9 @@ public class ActionStateSourceProvider extends AbstractActionStateSourceProvider
 	public static final String SHOW_HIDE_RELATED_CONTENTS = "showHideRelatedContents"; //$NON-NLS-1$

 

 	/**

-	 * 

+	 *

 	 * Constructor.

-	 * 

+	 *

 	 */

 	public ActionStateSourceProvider() {

 		super();

@@ -43,14 +43,14 @@ public class ActionStateSourceProvider extends AbstractActionStateSourceProvider
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.ui.ISourceProvider#getProvidedSourceNames()

-	 * 

+	 *

 	 * @return

 	 */

 	@Override

 	public String[] getProvidedSourceNames() {

-		return new String[]{ SHOW_HIDE_RELATED_CONTENTS };

+		return new String[] { SHOW_HIDE_RELATED_CONTENTS };

 	}

 

 	/**

@@ -60,7 +60,7 @@ public class ActionStateSourceProvider extends AbstractActionStateSourceProvider
 		String oldState = currentState.get(SHOW_HIDE_RELATED_CONTENTS);

 		String newState = (testShowHideRelatedContents() ? ENABLED : DISABLED);

 

-		if(oldState != newState) {

+		if (oldState != newState) {

 			currentState.put(SHOW_HIDE_RELATED_CONTENTS, newState);

 			fireSourceChanged(ISources.WORKBENCH, currentState);

 		}

@@ -68,7 +68,7 @@ public class ActionStateSourceProvider extends AbstractActionStateSourceProvider
 

 	/**

 	 * Tests if the action DeleteFromDiagram (now called Delete Selected Element can be executed

-	 * 

+	 *

 	 * @return

 	 *         <code>true</code> if the action DeleteFromDiagram (now called Delete Selected Element can be executed <code>false</code> if not

 	 */

@@ -78,9 +78,9 @@ public class ActionStateSourceProvider extends AbstractActionStateSourceProvider
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.diagram.common.providers.AbstractActionStateSourceProvider#refreshActions()

-	 * 

+	 *

 	 */

 	@Override

 	protected void refreshActions() {

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPolicyProvider.java
index cbea8345885..68fa592e5b9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPolicyProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPolicyProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -60,37 +60,37 @@ public class CustomEditPolicyProvider extends InternalBlockDiagramEditPolicyProv
 	@Override

 	public boolean provides(IOperation operation) {

 

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;

-		if(!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {

+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

+		if (!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {

 			return false;

 		}

 

 		// Make sure this concern Internal Block Diagram only

-		IGraphicalEditPart gep = (IGraphicalEditPart)epOperation.getEditPart();

+		IGraphicalEditPart gep = (IGraphicalEditPart) epOperation.getEditPart();

 		String diagramType = gep.getNotationView().getDiagram().getType();

-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

 			return false;

 		}

 

 		// provides for the main diagram edit part

-		if(gep instanceof InternalBlockDiagramEditPart) {

+		if (gep instanceof InternalBlockDiagramEditPart) {

 			return true;

 		}

 

 		// Provides for edit parts that represent nodes in Internal Block diagram

-		if(gep instanceof AbstractElementEditPart) {

+		if (gep instanceof AbstractElementEditPart) {

 			return true;

 		}

-		if(gep instanceof AbstractElementBorderEditPart) {

+		if (gep instanceof AbstractElementBorderEditPart) {

 			return true;

 		}

 

 		// Provides for edit parts that represent edges in Internal Block diagram

-		if(gep instanceof AbstractElementLinkEditPart) {

+		if (gep instanceof AbstractElementLinkEditPart) {

 			return true;

 		}

 

-		if(gep instanceof ResizableCompartmentEditPart) {

+		if (gep instanceof ResizableCompartmentEditPart) {

 			return true;

 		}

 

@@ -101,38 +101,38 @@ public class CustomEditPolicyProvider extends InternalBlockDiagramEditPolicyProv
 	public void createEditPolicies(EditPart editPart) {

 		super.createEditPolicies(editPart);

 

-		if(editPart instanceof InternalBlockDiagramEditPart) {

+		if (editPart instanceof InternalBlockDiagramEditPart) {

 			editPart.installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDropEditPolicy());

-			// no installation of other policies. 

+			// no installation of other policies.

 			return;

 		}

 

 		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());

 

-		if((editPart instanceof ConstraintEditPart) || (editPart instanceof ConstraintEditPartCN)) {

+		if ((editPart instanceof ConstraintEditPart) || (editPart instanceof ConstraintEditPartCN)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		}

 

-		if((editPart instanceof CommentEditPart) || (editPart instanceof CommentEditPartCN)) {

+		if ((editPart instanceof CommentEditPart) || (editPart instanceof CommentEditPartCN)) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		}

 

-		if(editPart instanceof FlowPortAffixedNodeEditPart) {

+		if (editPart instanceof FlowPortAffixedNodeEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new TypedElementDropEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof PortAffixedNodeEditPart) {

+		if (editPart instanceof PortAffixedNodeEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new TypedElementDropEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof BlockPropertyCompositeEditPart) {

+		if (editPart instanceof BlockPropertyCompositeEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyCompositeDropEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockPropertyCompositeSemanticEditPolicy());

 		}

@@ -144,29 +144,29 @@ public class CustomEditPolicyProvider extends InternalBlockDiagramEditPolicyProv
 		 * }

 		 */

 

-		if(editPart instanceof BlockPropertyStructureCompartmentEditPart) {

+		if (editPart instanceof BlockPropertyStructureCompartmentEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy());

 			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());

 		}

 

-		if(editPart instanceof BlockCompositeEditPart) {

+		if (editPart instanceof BlockCompositeEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new EncapsulatedClassifierDropEditPolicy());

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockCompositeSemanticEditPolicy());

 		}

 

-		if(editPart instanceof StructureCompartmentEditPart) {

+		if (editPart instanceof StructureCompartmentEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new StructureClassifierDropEditPolicy());

 			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());

 		}

 

-		if(editPart instanceof DependencyEditPart) {

+		if (editPart instanceof DependencyEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

 

-		if(editPart instanceof ConnectorEditPart) {

+		if (editPart instanceof ConnectorEditPart) {

 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

 		}

-		

+

 

 	}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ParserProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ParserProvider.java
index db666d79495..3e1843019d3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ParserProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ParserProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -57,10 +57,10 @@ public class ParserProvider extends AbstractProvider implements IParserProvider
 	 * {@inheritDoc}

 	 */

 	public boolean provides(IOperation operation) {

-		if(operation instanceof GetParserOperation) {

-			IAdaptable hint = ((GetParserOperation)operation).getHint();

+		if (operation instanceof GetParserOperation) {

+			IAdaptable hint = ((GetParserOperation) operation).getHint();

 

-			if(!ElementTypes.DIAGRAM_ID.equals(getDiagramType(hint))) {

+			if (!ElementTypes.DIAGRAM_ID.equals(getDiagramType(hint))) {

 				return false;

 			}

 

@@ -73,18 +73,18 @@ public class ParserProvider extends AbstractProvider implements IParserProvider
 	 * {@inheritDoc}

 	 */

 	public IParser getParser(IAdaptable hint) {

-		String parserHint = (String)hint.getAdapter(String.class);

-		if(parserHint != null) {

+		String parserHint = (String) hint.getAdapter(String.class);

+		if (parserHint != null) {

 			IParser parser = graphicalHintToParser.get(parserHint);

-			if(parser != null) {

+			if (parser != null) {

 				return parser;

 			}

 		}

 

-		View view = (View)hint.getAdapter(View.class);

-		if(view != null) {

+		View view = (View) hint.getAdapter(View.class);

+		if (view != null) {

 			IParser parser = graphicalHintToParser.get(view.getType());

-			if(parser != null) {

+			if (parser != null) {

 				return parser;

 			}

 		}

@@ -93,8 +93,8 @@ public class ParserProvider extends AbstractProvider implements IParserProvider
 	}

 

 	private String getDiagramType(IAdaptable hint) {

-		Diagram diagram = (Diagram)hint.getAdapter(Diagram.class);

-		if(diagram != null) {

+		Diagram diagram = (Diagram) hint.getAdapter(Diagram.class);

+		if (diagram != null) {

 			return diagram.getType();

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationDecoratorProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationDecoratorProvider.java
index a3b352d5db8..12ee0edc5db 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationDecoratorProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationDecoratorProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -28,32 +28,34 @@ import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
 

 public class ValidationDecoratorProvider extends org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider implements IDecoratorProvider {

 

+	@Override

 	public void createDecorators(IDecoratorTarget decoratorTarget) {

-		EditPart editPart = (EditPart)decoratorTarget.getAdapter(EditPart.class);

-		if(editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

+		EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class);

+		if (editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

 			Object model = editPart.getModel();

-			if((model instanceof View)) {

-				View view = (View)model;

-				if(!(view instanceof Edge) && !view.isSetElement()) {

+			if ((model instanceof View)) {

+				View view = (View) model;

+				if (!(view instanceof Edge) && !view.isSetElement()) {

 					return;

 				}

 			}

 			EditDomain ed = editPart.getViewer().getEditDomain();

-			if(!(ed instanceof DiagramEditDomain)) {

+			if (!(ed instanceof DiagramEditDomain)) {

 				return;

 			}

-			if(((DiagramEditDomain)ed).getEditorPart() instanceof UmlGmfDiagramEditor) {

+			if (((DiagramEditDomain) ed).getEditorPart() instanceof UmlGmfDiagramEditor) {

 				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

 			}

 		}

 	}

 

+	@Override

 	public boolean provides(IOperation operation) {

-		if(!(operation instanceof CreateDecoratorsOperation)) {

+		if (!(operation instanceof CreateDecoratorsOperation)) {

 			return false;

 		}

-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation)operation).getDecoratorTarget();

-		View view = (View)decoratorTarget.getAdapter(View.class);

+		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();

+		View view = (View) decoratorTarget.getAdapter(View.class);

 		return view != null && ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType());

 	}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationProvider.java
index cef97df55aa..124bd97eadd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -38,7 +38,7 @@ public class ValidationProvider {
 				}

 			}

 		};

-		if(editingDomain != null) {

+		if (editingDomain != null) {

 			try {

 				editingDomain.runExclusive(task);

 			} catch (Exception e) {

@@ -50,11 +50,11 @@ public class ValidationProvider {
 	}

 

 	static boolean isInDefaultEditorContext(Object object) {

-		if(shouldConstraintsBePrivate() && !constraintsActive) {

+		if (shouldConstraintsBePrivate() && !constraintsActive) {

 			return false;

 		}

-		if(object instanceof View) {

-			return constraintsActive && ElementTypes.DIAGRAM_ID.equals(((View)object).getDiagram().getType());

+		if (object instanceof View) {

+			return constraintsActive && ElementTypes.DIAGRAM_ID.equals(((View) object).getDiagram().getType());

 		}

 		return true;

 	}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/ui/InternalBlockInterfaceManagerDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/ui/InternalBlockInterfaceManagerDialog.java
index 4c835596ad9..ca7ea88656e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/ui/InternalBlockInterfaceManagerDialog.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/ui/InternalBlockInterfaceManagerDialog.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
  * <pre>
- * This class provides a Dialog to manage easily the provided and 
+ * This class provides a Dialog to manage easily the provided and
  * the required Interfaces for a {@link Port}.
  * </pre>
  */
@@ -49,24 +49,25 @@ public class InternalBlockInterfaceManagerDialog extends InterfaceManagerDialog
 
 	/**
 	 * Returns all the available Interfaces (except {@link FlowSpecification})
-	 * 
+	 *
 	 * @return
 	 *         all the available Interfaces
 	 *         //TODO add the interfaces from the package import!
 	 */
+	@Override
 	protected List<Interface> getAllAvailableInterfaces(Package pack) {
 		Set<Interface> otherInterfaces = new HashSet<Interface>();
 		List<Element> interfaces = Visitor.getOwnedAndImportedElement(pack, Interface.class);
-		for(Namespace namespace : Visitor.getOwnedAndImportedNamespaces(pack)) {
+		for (Namespace namespace : Visitor.getOwnedAndImportedNamespaces(pack)) {
 			interfaces.addAll(Visitor.getOwnedAndImportedElement(namespace, Interface.class));
 
 		}
 
-		for(Element element : interfaces) {
+		for (Element element : interfaces) {
 			// Test if the interface is a FlowSpecification
 			FlowSpecification flowSpec = UMLUtil.getStereotypeApplication(element, FlowSpecification.class);
-			if(flowSpec == null) {
-				otherInterfaces.add((Interface)element);
+			if (flowSpec == null) {
+				otherInterfaces.add((Interface) element);
 			}
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java
index e662f87e867..588e79cc3f3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -62,37 +62,37 @@ public class BlockDropHelper extends ElementHelper {
 

 	public Command getDropAsStructureItemOnPart(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {

 		String label = "";

-		if(elementType == SysMLElementTypes.PART_PROPERTY) {

+		if (elementType == SysMLElementTypes.PART_PROPERTY) {

 			label = "Create a new Part";

 		}

-		if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

+		if (elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

 			label = "Create a new Reference";

 		}

-		if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

+		if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

 			label = "Create a new ActorPart";

 		}

-		if(elementType == SysMLElementTypes.VALUE_PROPERTY) {

+		if (elementType == SysMLElementTypes.VALUE_PROPERTY) {

 			label = "Create a new Value";

 		}

-		if(elementType == UMLElementTypes.PROPERTY) {

+		if (elementType == UMLElementTypes.PROPERTY) {

 			label = "Create a new Property";

 		}

 		CompoundCommand cc = new CompoundCommand(label);

 

 		Object droppedEObject = request.getObjects().get(0);

-		if(!isValidStructureItemType(droppedEObject, elementType)) {

+		if (!isValidStructureItemType(droppedEObject, elementType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		// Verify target nature

 		EObject target = getHostEObject(host);

-		if((!(target instanceof TypedElement)) || (((TypedElement)target).getType() == null)) {

+		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		// The target type has to be a Block (will hold the created Port)

-		Type targetType = ((TypedElement)target).getType();

-		if(!((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {

+		Type targetType = ((TypedElement) target).getType();

+		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

@@ -103,13 +103,13 @@ public class BlockDropHelper extends ElementHelper {
 		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, elementType);

 		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);

-		if(provider != null) {

+		if (provider != null) {

 			createElementCommand = provider.getEditCommand(createElementRequest);

 		}

 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -119,8 +119,8 @@ public class BlockDropHelper extends ElementHelper {
 		cc.add(viewCreateCommand);

 

 		final Object value = request.getExtendedData().get(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT);

-		if(value instanceof Boolean && Boolean.TRUE.equals(value)) {

-			DeferredSnapToGridCommand snapCommand = new DeferredSnapToGridCommand(getEditingDomain(), Collections.singletonList(descriptor),  host);

+		if (value instanceof Boolean && Boolean.TRUE.equals(value)) {

+			DeferredSnapToGridCommand snapCommand = new DeferredSnapToGridCommand(getEditingDomain(), Collections.singletonList(descriptor), host);

 			cc.add(new ICommandProxy(snapCommand));

 		}

 

@@ -129,25 +129,25 @@ public class BlockDropHelper extends ElementHelper {
 

 	public Command getDropAsStructureItem(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {

 		String label = "";

-		if(elementType == SysMLElementTypes.PART_PROPERTY) {

+		if (elementType == SysMLElementTypes.PART_PROPERTY) {

 			label = "Create a new Part";

 		}

-		if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

+		if (elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

 			label = "Create a new Reference";

 		}

-		if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

+		if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

 			label = "Create a new ActorPart";

 		}

-		if(elementType == SysMLElementTypes.VALUE_PROPERTY) {

+		if (elementType == SysMLElementTypes.VALUE_PROPERTY) {

 			label = "Create a new Value";

 		}

-		if(elementType == UMLElementTypes.PROPERTY) {

+		if (elementType == UMLElementTypes.PROPERTY) {

 			label = "Create a new Property";

 		}

 		CompoundCommand cc = new CompoundCommand(label);

 

 		Object droppedEObject = request.getObjects().get(0);

-		if(!isValidStructureItemType(droppedEObject, elementType)) {

+		if (!isValidStructureItemType(droppedEObject, elementType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

@@ -158,25 +158,25 @@ public class BlockDropHelper extends ElementHelper {
 		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), elementType);

 		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));

-		if(provider != null) {

+		if (provider != null) {

 			createElementCommand = provider.getEditCommand(createElementRequest);

 		}

 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());

 		Command viewCreateCommand = host.getCommand(createViewRequest);

 

-	

+

 		// 3. Create the compound command

 		cc.add(new ICommandProxy(createElementCommand));

 		cc.add(viewCreateCommand);

 

 		final Object value = request.getExtendedData().get(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT);

-		if(value instanceof Boolean && Boolean.TRUE.equals(value)) {

-			DeferredSnapToGridCommand snapCommand = new DeferredSnapToGridCommand(getEditingDomain(), Collections.singletonList(descriptor),  host);

+		if (value instanceof Boolean && Boolean.TRUE.equals(value)) {

+			DeferredSnapToGridCommand snapCommand = new DeferredSnapToGridCommand(getEditingDomain(), Collections.singletonList(descriptor), host);

 			cc.add(new ICommandProxy(snapCommand));

 		}

 

@@ -186,29 +186,29 @@ public class BlockDropHelper extends ElementHelper {
 	private boolean isValidStructureItemType(Object object, IElementType elementType) {

 		boolean isValid = false;

 

-		if((object != null) && (object instanceof Type) && !(object instanceof Association)) {

+		if ((object != null) && (object instanceof Type) && !(object instanceof Association)) {

 

-			Type type = (Type)object;

-			if((elementType == SysMLElementTypes.PART_PROPERTY) || (elementType == SysMLElementTypes.REFERENCE_PROPERTY)) {

-				if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(type)) {

+			Type type = (Type) object;

+			if ((elementType == SysMLElementTypes.PART_PROPERTY) || (elementType == SysMLElementTypes.REFERENCE_PROPERTY)) {

+				if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {

 					isValid = true;

 				}

 			}

-			if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

-				if(type instanceof Actor) {

+			if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

+				if (type instanceof Actor) {

 					isValid = true;

 				}

 			}

-			if(elementType == SysMLElementTypes.VALUE_PROPERTY) {

-				if(((ISpecializationType)SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type) || (type instanceof DataType)) {

+			if (elementType == SysMLElementTypes.VALUE_PROPERTY) {

+				if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type) || (type instanceof DataType)) {

 					isValid = true;

 				}

 			}

-			if(elementType == UMLElementTypes.PROPERTY) {

-				if(!((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(type)

-					&& !(type instanceof Actor)

-					&& !(type instanceof DataType)

-					&& !((ISpecializationType)SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {

+			if (elementType == UMLElementTypes.PROPERTY) {

+				if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)

+						&& !(type instanceof Actor)

+						&& !(type instanceof DataType)

+						&& !((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {

 					isValid = true;

 				}

 			}

@@ -220,10 +220,10 @@ public class BlockDropHelper extends ElementHelper {
 	/**

 	 * return the host Edit Part's semantic element, if the semantic element

 	 * is <code>null</code> or unresolvable it will return <code>null</code>

-	 * 

+	 *

 	 * @return EObject

 	 */

 	protected EObject getHostEObject(GraphicalEditPart host) {

-		return ViewUtil.resolveSemanticElement((View)host.getModel());

+		return ViewUtil.resolveSemanticElement((View) host.getModel());

 	}

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java
index ceb111244de..1fec49d594d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -40,40 +40,40 @@ public class FixPortsLocationOnOpening {
 
 	/**
 	 * This method fix the diagram Port and FlowPort locations.
-	 * 
+	 *
 	 * @param diagram
-	 *        the diagram
+	 *            the diagram
 	 */
 	public void fix(Diagram diagram) {
 
 		// Parse diagram content
 		Iterator<EObject> it = diagram.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject current = it.next();
 
 			// Select Port and FlowPorts
-			if(!(current instanceof Shape)) {
+			if (!(current instanceof Shape)) {
 				continue;
 			}
-			
-			Shape portView = (Shape)current;
+
+			Shape portView = (Shape) current;
 			String currentType = portView.getType();
-			if(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(currentType) || UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(currentType)) {
+			if (SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(currentType) || UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(currentType)) {
 
 				int borderItemOffset = 10;
 				View parentView = ViewUtil.getViewContainer(portView);
-				
-				if (parentView instanceof Shape){
-					Shape parentShape = (Shape)parentView;
-					
-					Bounds portViewBounds = (Bounds)portView.getLayoutConstraint();
-					Bounds parentViewBounds = (Bounds)parentShape.getLayoutConstraint();
+
+				if (parentView instanceof Shape) {
+					Shape parentShape = (Shape) parentView;
+
+					Bounds portViewBounds = (Bounds) portView.getLayoutConstraint();
+					Bounds parentViewBounds = (Bounds) parentShape.getLayoutConstraint();
 
 					final Rectangle portBounds = new Rectangle(portViewBounds.getX(), portViewBounds.getY(), portViewBounds.getWidth(), portViewBounds.getHeight());
 
 					int parentWidth = parentViewBounds.getWidth();
 					int parentHeight = parentViewBounds.getHeight();
-					if((parentWidth == -1) && (parentHeight == -1)) {
+					if ((parentWidth == -1) && (parentHeight == -1)) {
 						// warning the size may not be set in notation (default size), in such a case get default size from preferences.
 						String parentPrefKey = ElementTypes.DIAGRAM_ID + "_" + parentShape.getType();
 						parentWidth = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.WIDTH));
@@ -85,7 +85,7 @@ public class FixPortsLocationOnOpening {
 					final Rectangle validLocation = PortPositionLocatorUtils.getBorderLocation(parentBounds, portBounds, borderItemOffset);
 
 					// Fix when current location is not the valid location (only possible if parent size is set)
-					if((!portBounds.equals(validLocation)) && (parentViewBounds.getWidth() != -1) && (parentViewBounds.getHeight() != -1)) {
+					if ((!portBounds.equals(validLocation)) && (parentViewBounds.getWidth() != -1) && (parentViewBounds.getHeight() != -1)) {
 
 						TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(diagram);
 						Command fixCommand = new FixLocationCommand(editingDomain, "Fix Port location on opening", portViewBounds, validLocation);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/InternalBlockDiagramTester.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/InternalBlockDiagramTester.java
index e6a70b3dfd5..1db1f6b8558 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/InternalBlockDiagramTester.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/InternalBlockDiagramTester.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -36,9 +36,9 @@ public class InternalBlockDiagramTester extends PropertyTester {
 	public static final String IS_FLOW_PORT = "isFlowPort"; //$NON-NLS-1$

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)

-	 * 

+	 *

 	 * @param receiver

 	 * @param property

 	 * @param args

@@ -46,28 +46,28 @@ public class InternalBlockDiagramTester extends PropertyTester {
 	 * @return

 	 */

 	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

-		if(IS_FLOW_PORT.equals(property) && receiver instanceof ISelection) {

-			return testFlowPort((ISelection)receiver, expectedValue);

+		if (IS_FLOW_PORT.equals(property) && receiver instanceof ISelection) {

+			return testFlowPort((ISelection) receiver, expectedValue);

 		}

 		return false;

 	}

 

 	/**

 	 * Tests if the current port is stereotyped with "SysML::PortAndFlows::FlowPort"

-	 * 

+	 *

 	 * @param selection

-	 *        the current selection

+	 *            the current selection

 	 * @return

 	 *         <code>true</code> if a Port is stereotyped with "SysML::PortAndFlows::FlowPort"

 	 */

 	protected boolean testFlowPort(ISelection selection, Object expectedValue) {

-		if(selection instanceof StructuredSelection && expectedValue != null) {

+		if (selection instanceof StructuredSelection && expectedValue != null) {

 			@SuppressWarnings("unchecked")

-			Iterator<Object> iter = ((StructuredSelection)selection).iterator();

-			while(iter.hasNext()) {

+			Iterator<Object> iter = ((StructuredSelection) selection).iterator();

+			while (iter.hasNext()) {

 				Object current = iter.next();

-				if(current instanceof IAdaptable) {

-					Element port = (Element)((IAdaptable)current).getAdapter(Element.class);

+				if (current instanceof IAdaptable) {

+					Element port = (Element) ((IAdaptable) current).getAdapter(Element.class);

 					FlowPort fp = UMLUtil.getStereotypeApplication(port, FlowPort.class);

 					boolean value = fp != null;

 					return expectedValue.equals(value);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java
index ffb8ea0522d..00c9b708f46 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -44,12 +44,12 @@ public class PartDropHelper extends ElementHelper {
 	public Command getDropPartOnPart(DropObjectsRequest request, GraphicalEditPart host) {

 

 		Object droppedEObject = request.getObjects().get(0);

-		if(!isValidPart(droppedEObject, getHostEObject(host))) {

+		if (!isValidPart(droppedEObject, getHostEObject(host))) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		// Prepare the view creation command

-		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter((EObject)droppedEObject, null), Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter((EObject) droppedEObject, null), Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -61,14 +61,14 @@ public class PartDropHelper extends ElementHelper {
 		boolean isValid = false;

 

 		// The drop object is supposed to be a Property

-		if((object != null) && (object instanceof Property) && !(object instanceof Port)) {

+		if ((object != null) && (object instanceof Property) && !(object instanceof Port)) {

 

 			// The dropTarget has to be a TypedElement with a non-null Type

-			if((dropTarget != null) && (dropTarget instanceof TypedElement) && (((TypedElement)dropTarget).getType() != null)) {

+			if ((dropTarget != null) && (dropTarget instanceof TypedElement) && (((TypedElement) dropTarget).getType() != null)) {

 

-				Type targetType = ((TypedElement)dropTarget).getType();

-				// The dropped object is owned by the target type 

-				if(((Property)object).eContainer() == targetType) {

+				Type targetType = ((TypedElement) dropTarget).getType();

+				// The dropped object is owned by the target type

+				if (((Property) object).eContainer() == targetType) {

 					isValid = true;

 				}

 			}

@@ -80,10 +80,10 @@ public class PartDropHelper extends ElementHelper {
 	/**

 	 * return the host Edit Part's semantic element, if the semantic element

 	 * is <code>null</code> or unresolvable it will return <code>null</code>

-	 * 

+	 *

 	 * @return EObject

 	 */

 	protected EObject getHostEObject(GraphicalEditPart host) {

-		return ViewUtil.resolveSemanticElement((View)host.getModel());

+		return ViewUtil.resolveSemanticElement((View) host.getModel());

 	}

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java
index e47a6634507..152f25adce9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -45,21 +45,21 @@ public class PortDropHelper extends ElementHelper {
 	public Command getDropPortOnPart(DropObjectsRequest request, GraphicalEditPart host) {
 
 		Object droppedEObject = request.getObjects().get(0);
-		if(!isValidPort(droppedEObject, getHostEObject(host))) {
+		if (!isValidPort(droppedEObject, getHostEObject(host))) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
-		return getDropPortOnPart((Port)droppedEObject, request.getLocation().getCopy(), host);
+		return getDropPortOnPart((Port) droppedEObject, request.getLocation().getCopy(), host);
 	}
 
 	public Command getDropPortOnPart(Port droppedPort, Point location, GraphicalEditPart host) {
 
-		if(!isValidPort(droppedPort, getHostEObject(host))) {
+		if (!isValidPort(droppedPort, getHostEObject(host))) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		// Prepare the view creation command
-		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter((EObject)droppedPort, null), Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
+		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter(droppedPort, null), Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
 		createViewRequest.setLocation(location);
 		Command viewCreateCommand = host.getCommand(createViewRequest);
@@ -71,19 +71,19 @@ public class PortDropHelper extends ElementHelper {
 		boolean isValid = false;
 
 		// The drop object is supposed to be a Port (or FlowPort)
-		if((object != null) && (object instanceof Port)) {
+		if ((object != null) && (object instanceof Port)) {
 
 			Port port = (Port) object;
 			// The dropTarget has to be a TypedElement with a non-null Type
-			if((dropTarget != null) && (dropTarget instanceof TypedElement) && (((TypedElement)dropTarget).getType() != null)) {
-
-				Type targetType = ((TypedElement)dropTarget).getType();
-				// The dropped object is owned by the target type 
-				
-				 if (targetType instanceof Classifier){
-					 Classifier classifier = (Classifier) targetType;
-					 isValid =  classifier.getAllAttributes().contains(port);
-				 }
+			if ((dropTarget != null) && (dropTarget instanceof TypedElement) && (((TypedElement) dropTarget).getType() != null)) {
+
+				Type targetType = ((TypedElement) dropTarget).getType();
+				// The dropped object is owned by the target type
+
+				if (targetType instanceof Classifier) {
+					Classifier classifier = (Classifier) targetType;
+					isValid = classifier.getAllAttributes().contains(port);
+				}
 			}
 		}
 
@@ -93,10 +93,10 @@ public class PortDropHelper extends ElementHelper {
 	/**
 	 * return the host Edit Part's semantic element, if the semantic element
 	 * is <code>null</code> or unresolvable it will return <code>null</code>
-	 * 
+	 *
 	 * @return EObject
 	 */
 	protected EObject getHostEObject(GraphicalEditPart host) {
-		return ViewUtil.resolveSemanticElement((View)host.getModel());
+		return ViewUtil.resolveSemanticElement((View) host.getModel());
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
index 83abde4b265..8778d0d35ac 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -62,21 +62,21 @@ public class TypeDropHelper extends ElementHelper {
 		ICommand setCommand = null;

 

 		// The dropped object must be a Type and the target a TypedElement

-		Type newType = (request.getObjects().get(0) instanceof Type) ? (Type)request.getObjects().get(0) : null;

-		TypedElement typedElementDropTarget = (getHostEObject(host) instanceof TypedElement) ? (TypedElement)getHostEObject(host) : null;

+		Type newType = (request.getObjects().get(0) instanceof Type) ? (Type) request.getObjects().get(0) : null;

+		TypedElement typedElementDropTarget = (getHostEObject(host) instanceof TypedElement) ? (TypedElement) getHostEObject(host) : null;

 

-		if((newType == null) || (typedElementDropTarget == null)) {

+		if ((newType == null) || (typedElementDropTarget == null)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

-		if(newType == typedElementDropTarget.getType()) {

+		if (newType == typedElementDropTarget.getType()) {

 			setCommand = IdentityCommand.INSTANCE;

 		}

 

 		// Prepare a command to set the new type

 		SetRequest req = new SetRequest(typedElementDropTarget, UMLPackage.eINSTANCE.getTypedElement_Type(), newType);

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.TYPED_ELEMENT);

-		if(provider != null) {

+		if (provider != null) {

 			setCommand = provider.getEditCommand(req);

 		}

 

@@ -89,7 +89,7 @@ public class TypeDropHelper extends ElementHelper {
 		CompoundCommand cc = new CompoundCommand("Create a new Port");

 

 		Object droppedEObject = request.getObjects().get(0);

-		if(!isValidPortType(droppedEObject)) {

+		if (!isValidPortType(droppedEObject)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

@@ -100,13 +100,13 @@ public class TypeDropHelper extends ElementHelper {
 		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), UMLElementTypes.PORT);

 		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));

-		if(provider != null) {

+		if (provider != null) {

 			createElementCommand = provider.getEditCommand(createElementRequest);

 		}

 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -122,19 +122,19 @@ public class TypeDropHelper extends ElementHelper {
 		CompoundCommand cc = new CompoundCommand("Create a new Port");

 

 		Object droppedEObject = request.getObjects().get(0);

-		if(!isValidPortType(droppedEObject)) {

+		if (!isValidPortType(droppedEObject)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		// Verify target nature

 		EObject target = getHostEObject(host);

-		if((!(target instanceof TypedElement)) || (((TypedElement)target).getType() == null)) {

+		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		// The target type has to be a Block (will hold the created Port)

-		Type targetType = ((TypedElement)target).getType();

-		if(!((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {

+		Type targetType = ((TypedElement) target).getType();

+		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

@@ -145,13 +145,13 @@ public class TypeDropHelper extends ElementHelper {
 		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, UMLElementTypes.PORT);

 		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);

-		if(provider != null) {

+		if (provider != null) {

 			createElementCommand = provider.getEditCommand(createElementRequest);

 		}

 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -167,7 +167,7 @@ public class TypeDropHelper extends ElementHelper {
 		CompoundCommand cc = new CompoundCommand("Create a new FlowPort (" + elementType.getDisplayName() + ")");

 

 		Object droppedEObject = request.getObjects().get(0);

-		if(!isValidFlowPortType(droppedEObject, elementType)) {

+		if (!isValidFlowPortType(droppedEObject, elementType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

@@ -178,13 +178,13 @@ public class TypeDropHelper extends ElementHelper {
 		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), elementType);

 		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));

-		if(provider != null) {

+		if (provider != null) {

 			createElementCommand = provider.getEditCommand(createElementRequest);

 		}

 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -200,19 +200,19 @@ public class TypeDropHelper extends ElementHelper {
 		CompoundCommand cc = new CompoundCommand("Create a new FlowPort (" + elementType.getDisplayName() + ")");

 

 		Object droppedEObject = request.getObjects().get(0);

-		if(!isValidFlowPortType(droppedEObject, elementType)) {

+		if (!isValidFlowPortType(droppedEObject, elementType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		// Verify target nature

 		EObject target = getHostEObject(host);

-		if((!(target instanceof TypedElement)) || (((TypedElement)target).getType() == null)) {

+		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		// The target type has to be a Block (will hold the created Port)

-		Type targetType = ((TypedElement)target).getType();

-		if(!((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {

+		Type targetType = ((TypedElement) target).getType();

+		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

@@ -223,13 +223,13 @@ public class TypeDropHelper extends ElementHelper {
 		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, elementType);

 		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);

-		if(provider != null) {

+		if (provider != null) {

 			createElementCommand = provider.getEditCommand(createElementRequest);

 		}

 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -244,30 +244,30 @@ public class TypeDropHelper extends ElementHelper {
 	private boolean isValidFlowPortType(Object object, IElementType elementType) {

 		boolean isValid = false;

 

-		if((object != null) && (object instanceof Type)) {

-			Type type = (Type)object;

+		if ((object != null) && (object instanceof Type)) {

+			Type type = (Type) object;

 

 			// Test valid type

-			if(type instanceof DataType) {

+			if (type instanceof DataType) {

 				isValid = true;

 			}

 

-			if(type instanceof Signal) {

+			if (type instanceof Signal) {

 				isValid = true;

 			}

 

-			if(((ISpecializationType)SysMLElementTypes.FLOW_SPECIFICATION).getMatcher().matches(type)) {

+			if (((ISpecializationType) SysMLElementTypes.FLOW_SPECIFICATION).getMatcher().matches(type)) {

 				// Non-atomic flow port, the direction is meaningless in this case

-				if(elementType == SysMLElementTypes.FLOW_PORT) {

+				if (elementType == SysMLElementTypes.FLOW_PORT) {

 					isValid = true;

 				}

 			}

 

-			if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(type)) {

+			if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {

 				isValid = true;

 			}

 

-			if(((ISpecializationType)SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {

+			if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {

 				isValid = true;

 			}

 

@@ -279,7 +279,7 @@ public class TypeDropHelper extends ElementHelper {
 	private boolean isValidPortType(Object object) {

 		boolean isValid = false;

 

-		if((object != null) && (object instanceof Type)) {

+		if ((object != null) && (object instanceof Type)) {

 			isValid = true;

 		}

 

@@ -289,10 +289,10 @@ public class TypeDropHelper extends ElementHelper {
 	/**

 	 * return the host Edit Part's semantic element, if the semantic element

 	 * is <code>null</code> or unresolvable it will return <code>null</code>

-	 * 

+	 *

 	 * @return EObject

 	 */

 	protected EObject getHostEObject(GraphicalEditPart host) {

-		return ViewUtil.resolveSemanticElement((View)host.getModel());

+		return ViewUtil.resolveSemanticElement((View) host.getModel());

 	}

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
index a8302d4f326..ba66300ed6e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
@@ -45,10 +45,11 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
  * Represents a creation command for a SysML parametric diagram
+ * 
  * @author Laurent Wouters
  */
 public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -82,12 +83,12 @@ public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiag
 		Diagram diagram = null;
 
 		if (element instanceof org.eclipse.uml2.uml.Class) {
-			org.eclipse.uml2.uml.Class cOwner = (org.eclipse.uml2.uml.Class)element;
+			org.eclipse.uml2.uml.Class cOwner = (org.eclipse.uml2.uml.Class) element;
 			Block block = UMLUtil.getStereotypeApplication(cOwner, Block.class);
 
-			if(block != null) {
-				canvasDomainElement = (EObject)element;
-				Package owningPackage = ((Element)element).getNearestPackage();
+			if (block != null) {
+				canvasDomainElement = element;
+				Package owningPackage = ((Element) element).getNearestPackage();
 				diagram = super.doCreateDiagram(diagramResource, owner, owningPackage, prototype, name);
 			}
 
@@ -95,18 +96,18 @@ public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiag
 
 			try {
 				canvasDomainElement = null;
-				IEditCommandRequest request = new CreateElementRequest((Package)element, SysMLElementTypes.BLOCK);
+				IEditCommandRequest request = new CreateElementRequest(element, SysMLElementTypes.BLOCK);
 				IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(element);
-				if(commandService == null) {
+				if (commandService == null) {
 					return null;
 				}
 
 				ICommand createElementCommand = commandService.getEditCommand(request);
-				if((createElementCommand != null) && (createElementCommand.canExecute())) {
+				if ((createElementCommand != null) && (createElementCommand.canExecute())) {
 					createElementCommand.execute(new NullProgressMonitor(), null);
 					EObject block = GMFCommandUtils.getCommandEObjectResult(createElementCommand);
 					canvasDomainElement = block;
-					diagram = super.doCreateDiagram(diagramResource, owner, (Package)element, prototype, name);
+					diagram = super.doCreateDiagram(diagramResource, owner, element, prototype, name);
 				}
 
 			} catch (ExecutionException e) {
@@ -138,9 +139,9 @@ public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiag
 	 */
 	@Override
 	protected void initializeDiagram(EObject diagram) {
-		if(diagram instanceof Diagram) {
-			Diagram currentDiagram = (Diagram)diagram;
-			if(canvasDomainElement != null) {
+		if (diagram instanceof Diagram) {
+			Diagram currentDiagram = (Diagram) diagram;
+			if (canvasDomainElement != null) {
 				currentDiagram.setElement(canvasDomainElement);
 				initializeDiagramContent(currentDiagram);
 			}
@@ -149,19 +150,19 @@ public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiag
 
 	/**
 	 * Initialize the diagram with the canvas domain element shown.
-	 * 
+	 *
 	 * @param diagram
-	 *        the diagram to initialize
+	 *            the diagram to initialize
 	 */
 	protected void initializeDiagramContent(Diagram diagram) {
 
 		// Create a view for the canvasDomainElement in the new diagram
 		View view =
-			ViewService.getInstance().createNode(new SemanticAdapter(canvasDomainElement, null), diagram, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+				ViewService.getInstance().createNode(new SemanticAdapter(canvasDomainElement, null), diagram, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
 		view.setElement(diagram.getElement());
 
 		// Update the view position and size (should adapt to canvas current size)
-		Bounds viewBounds = (Bounds)((Node)view).getLayoutConstraint();
+		Bounds viewBounds = (Bounds) ((Node) view).getLayoutConstraint();
 		viewBounds.setX(DEFAULT_MARGIN);
 		viewBounds.setY(DEFAULT_MARGIN);
 		viewBounds.setHeight(DEFAULT_HEIGHT);
@@ -170,14 +171,14 @@ public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiag
 
 	/**
 	 * {@inheritDoc}
-	 * 
+	 *
 	 * @generated NOT
 	 */
 	@Override
 	public boolean isParentReassignable() {
-		// Bug 374626: [Model Explorer] Moving an IBD from a block to another block shall be forbidden 
+		// Bug 374626: [Model Explorer] Moving an IBD from a block to another block shall be forbidden
 		return false;
 	}
- 	
- 	// End of user code
+
+	// End of user code
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramForMultiEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramForMultiEditor.java
index 0046556e84e..ee096dc9e71 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramForMultiEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramForMultiEditor.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.PartInitException;
 
 /**
  * An editor to be used in multitabs editor. This editor extends the original UML Diagram.
- * 
+ *
  */
 public class ParametricDiagramForMultiEditor extends ParametricDiagramEditor {
 
@@ -49,16 +49,16 @@ public class ParametricDiagramForMultiEditor extends ParametricDiagramEditor {
 
 	/** The editor splitter. */
 	private Composite splitter;
-	
+
 	private Image titleImage;
 
 	/**
 	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
 	 * ServiceRegistry.
-	 * 
+	 *
 	 * @throws BackboneException
 	 * @throws ServiceException
-	 * 
+	 *
 	 */
 	public ParametricDiagramForMultiEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws BackboneException, ServiceException {
 		super(servicesRegistry, diagram);
@@ -77,11 +77,11 @@ public class ParametricDiagramForMultiEditor extends ParametricDiagramEditor {
 
 	@Override
 	public void dispose() {
-		if(titleImage != null) {
+		if (titleImage != null) {
 			titleImage.dispose();
 			titleImage = null;
 		}
-		
+
 		super.dispose();
 	}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/ParametricDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/ParametricDiagramEditPart.java
index 03f91a71aba..3c40491759a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/ParametricDiagramEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/ParametricDiagramEditPart.java
@@ -31,14 +31,15 @@ public class ParametricDiagramEditPart extends DiagramEditPart {
 		super(view);
 	}
 
+	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DiagramSemanticEditPolicy());			
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DiagramSemanticEditPolicy());
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());
 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultContainerNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());			
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/DiagramSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/DiagramSemanticEditPolicy.java
index 7cef9cbda07..960b88a1f6b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/DiagramSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/DiagramSemanticEditPolicy.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.sysml.diagram.parametric.edit.policy;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gef.requests.ReconnectRequest;
-// Start of user code custom imports	
+// Start of user code custom imports
 // End of user code
 import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomDefaultSemanticEditPolicy;
 
@@ -52,5 +52,5 @@ public class DiagramSemanticEditPolicy extends CustomDefaultSemanticEditPolicy {
 	@Override
 	protected Command getReorientRefRelationshipTargetCommand(ReconnectRequest request) {
 		return UnexecutableCommand.INSTANCE;
-	}	
+	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/ParametricDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/ParametricDiagramDragDropEditPolicy.java
index 3e46ba51694..ea245a123ed 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/ParametricDiagramDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/ParametricDiagramDragDropEditPolicy.java
@@ -31,19 +31,19 @@ public class ParametricDiagramDragDropEditPolicy extends CustomDiagramDragDropEd
 	@Override
 	public int getNodeVisualID(View containerView, EObject domainElement) {
 		String domainType = registry.getNodeGraphicalType(domainElement, containerView.getType());
-		if (IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
+		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
 			return -1; // undefined
 		}
 		return new Integer(domainType);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public int getLinkWithClassVisualID(EObject domainElement) {
 		String domainType = registry.getEdgeGraphicalType(domainElement);
-		if (IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
+		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
 			return -1; // undefined
 		}
 		return new Integer(domainType);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java
index c427b750145..9394e8c22ac 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java
@@ -11,7 +11,7 @@
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.factory; 
+package org.eclipse.papyrus.sysml.diagram.parametric.factory;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -31,44 +31,45 @@ public class DiagramPaletteFactory extends PaletteFactory.Adapter {
 	private static HashMap<String, IElementType[]> nodesToolIdTypesMap = new HashMap<String, IElementType[]>() {
 
 		{
-			put("parametric.tool.blockcomposite", new IElementType[]{ SysMLElementTypes.BLOCK });	
-			put("parametric.tool.blockpropertycomposite", new IElementType[]{ SysMLElementTypes.PART_PROPERTY });	
-			put("parametric.tool.reference", new IElementType[]{ SysMLElementTypes.REFERENCE_PROPERTY });	
-			put("parametric.tool.value", new IElementType[]{ SysMLElementTypes.VALUE_PROPERTY });	
-			put("parametric.tool.constraintblockpropertycomposite", new IElementType[]{ SysMLElementTypes.CONSTRAINT_PROPERTY });	
-			put("parametric.tool.flowport", new IElementType[]{ SysMLElementTypes.FLOW_PORT });	
-			put("parametric.tool.port", new IElementType[]{ UMLElementTypes.PORT });	
-			put("parametric.tool.parameter", new IElementType[]{ UMLElementTypes.PROPERTY });	
-			//Start of user code Custom nodes
-			put("parametric.tool.constraint", new IElementType[]{ UMLElementTypes.CONSTRAINT });
-			put("parametric.tool.comment", new IElementType[]{ UMLElementTypes.COMMENT });				
-			//End of user code
+			put("parametric.tool.blockcomposite", new IElementType[] { SysMLElementTypes.BLOCK });
+			put("parametric.tool.blockpropertycomposite", new IElementType[] { SysMLElementTypes.PART_PROPERTY });
+			put("parametric.tool.reference", new IElementType[] { SysMLElementTypes.REFERENCE_PROPERTY });
+			put("parametric.tool.value", new IElementType[] { SysMLElementTypes.VALUE_PROPERTY });
+			put("parametric.tool.constraintblockpropertycomposite", new IElementType[] { SysMLElementTypes.CONSTRAINT_PROPERTY });
+			put("parametric.tool.flowport", new IElementType[] { SysMLElementTypes.FLOW_PORT });
+			put("parametric.tool.port", new IElementType[] { UMLElementTypes.PORT });
+			put("parametric.tool.parameter", new IElementType[] { UMLElementTypes.PROPERTY });
+			// Start of user code Custom nodes
+			put("parametric.tool.constraint", new IElementType[] { UMLElementTypes.CONSTRAINT });
+			put("parametric.tool.comment", new IElementType[] { UMLElementTypes.COMMENT });
+			// End of user code
 		}
 	};
 
 	private static HashMap<String, IElementType[]> edgesToolIdTypesMap = new HashMap<String, IElementType[]>() {
 
 		{
-			put("parametric.tool.connector", new IElementType[]{ UMLElementTypes.CONNECTOR });	
-			put("parametric.tool.dependency", new IElementType[]{ UMLElementTypes.DEPENDENCY });	
-			//Start of user code Custom edges
-			put("parametric.tool.comment_constraint_link", new IElementType[]{ ElementTypes.COMMENT_ANNOTATED_ELEMENT });	
-			put("parametric.tool.context_link", new IElementType[]{ ElementTypes.CONTEXT_LINK });	
-			//End of user code
+			put("parametric.tool.connector", new IElementType[] { UMLElementTypes.CONNECTOR });
+			put("parametric.tool.dependency", new IElementType[] { UMLElementTypes.DEPENDENCY });
+			// Start of user code Custom edges
+			put("parametric.tool.comment_constraint_link", new IElementType[] { ElementTypes.COMMENT_ANNOTATED_ELEMENT });
+			put("parametric.tool.context_link", new IElementType[] { ElementTypes.CONTEXT_LINK });
+			// End of user code
 		}
 	};
 
+	@Override
 	public Tool createTool(String toolId) {
 
 		IElementType[] types;
-		  
+
 		types = nodesToolIdTypesMap.get(toolId);
-		if(types != null) {
+		if (types != null) {
 			return new AspectUnspecifiedTypeCreationTool(Arrays.asList(types));
 		}
 
 		types = edgesToolIdTypesMap.get(toolId);
-		if(types != null) {
+		if (types != null) {
 			return new AspectUnspecifiedTypeConnectionTool(Arrays.asList(types));
 		}
 		return null;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/part/ParametricDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/part/ParametricDiagramEditor.java
index 5d09c4db0a9..ef56c9aa4ad 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/part/ParametricDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/part/ParametricDiagramEditor.java
@@ -25,40 +25,40 @@ import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
 public class ParametricDiagramEditor extends org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditor {
 
 	/** context used when trying to find services */
-  public static final String ID = "org.eclipse.papyrus.sysml.diagram.parametric.part.ParametricDiagramEditorID"; //$NON-NLS-1$
+	public static final String ID = "org.eclipse.papyrus.sysml.diagram.parametric.part.ParametricDiagramEditorID"; //$NON-NLS-1$
 
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public String getContextID() {
-    return CONTEXT_ID;
-  }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getContextID() {
+		return CONTEXT_ID;
+	}
 
-  /**
-	 * @throws org.eclipse.papyrus.infra.core.services.ServiceException 
- * @generated
+	/**
+	 * @throws org.eclipse.papyrus.infra.core.services.ServiceException
+	 * @generated
 	 */
 	public ParametricDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException, org.eclipse.papyrus.infra.core.services.ServiceException {
-    super(servicesRegistry, diagram);
-  }
-	
-  // Start of user code Custom Editor Methods
+		super(servicesRegistry, diagram);
+	}
+
+	// Start of user code Custom Editor Methods
 	// End of user code
 
 	/**
 	 * @generated
 	 */
 	@Override
-  public String getContributorId() {
-    return Activator.PLUGIN_ID;
-  }
+	public String getContributorId() {
+		return Activator.PLUGIN_ID;
+	}
 
 	/**
 	 * @generated
 	 */
 	@Override
-  protected PreferencesHint getPreferencesHint() {
-    return Activator.DIAGRAM_PREFERENCES_HINT;
-  }
+	protected PreferencesHint getPreferencesHint() {
+		return Activator.DIAGRAM_PREFERENCES_HINT;
+	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java
index d0027c9811c..0a84ca4d3b7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java
@@ -11,7 +11,7 @@
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences; 
+package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -25,49 +25,49 @@ import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
 public class BlockCompositePreferencePage extends ParametricDiagramNodePreferencePage {
 
 	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" +  SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID; //$NON-NLS-1$
+	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID; //$NON-NLS-1$
 
-	/** The compartments default visibility for preferences */ 
+	/** The compartments default visibility for preferences */
 	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
 
-	/** The compartment titles default visibility for preferences */ 
+	/** The compartment titles default visibility for preferences */
 	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-		
+
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$	
-		
+		compartmentDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
+
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-		
-		
+
+
 		// Start of user code custom static initializations
- 		// End of user code
- 		
- 		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
- 		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
+		// End of user code
+
+		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
+		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
 	}
-	
+
 	/** Constructor */
 	public BlockCompositePreferencePage() {
 		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" +  SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID); //$NON-NLS-1$
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID); //$NON-NLS-1$
 	}
-	
+
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
 		// End of user code
-		
+
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -78,7 +78,7 @@ public class BlockCompositePreferencePage extends ParametricDiagramNodePreferenc
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -88,9 +88,9 @@ public class BlockCompositePreferencePage extends ParametricDiagramNodePreferenc
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
-	
+
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentAnnotatedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentAnnotatedElementPreferencePage.java
index 01beb9c96f6..baf66ca53e7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentAnnotatedElementPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentAnnotatedElementPreferencePage.java
@@ -19,25 +19,25 @@ import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
 public class CommentAnnotatedElementPreferencePage extends ParametricDiagramLinkPreferencePage {
 
 	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement";  //$NON-NLS-1$
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"; //$NON-NLS-1$
+
 
-		
 	/** Default constructor */
 	public CommentAnnotatedElementPreferencePage() {
 		super();
 		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"); //$NON-NLS-1$
 	}
-	
+
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
-	 */	
+	 *            the preference store.
+	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
- 		// End of user code
- 		
+		// End of user code
+
 	}
-	
-}	
+
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentPreferencePage.java
index c7bfb4b27ed..9b4a5ecd860 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentPreferencePage.java
@@ -21,24 +21,24 @@ public class CommentPreferencePage extends ParametricDiagramNodePreferencePage {
 	/** Constant key to access preferences */
 	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Comment"; //$NON-NLS-1$
 
-	
-	/** Default constructor */	
+
+	/** Default constructor */
 	public CommentPreferencePage() {
 		super();
 		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
 	}
-	
+
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
- 		// End of user code
-		
+		// End of user code
+
 	}
 
-	
+
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java
index 21a36cf840d..96d5e6434de 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java
@@ -30,7 +30,7 @@ public class ConnectorPreferencePage extends ParametricDiagramLinkPreferencePage
 
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations		
+		// Start of user code custom default initializations
 		// End of user code
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintConstrainedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintConstrainedElementPreferencePage.java
index 78bbfcd1371..e44b40abc91 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintConstrainedElementPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintConstrainedElementPreferencePage.java
@@ -19,25 +19,25 @@ import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
 public class ConstraintConstrainedElementPreferencePage extends ParametricDiagramLinkPreferencePage {
 
 	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement";  //$NON-NLS-1$
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement"; //$NON-NLS-1$
+
 
-		
 	/** Default constructor */
 	public ConstraintConstrainedElementPreferencePage() {
 		super();
 		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement"); //$NON-NLS-1$
 	}
-	
+
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
-	 */	
+	 *            the preference store.
+	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
- 		// End of user code
- 		
+		// End of user code
+
 	}
-	
-}	
+
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintPreferencePage.java
index ddd7092d8e4..b36251c17cf 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintPreferencePage.java
@@ -21,24 +21,24 @@ public class ConstraintPreferencePage extends ParametricDiagramNodePreferencePag
 	/** Constant key to access preferences */
 	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Constraint"; //$NON-NLS-1$
 
-	
-	/** Default constructor */	
+
+	/** Default constructor */
 	public ConstraintPreferencePage() {
 		super();
 		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
 	}
-	
+
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
- 		// End of user code
-		
+		// End of user code
+
 	}
 
-	
+
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java
index a2387b722b0..c561639997d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java
@@ -30,7 +30,7 @@ public class DependencyPreferencePage extends ParametricDiagramLinkPreferencePag
 
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations		
+		// Start of user code custom default initializations
 		// End of user code
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramLinkPreferencePage.java
index e4e00384afe..d2e3fdb0011 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramLinkPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramLinkPreferencePage.java
@@ -27,14 +27,14 @@ public class ParametricDiagramLinkPreferencePage extends AbstractPapyrusLinkPref
 
 	/** The list of label names for this link */
 	protected List<String> labelsList;
-	
+
 	/** Constructor */
 	public ParametricDiagramLinkPreferencePage() {
 		labelsList = new ArrayList<String>();
 		initializeLabelsList();
 		Collections.unmodifiableList(labelsList);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -43,26 +43,26 @@ public class ParametricDiagramLinkPreferencePage extends AbstractPapyrusLinkPref
 		super.createPageContents(parent);
 
 		// Add label visibility group
-		if(!labelsList.isEmpty()) {
+		if (!labelsList.isEmpty()) {
 			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
 			addAbstractGroup(compartmentGroup);
 		}
 
 	}
-	
+
 	/**
 	 * {@inheritDoc}
-	 */	
+	 */
 	@Override
 	protected String getBundleId() {
 		return Activator.PLUGIN_ID;
 	}
-	
+
 	/** Initialize the list containing names of labels. */
 	protected void initializeLabelsList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramNodePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramNodePreferencePage.java
index d7fa5e0b367..5a0f58d98f4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramNodePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramNodePreferencePage.java
@@ -28,13 +28,13 @@ public class ParametricDiagramNodePreferencePage extends AbstractPapyrusNodePref
 
 	/** The list owning the names of compartments */
 	protected List<String> compartmentNamesList;
-	
+
 	/** The list owning the names of compartment that have a title */
 	protected List<String> compartmentTitlesList;
 
 	/** The list of label names for this node */
 	protected List<String> labelsList;
-	
+
 	/** Constructor */
 	public ParametricDiagramNodePreferencePage() {
 		this.labelsList = new ArrayList<String>();
@@ -49,27 +49,27 @@ public class ParametricDiagramNodePreferencePage extends AbstractPapyrusNodePref
 		Collections.unmodifiableList(compartmentNamesList);
 		Collections.unmodifiableList(compartmentTitlesList);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected void createPageContents(Composite parent) {
 		super.createPageContents(parent);
-		
+
 		// Add compartments visibility group
-		if(!compartmentNamesList.isEmpty()) {
+		if (!compartmentNamesList.isEmpty()) {
 			OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());
 			addAbstractGroup(compartmentGroup);
 		}
 
 		// Add label visibility group
-		if(!labelsList.isEmpty()) {
+		if (!labelsList.isEmpty()) {
 			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
 			addAbstractGroup(compartmentGroup);
 		}
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -80,17 +80,17 @@ public class ParametricDiagramNodePreferencePage extends AbstractPapyrusNodePref
 
 	/** Initialize the list containing names of labels. */
 	protected void initializeLabelsList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/** Initialize the list containing the names of compartments. */
 	protected void initializeCompartmentNamesList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
-	
+
 	/** Initialize the list containing the names of compartment that have titles. */
 	protected void initializeCompartmentTitlesList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/**
@@ -108,7 +108,7 @@ public class ParametricDiagramNodePreferencePage extends AbstractPapyrusNodePref
 	protected final TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
 		return new TreeMap<String, Boolean>();
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramPreferenceInitializer.java
index 38e2c098561..560e1b430ab 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramPreferenceInitializer.java
@@ -26,14 +26,14 @@ public class ParametricDiagramPreferenceInitializer extends AbstractPreferenceIn
 	@Override
 	public void initializeDefaultPreferences() {
 		IPreferenceStore store = getPreferenceStore();
-		
-		org.eclipse.papyrus.sysml.diagram.parametric.preferences.ConstraintPreferencePage.initDefaults(store);			
-		org.eclipse.papyrus.sysml.diagram.parametric.preferences.CommentPreferencePage.initDefaults(store);			
+
+		org.eclipse.papyrus.sysml.diagram.parametric.preferences.ConstraintPreferencePage.initDefaults(store);
+		org.eclipse.papyrus.sysml.diagram.parametric.preferences.CommentPreferencePage.initDefaults(store);
 		org.eclipse.papyrus.sysml.diagram.parametric.preferences.CommentAnnotatedElementPreferencePage.initDefaults(store);
 		BlockCompositePreferencePage.initDefaults(store);
 		BlockPropertyCompositePreferencePage.initDefaults(store);
 		ConnectorPreferencePage.initDefaults(store);
 		DependencyPreferencePage.initDefaults(store);
-		
+
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPartProvider.java
index ab9be3ea5a5..f63c6714da0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPartProvider.java
@@ -11,7 +11,7 @@
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider; 
+package org.eclipse.papyrus.sysml.diagram.parametric.provider;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -62,32 +62,32 @@ public class CustomEditPartProvider extends CustomAbstractEditPartProvider {
 		diagramType = ElementTypes.DIAGRAM_ID;
 
 		// Nodes
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID, CustomConstraintBlockPropertyCompositeEditPart.class);	
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, CustomBlockPropertyCompositeEditPart.class);	
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, CustomBlockCompositeEditPartTN.class);	
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, FlowPortAffixedNodeEditPart.class);	
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, PortAffixedNodeEditPart.class);	
+		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID, CustomConstraintBlockPropertyCompositeEditPart.class);
+		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, CustomBlockPropertyCompositeEditPart.class);
+		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, CustomBlockCompositeEditPartTN.class);
+		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, FlowPortAffixedNodeEditPart.class);
+		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, PortAffixedNodeEditPart.class);
 		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID, CustomConstraintParameterAffixedNodeEditPart.class);
-		
+
 		// Decorations
-		nodeMap.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, FlowPortAffixedLabelNameEditPart.class);	
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, BlockPropertyStructureCompartmentEditPart.class);	
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID, StructureCompartmentEditPart.class);	
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, CustomBlockLabelNameEditPart.class); // TODO : change for multi FlowText 
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, AppliedStereotypeAffixedLabelEditPart.class);	
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, PortAffixedLabelNameEditPart.class);	
-		nodeMap.put(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, PropertyNodeLabelEditPart.class);	
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, ConstraintNodeLabelEditPart.class);	
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, AppliedStereotypeLinkLabelEditPart.class);	
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, ConnectorLinkLabelEditPart.class);	
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, ConnectorLinkLabelSourceMultiplicityEditPart.class);	
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, ConnectorLinkLabelTargetMultiplicityEditPart.class);	
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, NamedElementLinkLabelNameEditPart.class);	
-
-		
+		nodeMap.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, FlowPortAffixedLabelNameEditPart.class);
+		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, BlockPropertyStructureCompartmentEditPart.class);
+		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID, StructureCompartmentEditPart.class);
+		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, CustomBlockLabelNameEditPart.class); // TODO : change for multi FlowText
+		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, AppliedStereotypeAffixedLabelEditPart.class);
+		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, PortAffixedLabelNameEditPart.class);
+		nodeMap.put(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, PropertyNodeLabelEditPart.class);
+		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, ConstraintNodeLabelEditPart.class);
+		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, AppliedStereotypeLinkLabelEditPart.class);
+		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, ConnectorLinkLabelEditPart.class);
+		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, ConnectorLinkLabelSourceMultiplicityEditPart.class);
+		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, ConnectorLinkLabelTargetMultiplicityEditPart.class);
+		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, NamedElementLinkLabelNameEditPart.class);
+
+
 		// Edges
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, ConnectorEditPart.class);	
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, DependencyEditPart.class);	
+		edgeMap.put(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, ConnectorEditPart.class);
+		edgeMap.put(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, DependencyEditPart.class);
 	}
 
 	/**
@@ -95,19 +95,19 @@ public class CustomEditPartProvider extends CustomAbstractEditPartProvider {
 	 */
 	@Override
 	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View newView = ((IEditPartOperation)operation).getView();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View newView = ((IEditPartOperation) operation).getView();
 			if (newView == null) {
 				return false;
 			}
-			
+
 			String graphicalType = newView.getType();
 
-			if((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
+			if ((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
 				return false;
 			}
-			
-			if((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
+
+			if ((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
 				return false;
 			}
 		}
@@ -122,7 +122,7 @@ public class CustomEditPartProvider extends CustomAbstractEditPartProvider {
 	protected Class<?> getNodeEditPartClass(View view) {
 		return nodeMap.get(view.getType());
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypeRegistry.java
index 0cd8644457e..0d20a3bdf92 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypeRegistry.java
@@ -11,7 +11,7 @@
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider; 
+package org.eclipse.papyrus.sysml.diagram.parametric.provider;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
@@ -23,231 +23,233 @@ import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.util.UMLUtil;
-		
+
 public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
 
 	/** Default constructor */
 	public CustomGraphicalTypeRegistry() {
-		
+
 		super();
-		
+
 		// Nodes
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID);	
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID);	
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID);	
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID);	
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID);	
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID);	
+		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID);
+		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID);
+		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID);
+		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID);
+		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID);
+		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID);
 		// Decorations
-		knownNodes.add(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID);	
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID);	
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID);	
-		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID);	
-		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID);	
-		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID);	
-		knownNodes.add(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID);	
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID);	
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID);	
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID);	
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID);	
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID);	
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID);	
-	
+		knownNodes.add(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID);
+		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID);
+		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID);
+		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID);
+		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID);
+		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID);
+		knownNodes.add(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID);
+		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID);
+		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID);
+		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID);
+		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID);
+		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID);
+		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID);
+
 		// Edges
 		knownEdges.add(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID);
 		knownEdges.add(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public String getNodeGraphicalType(EObject domainElement, String containerType) {
-		// Start of user code getNodeGraphicalType(EObject domainElement, String containerType)	
+		// Start of user code getNodeGraphicalType(EObject domainElement, String containerType)
 		// End of user code
-	
-		if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
+
+		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
 			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
-			}	
+			}
 			return UNDEFINED_TYPE;
 		}
-		if(((ISpecializationType)SysMLElementTypes.CONSTRAINT_PROPERTY).getMatcher().matches(domainElement)) {
+		if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_PROPERTY).getMatcher().matches(domainElement)) {
 			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(domainElement)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}		
+			}
 			return UNDEFINED_TYPE;
-		}		
+		}
 
 		// These element are only authorized on Block, not in Constraint Block. In ConstraintBlock it must become a ConstraintParameter
-		if (UMLUtil.getStereotypeApplication((Element)domainElement.eContainer(), ConstraintBlock.class) == null) {
-			if(((ISpecializationType)SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)) {
+		if (UMLUtil.getStereotypeApplication((Element) domainElement.eContainer(), ConstraintBlock.class) == null) {
+			if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)) {
 				if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}	
+				}
 				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}	
+				}
 				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}	
+				}
 				return UNDEFINED_TYPE;
-			}		
-			if(((ISpecializationType)SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)) {
+			}
+			if (((ISpecializationType) SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)) {
 				if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}	
+				}
 				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}	
+				}
 				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}	
+				}
 				return UNDEFINED_TYPE;
 			}
-			if(((ISpecializationType)SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)) {
+			if (((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)) {
 				if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}	
+				}
 				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}	
+				}
 				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}	
+				}
 				return UNDEFINED_TYPE;
 			}
 		}
 		// Order is important for Part/Reference/ConstraintProperty which are also Property
-		if(UMLElementTypes.PROPERTY.getEClass().isInstance(domainElement)) {
+		if (UMLElementTypes.PROPERTY.getEClass().isInstance(domainElement)) {
 			if (SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID;
-			}	
+			}
 			return UNDEFINED_TYPE;
 
-		}		
-		if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) {
+		}
+		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
 			}
 			return UNDEFINED_TYPE;
 		}
 		return super.getNodeGraphicalType(domainElement, containerType);
-	}	
-	
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getNodeGraphicalType(String proposedType, String containerType) {
 		// Start of user code getNodeGraphicalType(String proposedType, String containerType)
 		// End of user code
-	
-		if(SysMLElementTypes.BLOCK.getSemanticHint().equals(proposedType)) {
+
+		if (SysMLElementTypes.BLOCK.getSemanticHint().equals(proposedType)) {
 			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
-			}	
+			}
 			return UNDEFINED_TYPE;
-		}		
-		
-		if(UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {	
+		}
+
+		if (UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
 			if (SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID;
-			}	
+			}
 			return UNDEFINED_TYPE;
-		}	
-		
-		if(SysMLElementTypes.CONSTRAINT_PROPERTY.getSemanticHint().equals(proposedType)) {	
+		}
+
+		if (SysMLElementTypes.CONSTRAINT_PROPERTY.getSemanticHint().equals(proposedType)) {
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				
+
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			return UNDEFINED_TYPE;
-		}		
+		}
 
-		if(SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)) {
+		if (SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)) {
 			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			return UNDEFINED_TYPE;
-		}		
-		if(SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)) {
+		}
+		if (SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)) {
 			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			return UNDEFINED_TYPE;
-		}		
-		if(SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)) {
+		}
+		if (SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)) {
 			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}	
+			}
 			return UNDEFINED_TYPE;
-		}		
+		}
 		return super.getNodeGraphicalType(proposedType, containerType);
-	}	
-	
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public String getEdgeGraphicalType(EObject domainElement) {
-		// Start of user code getEdgeGraphicalType(EObject domainElement)	
+		// Start of user code getEdgeGraphicalType(EObject domainElement)
 		// End of user code
-	
-		if(UMLElementTypes.CONNECTOR.getEClass().isInstance(domainElement)) {
+
+		if (UMLElementTypes.CONNECTOR.getEClass().isInstance(domainElement)) {
 			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;
-		}		
-		if(UMLElementTypes.DEPENDENCY.getEClass().isInstance(domainElement)) {
+		}
+		if (UMLElementTypes.DEPENDENCY.getEClass().isInstance(domainElement)) {
 			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
-		}		
+		}
 		return super.getEdgeGraphicalType(domainElement);
-	}	
-	
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getEdgeGraphicalType(String proposedType) {
 		// Start of user code getEdgeGraphicalType(String proposedType)
 		// End of user code
-	
-		if(UMLElementTypes.CONNECTOR.getSemanticHint().equals(proposedType)) {
+
+		if (UMLElementTypes.CONNECTOR.getSemanticHint().equals(proposedType)) {
 			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;
-		}		
-		if(UMLElementTypes.DEPENDENCY.getSemanticHint().equals(proposedType)) {
+		}
+		if (UMLElementTypes.DEPENDENCY.getSemanticHint().equals(proposedType)) {
 			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
-		}		
+		}
 		return super.getEdgeGraphicalType(proposedType);
-	}		
+	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypes.java
index befa6ce3ac6..51ddb08410c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypes.java
@@ -11,7 +11,7 @@
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider; 
+package org.eclipse.papyrus.sysml.diagram.parametric.provider;
 
 public class CustomGraphicalTypes {
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomViewProvider.java
index 5a47486000e..318d7a10c2b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomViewProvider.java
@@ -11,7 +11,7 @@
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider; 
+package org.eclipse.papyrus.sysml.diagram.parametric.provider;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -38,17 +38,17 @@ public class CustomViewProvider extends CustomAbstractViewProvider {
 
 	/** Map containing node view types supported by this provider */
 	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();
-	
+
 	/** Map containing edge view types supported by this provider */
 	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();
-	
+
 	/** Default constructor */
 	public CustomViewProvider() {
 		super();
 		this.registry = new CustomGraphicalTypeRegistry();
 
 		diagramType = ElementTypes.DIAGRAM_ID;
-		
+
 		// Custom classifier nodes
 		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, BlockCompositeClassifierViewFactory.class);
 		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, BlockPropertyCompositeClassifierViewFactory.class);
@@ -63,13 +63,13 @@ public class CustomViewProvider extends CustomAbstractViewProvider {
 		nodeMap.put(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, InnerLabelViewFactory.class);
 		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, InnerLabelViewFactory.class);
 		// Custom compartments
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID, CompartmentShapeViewFactory.class);		
+		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID, CompartmentShapeViewFactory.class);
 		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, CompartmentShapeViewFactory.class);
 		// Custom affixed labels
 		nodeMap.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, AffixedLabelViewFactory.class);
 		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, AffixedLabelViewFactory.class);
 		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, AffixedLabelViewFactory.class);
-		
+
 		// Custom edges
 		edgeMap.put(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, ConnectorLinkViewFactory.class);
 		edgeMap.put(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, DependencyLinkViewFactory.class);
@@ -89,7 +89,7 @@ public class CustomViewProvider extends CustomAbstractViewProvider {
 	protected Class<?> getNodeViewClass(IAdaptable semanticAdapter, View containerView, String graphicalType) {
 		return nodeMap.get(graphicalType);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java
index 603137f01b5..30019c4d429 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java
@@ -25,7 +25,7 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
 	/** SysML Parametric Diagram :: Diagram */
 	public static final String DIAGRAM_ID = "Parametric"; //$NON-NLS-1$
 
-	
+
 
 
 	/** ********************************************************* */
@@ -33,36 +33,36 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
 	/** ********************************************************* */
 
 	/** CompositeDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$
 
 	public static final String CONSTRAINT_LABEL_NAME_HINT = "5197"; //$NON-NLS-1$
 
 	public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = "6039"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_3097"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_3097"); //$NON-NLS-1$
 
 	public static final String COMMENT_CN_LABEL_BODY_HINT = "5150"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
+	public static final IHintedType COMMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
 
 	public static final String COMMENT_LABEL_BODY_HINT = "5192"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"); //$NON-NLS-1$
 
 	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "6048"; //$NON-NLS-1$
 
 	public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = "6049"; //$NON-NLS-1$
 
 	/** CompositeDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
 
 	/** CompositeDiagram :: CONTEXT_LINK */
-	public static final IHintedType CONTEXT_LINK = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.parametric.ContextLink"); //$NON-NLS-1$
+	public static final IHintedType CONTEXT_LINK = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.parametric.ContextLink"); //$NON-NLS-1$
 
 	/** CompositeDiagram :: CONContextLinkAppliedStereotype */
-	public static final IHintedType CONTEXT_LINK_APPLIED_STEREOTYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.parametric.ContextLinkAppliedStereotype"); //$NON-NLS-1$
+	public static final IHintedType CONTEXT_LINK_APPLIED_STEREOTYPE = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.parametric.ContextLinkAppliedStereotype"); //$NON-NLS-1$
 
-}	
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/GraphicalTypeRegistry.java
index f12fe38788b..186fd31af2c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/GraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/GraphicalTypeRegistry.java
@@ -64,7 +64,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	public String getEdgeGraphicalType(EObject domainElement) {
 
 		String graphicalType = UNDEFINED_TYPE;
-		if(domainElement == null) {
+		if (domainElement == null) {
 			return UNDEFINED_TYPE;
 		}
 		return graphicalType;
@@ -74,8 +74,8 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getEdgeGraphicalType(IElementType elementType) {
-		if(elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType)elementType).getSemanticHint();
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
 			return getEdgeGraphicalType(semanticHint);
 		}
 
@@ -86,7 +86,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getEdgeGraphicalType(String proposedType) {
-		if(isKnownEdgeType(proposedType)) {
+		if (isKnownEdgeType(proposedType)) {
 			return proposedType;
 		}
 
@@ -99,28 +99,28 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	public String getNodeGraphicalType(EObject domainElement, String containerType) {
 
 		String graphicalType = UNDEFINED_TYPE;
-		if((containerType == null) || (domainElement == null)) {
+		if ((containerType == null) || (domainElement == null)) {
 			return UNDEFINED_TYPE;
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Constraint) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				graphicalType = ElementTypes.CONSTRAINT.getSemanticHint();
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Comment) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
 				graphicalType = ElementTypes.COMMENT.getSemanticHint();
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
 
@@ -133,8 +133,8 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getNodeGraphicalType(IElementType elementType, String containerType) {
-		if(elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType)elementType).getSemanticHint();
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
 			return getNodeGraphicalType(semanticHint, containerType);
 		}
 
@@ -145,40 +145,40 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	 * {@inheritDoc}
 	 */
 	public String getNodeGraphicalType(String proposedType, String containerType) {
-		if((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
+		if ((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				return ElementTypes.COMMENT.getSemanticHint();
 			}
 
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return ElementTypes.COMMENT_CN.getSemanticHint();
 			}
 
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return ElementTypes.COMMENT_CN.getSemanticHint();
 			}
 
 			return UNDEFINED_TYPE;
 		}
 
-		if(UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
+		if (UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
 
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				return ElementTypes.CONSTRAINT.getSemanticHint();
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
 				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
-			
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
+
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
 				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
 
 
 			return UNDEFINED_TYPE;
 		}
-		if(isKnownNodeType(proposedType)) {
+		if (isKnownNodeType(proposedType)) {
 			return proposedType;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/IGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/IGraphicalTypeRegistry.java
index 4b4495a584c..a3f92e3f1e4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/IGraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/IGraphicalTypeRegistry.java
@@ -27,82 +27,82 @@ public interface IGraphicalTypeRegistry {
 
 	/**
 	 * Get a valid edge graphical type for the domain element.
-	 * 
+	 *
 	 * @param domainElement
-	 *        the domain element.
+	 *            the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getEdgeGraphicalType(EObject domainElement);
-	
+
 	/**
 	 * Get a valid edge graphical type for the element type.
-	 * 
+	 *
 	 * @param elementType
-	 *        the element type.
+	 *            the element type.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getEdgeGraphicalType(IElementType elementType);
-	
+
 	/**
 	 * Get a valid edge graphical type for the proposed type.
-	 * 
+	 *
 	 * @param proposedType
-	 *        the proposed type.
+	 *            the proposed type.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getEdgeGraphicalType(String proposedType);
-	
+
 	/**
 	 * Get a valid node graphical type for the domain element.
-	 * 
+	 *
 	 * @param domainElement
-	 *        the domain element.
+	 *            the domain element.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getNodeGraphicalType(EObject domainElement, String containerType);
-	
+
 	/**
 	 * Get a valid node graphical type for the element type.
-	 * 
+	 *
 	 * @param elementType
-	 *        the element type.
+	 *            the element type.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getNodeGraphicalType(IElementType elementType, String containerType);
-	
+
 	/**
 	 * Get a valid node graphical type for the proposed type.
-	 * 
+	 *
 	 * @param proposedType
-	 *        the proposed type.
+	 *            the proposed type.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getNodeGraphicalType(String proposedType, String containerType);
-	
+
 	/**
 	 * Test if the type is a known edge graphical type in this diagram
-	 * 
+	 *
 	 * @param type
-	 *        the type to test
+	 *            the type to test
 	 * @return true if the type is known
 	 */
 	public boolean isKnownEdgeType(String type);
-	
+
 	/**
 	 * Test if the type is a known node graphical type in this diagram
-	 * 
+	 *
 	 * @param type
-	 *        the type to test
+	 *            the type to test
 	 * @return true if the type is known
 	 */
 	public boolean isKnownNodeType(String type);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramEditPartProvider.java
index 2af0e220aa3..197a8dbb518 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramEditPartProvider.java
@@ -37,14 +37,14 @@ public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvid
 		}
 		return super.createEditPart(view);
 	}
-	
+
 	@Override
 	public synchronized boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View view = ((IEditPartOperation) operation).getView();
 
 			// Ensure current diagram is a Parametric Diagram
-			if(!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
+			if (!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
 				return false;
 			}
 
@@ -52,10 +52,10 @@ public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvid
 			EObject eobject = view.getElement();
 
 			/** Nodes (and ChildLabelNodes) *********** */
-			if(eobject instanceof org.eclipse.uml2.uml.Constraint) {
+			if (eobject instanceof org.eclipse.uml2.uml.Constraint) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Comment) {
+			if (eobject instanceof org.eclipse.uml2.uml.Comment) {
 				return true;
 			}
 
@@ -66,14 +66,14 @@ public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvid
 			String hint = view.getType();
 
 			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
+			if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
 				return true;
 			}
 			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if(ElementTypes.CONTEXT_LINK.getSemanticHint().equals(hint)) {
+			if (ElementTypes.CONTEXT_LINK.getSemanticHint().equals(hint)) {
 				return true;
 			}
-			if(ElementTypes.CONTEXT_LINK_APPLIED_STEREOTYPE.getSemanticHint().equals(hint)) {
+			if (ElementTypes.CONTEXT_LINK_APPLIED_STEREOTYPE.getSemanticHint().equals(hint)) {
 				return true;
 			}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java
index 0132d2b0c7d..668674b5790 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java
@@ -42,8 +42,8 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
 		Edge createdEdge = null;
 
-		IElementType elementType = (IElementType)semanticAdapter.getAdapter(IElementType.class);
-		if(elementType != null) {
+		IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
+		if (elementType != null) {
 			if (elementType == ElementTypes.CONTEXT_LINK) {
 				org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider classDiagramUMLProvider = new org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider();
 				createdEdge = classDiagramUMLProvider.createConstraintContext_8500(containerView, index, persisted, preferencesHint);
@@ -53,7 +53,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 			}
 		}
 
-		if(createdEdge == null) {
+		if (createdEdge == null) {
 			Activator.log.error(new Exception("Could not create Edge."));
 		}
 
@@ -64,7 +64,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 	protected boolean provides(CreateViewForKindOperation op) {
 		// Never use this method (often incorrectly implemented due to GMF Tooling choices).
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
@@ -75,21 +75,21 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 	protected boolean provides(CreateEdgeViewOperation op) {
 
 		// Must have a container
-		if(op.getContainerView() == null) {
+		if (op.getContainerView() == null) {
 			return false;
 		}
 
 		// This provider is registered for InternalBlock Diagram only
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if(elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
+		if (elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
 			return true;
 		}
-		if(elementType == ElementTypes.CONTEXT_LINK) {
+		if (elementType == ElementTypes.CONTEXT_LINK) {
 			return true;
 		}
 
@@ -98,15 +98,15 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 		// /////////////////////////////////////////////////////////////////////
 
 		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.	
-		if(elementType == null) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		// In such a case, test the semantic EObject instead.
+		if (elementType == null) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
 
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
@@ -117,7 +117,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 	@Override
 	protected boolean provides(CreateNodeViewOperation op) {
 		// Must have a container
-		if(op.getContainerView() == null) {
+		if (op.getContainerView() == null) {
 			return false;
 		}
 		// Get the type of the container
@@ -125,7 +125,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 
 		// This provider is registered for InternalBlock Diagram only
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
@@ -133,23 +133,23 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 		// Test possibility to provide a view based on the ElementType and its expected container.
 		// /////////////////////////////////////////////////////////////////////
 
-		IElementType elementType = (IElementType)op.getSemanticAdapter().getAdapter(IElementType.class);
-		if(elementType == UMLElementTypes.CONSTRAINT) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		IElementType elementType = (IElementType) op.getSemanticAdapter().getAdapter(IElementType.class);
+		if (elementType == UMLElementTypes.CONSTRAINT) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == UMLElementTypes.COMMENT) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == UMLElementTypes.COMMENT) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerGraphicalType)) {
+			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
@@ -160,16 +160,16 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 
 		// IElementType may be null (especially when drop from ModelExplorer).
 		// In such a case, test the semantic EObject instead.
-		if(elementType == null) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		if (elementType == null) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 			} else {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
 			}
 
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
+			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
@@ -184,9 +184,9 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 		String containerGraphicalType = containerView.getType();
 
 		// Get the type of the domain element
-		EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
+		EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
 
-		if(semanticHint != null) {
+		if (semanticHint != null) {
 			// Look for a possible graphicalType replacement
 			String graphicalType = registry.getNodeGraphicalType(semanticHint, containerGraphicalType);
 			return super.createNode(new SemanticAdapter(domainElement, null), containerView, graphicalType, index, persisted, preferencesHint);
@@ -195,7 +195,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 		String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 
 		// Create the expected node
-		if(!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
+		if (!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
 			return super.createNode(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
 		}
 
@@ -203,48 +203,48 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 		return null;
 	}
 
-	
+
 	@Override
 	protected void stampShortcut(View containerView, Node target) {
-		if(!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
+		if (!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
 			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
 			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
 			shortcutAnnotation.getDetails().put("modelID", ElementTypes.DIAGRAM_ID); //$NON-NLS-1$
 			target.getEAnnotations().add(shortcutAnnotation);
 		}
 	}
-	
-//	/**
-//	 * @generated
-//	 */
-//	@SuppressWarnings("unchecked")
-//	public Edge createContextLink_8500(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-//		Connector edge = NotationFactory.eINSTANCE.createConnector();
-//		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-//		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
-//		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);
-//		points.add(new RelativeBendpoint());
-//		points.add(new RelativeBendpoint());
-//		bendpoints.setPoints(points);
-//		edge.setBendpoints(bendpoints);
-//		ViewUtil.insertChildView(containerView, edge, index, persisted);
-//		edge.setType(UMLVisualIDRegistry.getType(ContextLinkEditPart.VISUAL_ID));
-//		edge.setElement(null);
-//		// initializePreferences
-//		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
-//		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Undefined");
-//		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Undefined");
-//		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));
-//		//if (routing != null) {
-//		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);
-//		//}
-//		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge, prefStore, "Undefined");
-//		Node label8501 = createLabel(edge, UMLVisualIDRegistry.getType(ContextLinkAppliedStereotypeEditPart.VISUAL_ID));
-//		label8501.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-//		Location location8501 = (Location)label8501.getLayoutConstraint();
-//		location8501.setX(0);
-//		location8501.setY(15);
-//		return edge;
-//	}
-
-}	
+
+	// /**
+	// * @generated
+	// */
+	// @SuppressWarnings("unchecked")
+	// public Edge createContextLink_8500(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
+	// Connector edge = NotationFactory.eINSTANCE.createConnector();
+	// edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
+	// RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
+	// ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);
+	// points.add(new RelativeBendpoint());
+	// points.add(new RelativeBendpoint());
+	// bendpoints.setPoints(points);
+	// edge.setBendpoints(bendpoints);
+	// ViewUtil.insertChildView(containerView, edge, index, persisted);
+	// edge.setType(UMLVisualIDRegistry.getType(ContextLinkEditPart.VISUAL_ID));
+	// edge.setElement(null);
+	// // initializePreferences
+	// final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
+	// PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Undefined");
+	// PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Undefined");
+	// //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));
+	// //if (routing != null) {
+	// // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);
+	// //}
+	// PreferenceInitializerForElementHelper.initRountingFromPrefs(edge, prefStore, "Undefined");
+	// Node label8501 = createLabel(edge, UMLVisualIDRegistry.getType(ContextLinkAppliedStereotypeEditPart.VISUAL_ID));
+	// label8501.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
+	// Location location8501 = (Location)label8501.getLayoutConstraint();
+	// location8501.setX(0);
+	// location8501.setY(15);
+	// return edge;
+	// }
+
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPartProvider.java
index 4d2bd6536ed..3666d0c192f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPartProvider.java
@@ -25,11 +25,11 @@ public class ParametricDiagramEditPartProvider extends AbstractEditPartProvider
 
 	@Override
 	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View view = ((IEditPartOperation) operation).getView();
 
 			// Ensure current diagram is Parametric Diagram
-			if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+			if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
 				return true;
 			}
 		}
@@ -39,7 +39,7 @@ public class ParametricDiagramEditPartProvider extends AbstractEditPartProvider
 
 	@Override
 	protected Class<?> getDiagramEditPartClass(View view) {
-		if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+		if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
 			return ParametricDiagramEditPart.class;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPolicyProvider.java
index dfb80dac34a..a483e666967 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPolicyProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPolicyProvider.java
@@ -27,31 +27,31 @@ public class ParametricDiagramEditPolicyProvider extends AbstractProvider implem
 
 	public boolean provides(IOperation operation) {
 
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;
-		if(!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
 			return false;
 		}
-		GraphicalEditPart gep = (GraphicalEditPart)epOperation.getEditPart();
+		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();
 		String diagramType = gep.getNotationView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPart) {
 			return true;
-		}	
-		if(gep instanceof PortAffixedNodeEditPart) {
+		}
+		if (gep instanceof PortAffixedNodeEditPart) {
 			return true;
-		}	
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseEditPartCN) {
+		}
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseEditPartCN) {
 			return true;
-		}	
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPart) {
+		}
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPart) {
 			return true;
-		}	
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintEditPartCN) {
+		}
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintEditPartCN) {
 			return true;
-		}	
+		}
 
 		return false;
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramViewProvider.java
index 77f17d204fc..bb6d60896be 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramViewProvider.java
@@ -21,24 +21,23 @@ import org.eclipse.papyrus.sysml.diagram.parametric.factory.ParametricDiagramVie
 
 public class ParametricDiagramViewProvider extends AbstractViewProvider {
 
-		@Override
-		protected boolean provides(CreateDiagramViewOperation operation) {
-	
-			if(ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
-				return true;
-			}
-	
-			return false;
+	@Override
+	protected boolean provides(CreateDiagramViewOperation operation) {
+
+		if (ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
+			return true;
 		}
-	
-		@Override
-		protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-			if(ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
-				return ParametricDiagramViewFactory.class;
-			}
-	
-			Activator.log.error(new Exception("Could not create View."));
-			return null;
+
+		return false;
+	}
+
+	@Override
+	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
+		if (ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
+			return ParametricDiagramViewFactory.class;
 		}
-}
 
+		Activator.log.error(new Exception("Could not create View."));
+		return null;
+	}
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/utils/ParametricDiagramGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/utils/ParametricDiagramGraphicalTypes.java
index e404d658977..a49f14b0078 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/utils/ParametricDiagramGraphicalTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/utils/ParametricDiagramGraphicalTypes.java
@@ -11,7 +11,7 @@
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.utils; 
+package org.eclipse.papyrus.sysml.diagram.parametric.utils;
 
 public class ParametricDiagramGraphicalTypes {
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/Activator.java
index bb75848751b..452589070da 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/Activator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/Activator.java
@@ -45,6 +45,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -65,6 +66,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
@@ -72,7 +74,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getInstance() {
@@ -81,10 +83,10 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 * 
+	 *
 	 * @generated
 	 * @param path
-	 *        the path
+	 *            the path
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getBundledImageDescriptor(String path) {
@@ -92,9 +94,9 @@ public class Activator extends AbstractUIPlugin {
 	}
 
 	/**
-	 * 
+	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 * 
+	 *
 	 * @return Shared Preference Store.
 	 */
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorCreateCommand.java
index c955400e9d2..32af7b0cd56 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorCreateCommand.java
@@ -39,7 +39,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
 
 /**
- * 
+ *
  */
 public class CustomBindingConnectorCreateCommand extends EditElementCommand {
 
@@ -55,41 +55,43 @@ public class CustomBindingConnectorCreateCommand extends EditElementCommand {
 	/**
 	 * A BindingConnector could be created in Parametric only if at least one end is a ConstraintParameter.
 	 * Also check Block.isEncapsulated (could not cross a Block which is encapsulted)
-	 * @return 
+	 * 
+	 * @return
 	 */
 	@Override
 	public boolean canExecute() {
-		if(this.source == null) {
+		if (this.source == null) {
 			return false;
 		}
-		if(this.target == null) {
+		if (this.target == null) {
 			return true;
 		}
-		if(this.source == this.target) {
+		if (this.source == this.target) {
 			return false;
 		}
 		if (this.source != null && this.target != null) {
-			
-			boolean hasEncapsulationViolation = !checkEncapsulationCrossing();		
-			
+
+			boolean hasEncapsulationViolation = !checkEncapsulationCrossing();
+
 			return hasEncapsulationViolation ? false :
-					// one of the end must be a ConstraintParameter	
-					ConstraintBlockHelper.isConstraintParameter((Element)source, RequestParameterUtils.getSourceView(getRequest()))
-					|| ConstraintBlockHelper.isConstraintParameter((Element)target, RequestParameterUtils.getTargetView(getRequest()));
+					// one of the end must be a ConstraintParameter
+					ConstraintBlockHelper.isConstraintParameter((Element) source, RequestParameterUtils.getSourceView(getRequest()))
+							|| ConstraintBlockHelper.isConstraintParameter((Element) target, RequestParameterUtils.getTargetView(getRequest()));
 		}
 		return false;
 	}
 
 	/**
 	 * Check that BindingConnector do not cross a "Block.isEncapsulated" Part/Reference/ConstraintProperty
+	 * 
 	 * @return true no encapsulation problem, false else
 	 */
 	private boolean checkEncapsulationCrossing() {
 		org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils util = new org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils();
 
-		// source end - get the nestedPath	
+		// source end - get the nestedPath
 		List<Property> nestedPropertyPath = util.getNestedPropertyPath(RequestParameterUtils.getSourceView(getRequest()), RequestParameterUtils.getTargetView(getRequest()));
-		// check for each level of path if crossing an isEncapsultaed Block 
+		// check for each level of path if crossing an isEncapsultaed Block
 		for (Property property : nestedPropertyPath) {
 			Type type = property.getType();
 			Block stereotypeApplication = UMLUtil.getStereotypeApplication(type, Block.class);
@@ -99,7 +101,7 @@ public class CustomBindingConnectorCreateCommand extends EditElementCommand {
 				}
 			}
 		}
-		
+
 		// target end - get the nestedPath
 		nestedPropertyPath = util.getNestedPropertyPath(RequestParameterUtils.getTargetView(getRequest()), RequestParameterUtils.getSourceView(getRequest()));
 		// check for each level of path if crossing an isEncapsultaed Block
@@ -117,6 +119,7 @@ public class CustomBindingConnectorCreateCommand extends EditElementCommand {
 
 	/**
 	 * Create the connector, affect its owner, calculate nestedPath
+	 * 
 	 * @param monitor
 	 * @param info
 	 * @return CommandResult contains the created Connector
@@ -124,22 +127,22 @@ public class CustomBindingConnectorCreateCommand extends EditElementCommand {
 	@Override
 	protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
 
-		if(!canExecute()) {
+		if (!canExecute()) {
 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
 		}
 
 		// Create the Connector and its ConnectorEnd. Correct container are set and paths are set in case of <<NestedConnectorEnd>>.
 		StructuredClassifier deducedContainer = new ConnectorUtils().deduceContainer(RequestParameterUtils.getSourceView(getRequest()), RequestParameterUtils.getTargetView(getRequest()));
-		((CreateRelationshipRequest)getRequest()).setContainer(deducedContainer);
+		((CreateRelationshipRequest) getRequest()).setContainer(deducedContainer);
 		IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(deducedContainer);
 		ICommand editCommand = commandProvider.getEditCommand(getRequest());
-		
+
 		if (editCommand.canExecute()) {
 			editCommand.execute(monitor, info);
 			Object newObject = editCommand.getCommandResult().getReturnValue();
-			
+
 			if (newObject instanceof Connector) {
-				Connector connector = (Connector)newObject;
+				Connector connector = (Connector) newObject;
 				// Apply the <<BindingConnector>> stereotype
 				StereotypeApplicationHelper.INSTANCE.applyStereotype(connector, BlocksPackage.eINSTANCE.getBindingConnector());
 			}
@@ -148,5 +151,5 @@ public class CustomBindingConnectorCreateCommand extends EditElementCommand {
 		}
 		return CommandResult.newErrorCommandResult("Invalid arguments in create link command");
 	}
-	
+
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorReorientCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorReorientCommand.java
index e723548ea11..fa24c96febd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorReorientCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorReorientCommand.java
@@ -28,6 +28,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
@@ -56,48 +57,51 @@ public class CustomBindingConnectorReorientCommand extends ConnectorReorientComm
 
 	public CustomBindingConnectorReorientCommand(ReorientReferenceRelationshipRequestWithGraphical request) {
 		super(request);
-		source = reorientDirection == ReorientReferenceRelationshipRequest.REORIENT_SOURCE ? request.getNewRelationshipEnd() : request.getReferenceOwner();
-		target = reorientDirection == ReorientReferenceRelationshipRequest.REORIENT_SOURCE ? request.getReferenceOwner() : request.getNewRelationshipEnd();
+		source = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getNewRelationshipEnd() : request.getReferenceOwner();
+		target = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getReferenceOwner() : request.getNewRelationshipEnd();
 	}
 
 
 	/**
 	 * A BindingConnector could be reoriented in Parametric only if at least one end is a ConstraintParameter.
 	 * Also check Block.isEncapsulated (could not cross a Block which is encapsulted)
-	 * @return 
+	 * 
+	 * @return
 	 */
+	@Override
 	public boolean canExecute() {
-		
-		if(this.source == this.target) {
+
+		if (this.source == this.target) {
 			return false;
 		}
-		
+
 		Object connectorView = getRequest().getParameter(DefaultSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);
 		if (connectorView instanceof org.eclipse.gmf.runtime.notation.Connector) {
 			View sourceView = getSourceView();
 			View targetView = getTargetView();
-			
+
 			if (this.source != null && this.target != null) {
-				boolean hasEncapsulationViolation = !checkEncapsulationCrossing();		
-				
+				boolean hasEncapsulationViolation = !checkEncapsulationCrossing();
+
 				return hasEncapsulationViolation ? false :
-						// one of the end must be a ConstraintParameter	
-						ConstraintBlockHelper.isConstraintParameter((Element)source, sourceView)
-						|| ConstraintBlockHelper.isConstraintParameter((Element)target, targetView);
-			}			
+						// one of the end must be a ConstraintParameter
+						ConstraintBlockHelper.isConstraintParameter((Element) source, sourceView)
+								|| ConstraintBlockHelper.isConstraintParameter((Element) target, targetView);
+			}
 		}
 		return false;
 	}
 
 	/**
 	 * Check that BindingConnector do not cross a "Block.isEncapsulated" Part/Reference/ConstraintProperty
+	 * 
 	 * @return true no encapsulation problem, false else
 	 */
 	private boolean checkEncapsulationCrossing() {
 		org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils util = new org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils();
-		// source end - get the nestedPath	
+		// source end - get the nestedPath
 		List<Property> nestedPropertyPath = util.getNestedPropertyPath(getSourceView(), getTargetView());
-		// check for each level of path if crossing an isEncapsultaed Block 
+		// check for each level of path if crossing an isEncapsultaed Block
 		for (Property property : nestedPropertyPath) {
 			Type type = property.getType();
 			Block stereotypeApplication = UMLUtil.getStereotypeApplication(type, Block.class);
@@ -107,10 +111,10 @@ public class CustomBindingConnectorReorientCommand extends ConnectorReorientComm
 				}
 			}
 		}
-		
-		// target end - get the nestedPath	
+
+		// target end - get the nestedPath
 		nestedPropertyPath = util.getNestedPropertyPath(getTargetView(), getSourceView());
-		// check for each level of path if crossing an isEncapsultaed Block 
+		// check for each level of path if crossing an isEncapsultaed Block
 		for (Property property : nestedPropertyPath) {
 			Type type = property.getType();
 			Block stereotypeApplication = UMLUtil.getStereotypeApplication(type, Block.class);
@@ -122,21 +126,21 @@ public class CustomBindingConnectorReorientCommand extends ConnectorReorientComm
 		}
 		return true;
 	}
-	
+
 	@Override
 	/**
 	 * Get the link to re-orient.
-	 * 
+	 *
 	 * @return the edited {@link Connector}
 	 */
 	protected Connector getLink() {
-		return (Connector)(getConnectorView()).getElement();
+		return (Connector) (getConnectorView()).getElement();
 	}
-	
+
 	@Override
 	protected void replaceOwner(Connector connector, StructuredClassifier newOwner) {
-		
-		View sourceView = getSourceView();		
+
+		View sourceView = getSourceView();
 		View targetView = getTargetView();
 
 		StructuredClassifier deducedContainer = new ConnectorUtils().deduceContainer(sourceView, targetView);
@@ -144,24 +148,24 @@ public class CustomBindingConnectorReorientCommand extends ConnectorReorientComm
 			super.replaceOwner(connector, deducedContainer);
 		}
 	}
-	
-	private org.eclipse.gmf.runtime.notation.Connector getConnectorView () {
-		return  (org.eclipse.gmf.runtime.notation.Connector)getRequest().getParameter(DefaultSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);
+
+	private org.eclipse.gmf.runtime.notation.Connector getConnectorView() {
+		return (org.eclipse.gmf.runtime.notation.Connector) getRequest().getParameter(DefaultSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);
 	}
 
 	private View getSourceView() {
-		return reorientDirection == ReorientReferenceRelationshipRequest.REORIENT_SOURCE ? 
-					(View)((ReorientReferenceRelationshipRequestWithGraphical)getRequest()).getSourceEditPart().getModel() :
-						getConnectorView().getSource();
+		return reorientDirection == ReorientRequest.REORIENT_SOURCE ?
+				(View) ((ReorientReferenceRelationshipRequestWithGraphical) getRequest()).getSourceEditPart().getModel() :
+				getConnectorView().getSource();
 	}
-	
+
 	private View getTargetView() {
-		return reorientDirection == ReorientReferenceRelationshipRequest.REORIENT_TARGET ? 
-				(View)((ReorientReferenceRelationshipRequestWithGraphical)getRequest()).getTargetEditPart().getModel() :
-					getConnectorView().getTarget();
+		return reorientDirection == ReorientRequest.REORIENT_TARGET ?
+				(View) ((ReorientReferenceRelationshipRequestWithGraphical) getRequest()).getTargetEditPart().getModel() :
+				getConnectorView().getTarget();
 
 	}
-	
+
 	@Override
 	protected Property findNewOppositePartWithPort() {
 		// no Port allowed in Parametric
@@ -175,31 +179,31 @@ public class CustomBindingConnectorReorientCommand extends ConnectorReorientComm
 	}
 
 	/**
-	 * Reorient connector - recalculate nestedPath - remove connector deprecated representations (all diagrams) 
+	 * Reorient connector - recalculate nestedPath - remove connector deprecated representations (all diagrams)
 	 */
 	@Override
 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 		CommandResult result = super.doExecuteWithResult(monitor, info);
-		
+
 		// apply or update NestedConnectorEnd stereotype and its PropertyPath if needed
 		Connector connector = getLink();
 		if (connector.getEnds().size() == 2) {
 			updateNestedPropertyPath(connector.getEnds().get(0), getSourceView(), getTargetView());
 			updateNestedPropertyPath(connector.getEnds().get(1), getTargetView(), getSourceView());
 		}
-		
+
 		Set<View> memberViewsToDestroy = getMemberViewsToDestroy(connector);
-		// Suppress Connector representation which are not coherant with the new ConnectorEnd 
+		// Suppress Connector representation which are not coherant with the new ConnectorEnd
 		for (View view : memberViewsToDestroy) {
 			// exclude reoriented connector representation
-			if (view != getConnectorView()) { 
+			if (view != getConnectorView()) {
 				// Check Connector View ends matches with semantic ConnectorEnds
-				View sourceNode = ((org.eclipse.gmf.runtime.notation.Connector)view).getSource();
-				View targetNode = ((org.eclipse.gmf.runtime.notation.Connector)view).getTarget();
-	
+				View sourceNode = ((org.eclipse.gmf.runtime.notation.Connector) view).getSource();
+				View targetNode = ((org.eclipse.gmf.runtime.notation.Connector) view).getTarget();
+
 				EObject sourceElement = sourceNode.getElement();
 				EObject targetElement = targetNode.getElement();
-				
+
 				EList<ConnectorEnd> ends = connector.getEnds();
 				boolean isSameEnds = true;
 				for (ConnectorEnd connectorEnd : ends) {
@@ -208,7 +212,7 @@ public class CustomBindingConnectorReorientCommand extends ConnectorReorientComm
 						break;
 					}
 				}
-				
+
 				// if no matching between graphical and semantic, we destroy the representation
 				if (!isSameEnds) {
 					final DestroyElementRequest destroyRequest = new DestroyElementRequest(getRequest().getEditingDomain(), view, false);
@@ -222,20 +226,20 @@ public class CustomBindingConnectorReorientCommand extends ConnectorReorientComm
 		return result;
 	}
 
-	
+
 	protected Set<View> getMemberViewsToDestroy(final Connector connector) {
 		Set<View> viewsToDestroy = new HashSet<View>();
 
 		// Find Views in Composite Structure Diagram that are referencing current member
 		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(connector, null).iterator();
-		while(viewIt.hasNext()) {
+		while (viewIt.hasNext()) {
 			View view = viewIt.next();
 			viewsToDestroy.add(view);
 		}
 
 		return viewsToDestroy;
 	}
-	
+
 	private void updateNestedPropertyPath(ConnectorEnd connectorEnd, View sourceView, View targetView) {
 		ConnectorUtils utils = new ConnectorUtils();
 		List<Property> nestedPropertyPath = utils.getNestedPropertyPath(sourceView, targetView);
@@ -244,7 +248,7 @@ public class CustomBindingConnectorReorientCommand extends ConnectorReorientComm
 			NestedConnectorEnd nestedConnectorEnd = UMLUtil.getStereotypeApplication(connectorEnd, NestedConnectorEnd.class);
 			if (nestedConnectorEnd == null) {
 				// apply stereotype if no application found
-				nestedConnectorEnd = (NestedConnectorEnd)StereotypeApplicationHelper.INSTANCE.applyStereotype(connectorEnd, BlocksPackage.eINSTANCE.getNestedConnectorEnd());
+				nestedConnectorEnd = (NestedConnectorEnd) StereotypeApplicationHelper.INSTANCE.applyStereotype(connectorEnd, BlocksPackage.eINSTANCE.getNestedConnectorEnd());
 			}
 			// set new path
 			nestedConnectorEnd.getPropertyPath().clear();
@@ -256,7 +260,7 @@ public class CustomBindingConnectorReorientCommand extends ConnectorReorientComm
 				if (NestedConnectorEnd.class.isInstance(stereotypeApplication)) {
 					EcoreUtil.delete(stereotypeApplication, true);
 				}
-			}			
-		}		
+			}
+		}
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java
index 5b82c60ff3c..39e064573e3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java
@@ -49,13 +49,13 @@ public class CustomParametricContextLinkCreateCommand extends
 	 */

 	@Override

 	public boolean canExecute() {

-		if(source == null && target == null) {

+		if (source == null && target == null) {

 			return false;

 		}

-		if(source != null && !(source instanceof Constraint)) {

+		if (source != null && !(source instanceof Constraint)) {

 			return false;

 		}

-		if(target != null && !(target instanceof Namespace)) {

+		if (target != null && !(target instanceof Namespace)) {

 			if (target instanceof Property) {

 				if (!(((Property) target).getType() instanceof Namespace)) {

 					// not a Part / Reference / ConstraintProperty => could not create context link

@@ -67,57 +67,57 @@ public class CustomParametricContextLinkCreateCommand extends
 				return false;

 			}

 		}

-		if(getSource() == null) {

+		if (getSource() == null) {

 			return true; // link creation is in progress; source is not defined yet

 		}

 		View viewSource = findView(source);

-		

+

 		// Only one context link per Constraint

-		if(viewSource != null && source instanceof Constraint) {

+		if (viewSource != null && source instanceof Constraint) {

 			List<?> sourceConnections = ViewUtil.getSourceConnections(viewSource);

 			if (!sourceConnections.isEmpty()) {

 				return false;

 			}

-		}		

+		}

 		return true;

 	}

-	

+

 	/**

 	 * Set the Constraint context and update Constraint name with new owner ownedRules if necessary

 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if(!canExecute()) {

+		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

 		Namespace context = getTarget();

-		if(getSource() != null && context != null) {

+		if (getSource() != null && context != null) {

 			getSource().setContext(context);

 			String defaultNameWithIncrementFromBase = NamedElementHelper.getDefaultNameWithIncrementFromBase(Constraint.class.getSimpleName(), context.getOwnedRules(), getSource());

 			getSource().setName(defaultNameWithIncrementFromBase);

 			return CommandResult.newOKCommandResult();

-		}		

+		}

 		else {

-			return CommandResult.newErrorCommandResult("Try to define Constraint context to a non Namespace element");			

+			return CommandResult.newErrorCommandResult("Try to define Constraint context to a non Namespace element");

 		}

 	}

 

 	private View findView(EObject element) {

-		if(element == null) {

+		if (element == null) {

 			return null;

 		}

 		Collection<Setting> settings = CacheAdapter.getInstance().getNonNavigableInverseReferences(element);

-		for(Setting ref : settings) {

-			if(NotationPackage.eINSTANCE.getView_Element().equals(ref.getEStructuralFeature())) {

-				View view = (View)ref.getEObject();

-				if(view != null) {

+		for (Setting ref : settings) {

+			if (NotationPackage.eINSTANCE.getView_Element().equals(ref.getEStructuralFeature())) {

+				View view = (View) ref.getEObject();

+				if (view != null) {

 					return view;

 				}

 			}

 		}

 		return null;

 	}

-	

+

 	/**

 	 * Get the property Namespace in case of property typed by a Namespace

 	 */

@@ -130,8 +130,8 @@ public class CustomParametricContextLinkCreateCommand extends
 		else {

 			targetNamespace = target;

 		}

-		if (targetNamespace instanceof Namespace) {		

-			return (Namespace)targetNamespace;

+		if (targetNamespace instanceof Namespace) {

+			return (Namespace) targetNamespace;

 		}

 		else {

 			return null;

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkReorientCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkReorientCommand.java
index aff6d142008..15036e0772b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkReorientCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkReorientCommand.java
@@ -33,6 +33,7 @@ import org.eclipse.uml2.uml.Type;
 

 /**

  * A context link must have a Constraint as source and a Namespace as target

+ * 

  * @See ContextLinkReorientCommand

  *

  */

@@ -46,7 +47,7 @@ public class CustomParametricContextLinkReorientCommand extends EditElementComma
 	protected EObject newSource;

 	protected EObject oldTarget;

 	protected EObject newTarget;

-	

+

 	public CustomParametricContextLinkReorientCommand(

 			ReorientReferenceRelationshipRequestWithGraphical request) {

 		super(request.getLabel(), null, request);

@@ -56,9 +57,10 @@ public class CustomParametricContextLinkReorientCommand extends EditElementComma
 		oldSource = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getOldRelationshipEnd() : request.getReferenceOwner();

 		newSource = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getNewRelationshipEnd() : request.getReferenceOwner();

 		oldTarget = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getReferenceOwner() : request.getOldRelationshipEnd();

-		newTarget = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getReferenceOwner() : request.getNewRelationshipEnd();		

+		newTarget = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getReferenceOwner() : request.getNewRelationshipEnd();

 	}

 

+	@Override

 	public boolean canExecute() {

 		return getNewSource() instanceof Constraint && resolveNamespace(getNewTarget()) instanceof Namespace;

 	}

@@ -68,12 +70,12 @@ public class CustomParametricContextLinkReorientCommand extends EditElementComma
 	 */

 	protected Namespace resolveNamespace(Element element) {

 		if (element instanceof Namespace) {

-			return (Namespace)element;

+			return (Namespace) element;

 		}

 		if (element instanceof Property) {

 			Type type = ((Property) element).getType();

 			if (type instanceof Namespace) {

-				return (Namespace)type;

+				return (Namespace) type;

 			}

 		}

 		return null;

@@ -81,13 +83,13 @@ public class CustomParametricContextLinkReorientCommand extends EditElementComma
 

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if(!canExecute()) {

+		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

 		}

-		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

 			return reorientSource();

 		}

-		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

 			return reorientTarget();

 		}

 		throw new IllegalStateException();

@@ -105,9 +107,9 @@ public class CustomParametricContextLinkReorientCommand extends EditElementComma
 		Namespace context = resolveNamespace(getNewTarget());

 		// Check name

 		String defaultNameWithIncrementFromBase = NamedElementHelper.getDefaultNameWithIncrementFromBase(Constraint.class.getSimpleName(), context.getOwnedRules(), getNewSource());

-		((Constraint)getNewSource()).setName(defaultNameWithIncrementFromBase);

+		((Constraint) getNewSource()).setName(defaultNameWithIncrementFromBase);

 		// set the context

-		((Constraint)getNewSource()).setContext(resolveNamespace(getNewTarget()));

+		((Constraint) getNewSource()).setContext(resolveNamespace(getNewTarget()));

 

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

@@ -116,11 +118,11 @@ public class CustomParametricContextLinkReorientCommand extends EditElementComma
 		if (editPart != null) {

 			EObject semanticElement = ViewUtil.resolveSemanticElement((View) editPart.getModel());

 			if (semanticElement != null) {

-				Namespace resolvedNamespace = resolveNamespace((Element)semanticElement);

+				Namespace resolvedNamespace = resolveNamespace((Element) semanticElement);

 				if (resolvedNamespace instanceof Namespace) {

 					return resolvedNamespace;

 				}

-				return getNearestNamespace(editPart.getParent());				

+				return getNearestNamespace(editPart.getParent());

 			}

 		}

 		return null;

@@ -134,25 +136,25 @@ public class CustomParametricContextLinkReorientCommand extends EditElementComma
 		Namespace context = resolveNamespace(getNewTarget());

 		// Check name

 		String defaultNameWithIncrementFromBase = NamedElementHelper.getDefaultNameWithIncrementFromBase(Constraint.class.getSimpleName(), context.getOwnedRules(), getNewSource());

-		((Constraint)getNewSource()).setName(defaultNameWithIncrementFromBase);

+		((Constraint) getNewSource()).setName(defaultNameWithIncrementFromBase);

 		// Set the context

-		((Constraint)getNewSource()).setContext(context);

+		((Constraint) getNewSource()).setContext(context);

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

 	protected Constraint getOldSource() {

-		return (Constraint)oldSource;

+		return (Constraint) oldSource;

 	}

 

 	protected Element getNewSource() {

-		return (Element)newSource;

+		return (Element) newSource;

 	}

 

 	protected Element getOldTarget() {

-		return (Element)oldTarget;

+		return (Element) oldTarget;

 	}

 

 	protected Element getNewTarget() {

-		return (Element)newTarget;

+		return (Element) newTarget;

 	}

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommand.java
index d380d5af0ac..52176ed1dc2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommand.java
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.edit.part.ConstraintNodeLabelEditP
 /**

  * This command allow to show/hide the Constraint expression of a ConstraintProperty

  */

-public class ShowHideConstraintExpressionCommand  extends Command {

+public class ShowHideConstraintExpressionCommand extends Command {

 

 	private final GraphicalEditPart editPartToSwitch;

 

@@ -39,22 +39,22 @@ public class ShowHideConstraintExpressionCommand  extends Command {
 	@Override

 	public void execute() {

 		if (this.getEditPartToSwitch() instanceof CustomConstraintBlockPropertyCompositeEditPart) {

-			CustomConstraintBlockPropertyCompositeEditPart constraintBlockPropertyCompositeEditPart = (CustomConstraintBlockPropertyCompositeEditPart)this.getEditPartToSwitch();

+			CustomConstraintBlockPropertyCompositeEditPart constraintBlockPropertyCompositeEditPart = (CustomConstraintBlockPropertyCompositeEditPart) this.getEditPartToSwitch();

 			// get the Constraint expression graphical label

-			WrappingLabel constraintLabel = ((ConstraintBlockPropertyCompositeFigure)constraintBlockPropertyCompositeEditPart.getPrimaryShape()).getConstraintLabel();

+			WrappingLabel constraintLabel = constraintBlockPropertyCompositeEditPart.getPrimaryShape().getConstraintLabel();

 			ConstraintNodeLabelEditPart constraintNodeLabelEditPart = null;

 			// get the EditPart which contains this label

 			for (Object currentEditPart : constraintBlockPropertyCompositeEditPart.getChildren()) {

 				if (currentEditPart instanceof ConstraintNodeLabelEditPart) {

 					if (((ConstraintNodeLabelEditPart) currentEditPart).getFigure() == constraintLabel) {

-						constraintNodeLabelEditPart = (ConstraintNodeLabelEditPart)currentEditPart;

+						constraintNodeLabelEditPart = (ConstraintNodeLabelEditPart) currentEditPart;

 					}

 				}

 			}

-			

+

 			// switch visibility of this EditPart

 			if (constraintNodeLabelEditPart != null) {

-				View constraintLabelView = (View)constraintNodeLabelEditPart.getModel();

+				View constraintLabelView = (View) constraintNodeLabelEditPart.getModel();

 				constraintLabelView.setVisible(!constraintLabelView.isVisible());

 			}

 		}

@@ -64,10 +64,10 @@ public class ShowHideConstraintExpressionCommand  extends Command {
 	public void undo() {

 		execute(); // switch

 	}

-	

+

 	@Override

 	public void redo() {

 		execute(); // switch

 	}

-	

+

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommandHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommandHandler.java
index 7e3762ae77b..4c44753ad47 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommandHandler.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommandHandler.java
@@ -22,18 +22,17 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.handlers.GraphicalCommandHandler;

 

-public class ShowHideConstraintExpressionCommandHandler  extends GraphicalCommandHandler {

+public class ShowHideConstraintExpressionCommandHandler extends GraphicalCommandHandler {

 

 	@Override

 	protected Command getCommand() {

 		CompoundCommand command = new CompoundCommand("Show/Hide ConstraintProperty Constraint Expression");

 		final List<IGraphicalEditPart> selectedElements = getSelectedElements();

-		for(final IGraphicalEditPart selectedElement : selectedElements) {

-			if(selectedElement instanceof CustomConstraintBlockPropertyCompositeEditPart) {

-				command.add(new ShowHideConstraintExpressionCommand((GraphicalEditPart)selectedElement));

+		for (final IGraphicalEditPart selectedElement : selectedElements) {

+			if (selectedElement instanceof CustomConstraintBlockPropertyCompositeEditPart) {

+				command.add(new ShowHideConstraintExpressionCommand(selectedElement));

 			}

 		}

 		return command;

 	}

 }

-

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommand.java
index ac6a0167848..3eb6b985581 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommand.java
@@ -42,11 +42,11 @@ public class SwitchConstraintPropertyRepresentationCommand extends Command {
 		return this.editPartToSwitch;

 	}

 

-	

+

 	@Override

 	public void execute() {

 		if (this.getEditPartToSwitch() instanceof CustomConstraintBlockPropertyCompositeEditPart) {

-			CustomConstraintBlockPropertyCompositeEditPart constraintBlockPropertyCompositeEditPart = (CustomConstraintBlockPropertyCompositeEditPart)this.getEditPartToSwitch();

+			CustomConstraintBlockPropertyCompositeEditPart constraintBlockPropertyCompositeEditPart = (CustomConstraintBlockPropertyCompositeEditPart) this.getEditPartToSwitch();

 			ConstraintBlockPropertyCompositeFigure figure = constraintBlockPropertyCompositeEditPart.getPrimaryShape();

 			if (figure instanceof ConstraintBlockPropertyCompositeFigure) {

 				if (figure.getCorner() != 0) {

@@ -58,10 +58,10 @@ public class SwitchConstraintPropertyRepresentationCommand extends Command {
 			}

 		}

 	}

-	

+

 	@SuppressWarnings("unchecked")

 	private void switchToSquareRepresentationWithStructure(CustomConstraintBlockPropertyCompositeEditPart editPart, IFigure figure) {

-		

+

 		// Set corner as square

 		int newCorner = 0;

 		((ConstraintBlockPropertyCompositeFigure) figure).setCorner(newCorner);

@@ -72,26 +72,26 @@ public class SwitchConstraintPropertyRepresentationCommand extends Command {
 			structureCompartment.setVisible(true);

 		}

 		else {

-			structureCompartment = ViewService.createNode((View)editPart.getModel(), SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, new PreferencesHint("org.eclipse.papyrus.sysml.diagram.parametric"));

+			structureCompartment = ViewService.createNode((View) editPart.getModel(), SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, new PreferencesHint("org.eclipse.papyrus.sysml.diagram.parametric"));

 			if (structureCompartment != null) {

 				structureCompartment.setElement(editPart.resolveSemanticElement());

 			}

 		}

-		

+

 		// add the << constraint >> tag

 		editPart.getPrimaryShape().setTagLabel(String.valueOf("\u00AB") + "constraint" + String.valueOf("\u00BB"));

-		

+

 		// set the style to persist representation

-		StringValueStyle style = (StringValueStyle)((View)editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

+		StringValueStyle style = (StringValueStyle) ((View) editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

 		if (style == null) {

-			((View)editPart.getModel()).getStyles().add(NotationFactory.eINSTANCE.createStringValueStyle());

+			((View) editPart.getModel()).getStyles().add(NotationFactory.eINSTANCE.createStringValueStyle());

 		}

-		style = (StringValueStyle)((View)editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

-		style.setName(CustomConstraintBlockPropertyCompositeEditPart.REPRESENTATION_MODE_STYLE);

-		style.setStringValue(CustomConstraintBlockPropertyCompositeEditPart.SQUARE_REPRESENTATION_WITH_STRUCTURE);

-		

-		// set the default style for new elements 

-		ConstraintBlockPropertyCompositeEditPart.setLastRepresentation(CustomConstraintBlockPropertyCompositeEditPart.SQUARE_REPRESENTATION_WITH_STRUCTURE);

+		style = (StringValueStyle) ((View) editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

+		style.setName(ConstraintBlockPropertyCompositeEditPart.REPRESENTATION_MODE_STYLE);

+		style.setStringValue(ConstraintBlockPropertyCompositeEditPart.SQUARE_REPRESENTATION_WITH_STRUCTURE);

+

+		// set the default style for new elements

+		ConstraintBlockPropertyCompositeEditPart.setLastRepresentation(ConstraintBlockPropertyCompositeEditPart.SQUARE_REPRESENTATION_WITH_STRUCTURE);

 		editPart.setCornerLocators(newCorner);

 	}

 

@@ -110,18 +110,18 @@ public class SwitchConstraintPropertyRepresentationCommand extends Command {
 

 		// remove the << constraint >> tag

 		editPart.getPrimaryShape().setTagLabel("");

-		

-		// set the style to persist representation		

-		StringValueStyle style = (StringValueStyle)((View)editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

+

+		// set the style to persist representation

+		StringValueStyle style = (StringValueStyle) ((View) editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

 		if (style == null) {

-			((View)editPart.getModel()).getStyles().add(NotationFactory.eINSTANCE.createStringValueStyle());

+			((View) editPart.getModel()).getStyles().add(NotationFactory.eINSTANCE.createStringValueStyle());

 		}

-		style = (StringValueStyle)((View)editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

-		style.setName(CustomConstraintBlockPropertyCompositeEditPart.REPRESENTATION_MODE_STYLE);

-		style.setStringValue(CustomConstraintBlockPropertyCompositeEditPart.ROUNDED_REPRESENTATION);

+		style = (StringValueStyle) ((View) editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

+		style.setName(ConstraintBlockPropertyCompositeEditPart.REPRESENTATION_MODE_STYLE);

+		style.setStringValue(ConstraintBlockPropertyCompositeEditPart.ROUNDED_REPRESENTATION);

 

-		// set the default style for new elements 

-		ConstraintBlockPropertyCompositeEditPart.setLastRepresentation(CustomConstraintBlockPropertyCompositeEditPart.ROUNDED_REPRESENTATION);

+		// set the default style for new elements

+		ConstraintBlockPropertyCompositeEditPart.setLastRepresentation(ConstraintBlockPropertyCompositeEditPart.ROUNDED_REPRESENTATION);

 		editPart.setCornerLocators(newCorner);

 	}

 

@@ -134,5 +134,5 @@ public class SwitchConstraintPropertyRepresentationCommand extends Command {
 	public void redo() {

 		execute(); // switch

 	}

-	

+

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommandHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommandHandler.java
index e76ac601d3d..68f12cea669 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommandHandler.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommandHandler.java
@@ -28,15 +28,15 @@ public class SwitchConstraintPropertyRepresentationCommandHandler extends Graphi
 	protected Command getCommand() {

 		CompoundCommand command = new CompoundCommand("Switch ConstraintProperty Representation");

 		final List<IGraphicalEditPart> selectedElements = getSelectedElements();

-		for(final IGraphicalEditPart selectedElement : selectedElements) {

-			if(selectedElement instanceof CustomConstraintBlockPropertyCompositeEditPart) {

+		for (final IGraphicalEditPart selectedElement : selectedElements) {

+			if (selectedElement instanceof CustomConstraintBlockPropertyCompositeEditPart) {

 				if (selectedElement.getParent() instanceof GraphicalEditPart) {

-					command.add(new SwitchConstraintPropertyRepresentationCommand((GraphicalEditPart)selectedElement));

+					command.add(new SwitchConstraintPropertyRepresentationCommand(selectedElement));

 				}

 			}

 		}

 		return command;

 	}

-	

-	

+

+

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockCompositeEditPartTN.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockCompositeEditPartTN.java
index 092e7262356..05e26dcca13 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockCompositeEditPartTN.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockCompositeEditPartTN.java
@@ -51,31 +51,32 @@ public class CustomBlockCompositeEditPartTN extends AbstractElementEditPart {
 		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
 		super.createDefaultEditPolicies();
 	}
+
 	@Override
 	protected IFigure createNodeShape() {
 		return this.primaryShape = new ParametricDiagramFrameFigure();
 	}
-	
+
 	@Override
 	public ParametricDiagramFrameFigure getPrimaryShape() {
-		return (ParametricDiagramFrameFigure)primaryShape;
+		return (ParametricDiagramFrameFigure) primaryShape;
 	}
-	
+
 	@Override
 	protected boolean addFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof BlockLabelNameEditPart) {
-			((BlockLabelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+		if (childEditPart instanceof BlockLabelNameEditPart) {
+			((BlockLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
 			return true;
 		}
-		if(childEditPart instanceof StructureCompartmentEditPart) {
+		if (childEditPart instanceof StructureCompartmentEditPart) {
 			IFigure pane = getPrimaryShape();
 			setupContentPane(pane);
-			pane.add(((StructureCompartmentEditPart)childEditPart).getFigure());
+			pane.add(((StructureCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof ConstraintParameterAffixedNodeEditPart) {
+		if (childEditPart instanceof ConstraintParameterAffixedNodeEditPart) {
 			IBorderItemLocator locator = new FullInsidePortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ConstraintParameterAffixedNodeEditPart)childEditPart).getFigure(), locator);
+			getBorderedFigure().getBorderItemContainer().add(((ConstraintParameterAffixedNodeEditPart) childEditPart).getFigure(), locator);
 			return true;
 		}
 		return false;
@@ -83,17 +84,17 @@ public class CustomBlockCompositeEditPartTN extends AbstractElementEditPart {
 
 	@Override
 	protected boolean removeFixedChild(EditPart childEditPart) {
-		if(childEditPart instanceof BlockLabelNameEditPart) {
+		if (childEditPart instanceof BlockLabelNameEditPart) {
 			return true;
 		}
-		if(childEditPart instanceof StructureCompartmentEditPart) {
+		if (childEditPart instanceof StructureCompartmentEditPart) {
 			IFigure pane = getPrimaryShape();
 			setupContentPane(pane);
-			pane.remove(((StructureCompartmentEditPart)childEditPart).getFigure());
+			pane.remove(((StructureCompartmentEditPart) childEditPart).getFigure());
 			return true;
 		}
-		if(childEditPart instanceof ConstraintParameterAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ConstraintParameterAffixedNodeEditPart)childEditPart).getFigure());
+		if (childEditPart instanceof ConstraintParameterAffixedNodeEditPart) {
+			getBorderedFigure().getBorderItemContainer().remove(((ConstraintParameterAffixedNodeEditPart) childEditPart).getFigure());
 			return true;
 		}
 		return false;
@@ -114,7 +115,7 @@ public class CustomBlockCompositeEditPartTN extends AbstractElementEditPart {
 		return null;
 	}
 
-	
+
 	@Override
 	protected void refreshVisuals() {
 		refreshStereotypes();
@@ -122,7 +123,7 @@ public class CustomBlockCompositeEditPartTN extends AbstractElementEditPart {
 	}
 
 	protected void refreshStereotypes() {
-		Element resolveSemanticElement = (Element)this.resolveSemanticElement();
+		Element resolveSemanticElement = (Element) this.resolveSemanticElement();
 		EList<EObject> stereotypeApplications = resolveSemanticElement.getStereotypeApplications();
 		List<EObject> additionnalStereotypeApplications = new ArrayList<EObject>();
 		for (EObject currentStereotypeApplication : stereotypeApplications) {
@@ -140,7 +141,7 @@ public class CustomBlockCompositeEditPartTN extends AbstractElementEditPart {
 		}
 		getPrimaryShape().setStereotypeLabel(stereotypeLabel.toString());
 	}
-	
+
 	private String firstLetterToLowerCase(String string) {
 		String result = "";
 		if (string != null && string.length() != 0) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockPropertyCompositeEditPart.java
index 9c624f8d40d..fcb15dc092d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockPropertyCompositeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockPropertyCompositeEditPart.java
@@ -24,7 +24,7 @@ public class CustomBlockPropertyCompositeEditPart extends
 	public CustomBlockPropertyCompositeEditPart(View view) {
 		super(view);
 	}
-	
+
 	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintBlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintBlockPropertyCompositeEditPart.java
index d890bd90af4..e3da15a19a4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintBlockPropertyCompositeEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintBlockPropertyCompositeEditPart.java
@@ -24,7 +24,7 @@ public class CustomConstraintBlockPropertyCompositeEditPart extends
 	public CustomConstraintBlockPropertyCompositeEditPart(View view) {
 		super(view);
 	}
-	
+
 	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/CustomBlockPropertyCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/CustomBlockPropertyCompositeFigure.java
index 1253529362b..368d4f0b8e1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/CustomBlockPropertyCompositeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/CustomBlockPropertyCompositeFigure.java
@@ -23,13 +23,13 @@ public class CustomBlockPropertyCompositeFigure extends
 	protected void initTagLabel(String value) {
 		// do nothing: we don't want a two lines element (tag + name)
 	}
-	
+
 	@Override
 	public Label getTaggedLabel() {
 		// return a mock Label
 		return new Label();
 	}
-	
+
 	@Override
 	public void setNameLabelIcon(boolean displayNameLabelIcon) {
 		getNameLabel().setIcon(null);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsAction.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsAction.java
index ad8c01fdc34..605e687ac70 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsAction.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsAction.java
@@ -31,14 +31,14 @@ public class ShowHideRelatedContentsAction extends org.eclipse.papyrus.sysml.dia
 	public ShowHideRelatedContentsAction() {
 		super();
 	}
-	
+
 	/**
 	 * @see org.eclipse.papyrus.diagram.common.actions.AbstractShowHideAction#initAction()
 	 */
 	@Override
 	protected void initAction() {
 		super.initAction();
-		
+
 		// Only ConstraintParameter are allowed => remove Ports (and subclasses) from AffixedNode selection
 		List<EditPartRepresentation> editPartRepresentationsToRemove = new ArrayList<EditPartRepresentation>();
 		Set<EObject> representedAffixedElements = new HashSet<EObject>();
@@ -57,7 +57,7 @@ public class ShowHideRelatedContentsAction extends org.eclipse.papyrus.sysml.dia
 		for (EditPartRepresentation editPartRepresentationToRemove : editPartRepresentationsToRemove) {
 			affixedNodeRepresentations.getPossibleElement().remove(editPartRepresentationToRemove);
 		}
-		
+
 		// Remove from structure category elements which match as AffixedNode
 		editPartRepresentationsToRemove = new ArrayList<EditPartRepresentation>();
 		CompartmentEditPartRepresentation compartmentEditPartRepresentation = getCompartmentEditPartRepresentation(this.representations);
@@ -79,12 +79,12 @@ public class ShowHideRelatedContentsAction extends org.eclipse.papyrus.sysml.dia
 	}
 
 	/**
-	 * 
+	 *
 	 * @param editPartRepresentations
 	 * @return
 	 */
 	private AffixedChildrenEditPartRepresentation getAffixedNodeRepresentation(List<EditPartRepresentation> editPartRepresentations) {
-		
+
 		for (EditPartRepresentation representation : editPartRepresentations) {
 			if (representation instanceof AffixedChildrenEditPartRepresentation) {
 				return (AffixedChildrenEditPartRepresentation) representation;
@@ -99,12 +99,12 @@ public class ShowHideRelatedContentsAction extends org.eclipse.papyrus.sysml.dia
 	}
 
 	/**
-	 * 
+	 *
 	 * @param editPartRepresentations
 	 * @return
 	 */
 	private CompartmentEditPartRepresentation getCompartmentEditPartRepresentation(List<EditPartRepresentation> editPartRepresentations) {
-		
+
 		for (EditPartRepresentation representation : editPartRepresentations) {
 			if (representation instanceof CompartmentEditPartRepresentation && !(representation instanceof AffixedChildrenEditPartRepresentation)) {
 				return (CompartmentEditPartRepresentation) representation;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/parser/ParametricFrameParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/parser/ParametricFrameParser.java
index 8c5c771e40e..4bce0d50bad 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/parser/ParametricFrameParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/parser/ParametricFrameParser.java
@@ -28,9 +28,9 @@ public class ParametricFrameParser extends NamedElementLabelParser {
 	public String getPrintString(IAdaptable element, int flags) {
 		String elementType = null;
 		if (element instanceof EObjectAdapter) {
-			Object realObject = ((EObjectAdapter)element).getRealObject();
+			Object realObject = ((EObjectAdapter) element).getRealObject();
 			if (realObject instanceof org.eclipse.uml2.uml.Class) {
-				elementType = UMLUtil.getStereotypeApplication(((org.eclipse.uml2.uml.Class)realObject), ConstraintBlock.class) != null ? "ConstraintBlock" : "Block";
+				elementType = UMLUtil.getStereotypeApplication(((org.eclipse.uml2.uml.Class) realObject), ConstraintBlock.class) != null ? "ConstraintBlock" : "Block";
 			}
 		}
 		return "par [" + elementType + "] " + super.getPrintString(element, flags);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockCompositeDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockCompositeDropEditPolicy.java
index 9e657236f6e..3d350cadf70 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockCompositeDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockCompositeDropEditPolicy.java
@@ -37,7 +37,7 @@ import org.eclipse.uml2.uml.Property;
 
 /**
  * <pre>
- * Customization of the DND edit policy for BlockPropertyComposite that enables 
+ * Customization of the DND edit policy for BlockPropertyComposite that enables
  * type modification, or creation of new Port and FlowPort by a drop on target.
  * </pre>
  */
@@ -68,7 +68,7 @@ public class CustomBlockCompositeDropEditPolicy extends CustomDragDropEditPolicy
 	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {
 		if (UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID.equals(nodeType)) {
 			ConstraintParameterDropHelper constraintParameterDropHelper = new ConstraintParameterDropHelper(getEditingDomain());
-			Command commandParameterDropCommand = constraintParameterDropHelper.getDropConstraintParameter((Property)droppedEObject, dropRequest.getLocation().getCopy(), (GraphicalEditPart)getHost());
+			Command commandParameterDropCommand = constraintParameterDropHelper.getDropConstraintParameter((Property) droppedEObject, dropRequest.getLocation().getCopy(), (GraphicalEditPart) getHost());
 			return new CommandProxy(commandParameterDropCommand);
 		}
 
@@ -83,26 +83,26 @@ public class CustomBlockCompositeDropEditPolicy extends CustomDragDropEditPolicy
 		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());
 
 		// Single drop management possible drop action list can be proposed
-		if(dropRequest.getObjects().size() == 1) {
+		if (dropRequest.getObjects().size() == 1) {
 
 			// List of available drop commands
 			final List<Command> commandChoice = new ArrayList<Command>();
 
 			// 1. Try to set the target element type with dropped object
-			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart)getHost());
-			if((dropAsSetType != null) && (dropAsSetType.canExecute())) {
+			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart) getHost());
+			if ((dropAsSetType != null) && (dropAsSetType.canExecute())) {
 				commandChoice.add(dropAsSetType);
 			}
 
 			// 2. Build default drop command (show view of the dropped object)
 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
 			defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
 				commandChoice.add(defaultDropCommand);
 			}
 
 			// Prepare the selection command (if several command are available) or return the drop command
-			if(commandChoice.size() > 1) {
+			if (commandChoice.size() > 1) {
 				RunnableWithResult<ICommand> runnable;
 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
 
@@ -114,7 +114,7 @@ public class CustomBlockCompositeDropEditPolicy extends CustomDragDropEditPolicy
 				ICommand selectCommand = runnable.getResult();
 
 				return new ICommandProxy(selectCommand);
-			} else if(commandChoice.size() == 1) {
+			} else if (commandChoice.size() == 1) {
 				return commandChoice.get(0);
 			}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyCompositeDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyCompositeDropEditPolicy.java
index 11b2d73ecd1..0f4522e9c93 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyCompositeDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyCompositeDropEditPolicy.java
@@ -37,7 +37,7 @@ import org.eclipse.uml2.uml.Property;
 
 /**
  * <pre>
- * Customization of the DND edit policy for BlockPropertyComposite that enables 
+ * Customization of the DND edit policy for BlockPropertyComposite that enables
  * type modification, or creation of new Port and FlowPort by a drop on target.
  * </pre>
  */
@@ -68,7 +68,7 @@ public class CustomBlockPropertyCompositeDropEditPolicy extends CustomDragDropEd
 	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {
 		if (UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID.equals(nodeType)) {
 			ConstraintParameterDropHelper constraintParameterDropHelper = new ConstraintParameterDropHelper(getEditingDomain());
-			Command commandParameterDropCommand = constraintParameterDropHelper.getDropConstraintParameterOnPart((Property)droppedEObject, dropRequest.getLocation().getCopy(), (GraphicalEditPart)getHost());
+			Command commandParameterDropCommand = constraintParameterDropHelper.getDropConstraintParameterOnPart((Property) droppedEObject, dropRequest.getLocation().getCopy(), (GraphicalEditPart) getHost());
 			return new CommandProxy(commandParameterDropCommand);
 		}
 
@@ -83,26 +83,26 @@ public class CustomBlockPropertyCompositeDropEditPolicy extends CustomDragDropEd
 		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());
 
 		// Single drop management possible drop action list can be proposed
-		if(dropRequest.getObjects().size() == 1) {
+		if (dropRequest.getObjects().size() == 1) {
 
 			// List of available drop commands
 			final List<Command> commandChoice = new ArrayList<Command>();
 
 			// 1. Try to set the target element type with dropped object
-			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart)getHost());
-			if((dropAsSetType != null) && (dropAsSetType.canExecute())) {
+			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart) getHost());
+			if ((dropAsSetType != null) && (dropAsSetType.canExecute())) {
 				commandChoice.add(dropAsSetType);
 			}
 
 			// 2. Build default drop command (show view of the dropped object)
 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
 			defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
 				commandChoice.add(defaultDropCommand);
 			}
 
 			// Prepare the selection command (if several command are available) or return the drop command
-			if(commandChoice.size() > 1) {
+			if (commandChoice.size() > 1) {
 				RunnableWithResult<ICommand> runnable;
 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
 
@@ -114,7 +114,7 @@ public class CustomBlockPropertyCompositeDropEditPolicy extends CustomDragDropEd
 				ICommand selectCommand = runnable.getResult();
 
 				return new ICommandProxy(selectCommand);
-			} else if(commandChoice.size() == 1) {
+			} else if (commandChoice.size() == 1) {
 				return commandChoice.get(0);
 			}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
index cb8ca0e7538..ec32b28b181 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
@@ -35,7 +35,7 @@ import org.eclipse.ui.PlatformUI;
 
 /**
  * <pre>
- * Customization of the DND edit policy for BlockPropertyComposite that enables 
+ * Customization of the DND edit policy for BlockPropertyComposite that enables
  * type modification, or creation of new Port and FlowPort by a drop on target.
  * </pre>
  */
@@ -55,63 +55,63 @@ public class CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy exten
 		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());
 
 		// Single drop management possible drop action list can be proposed
-		if(dropRequest.getObjects().size() == 1) {
+		if (dropRequest.getObjects().size() == 1) {
 
 			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>(); 
+			final List<Command> commandChoice = new ArrayList<Command>();
 
 			// 1. Build command to drop BlockProperty
 			PartDropHelper partDropHelper = new PartDropHelper(getEditingDomain());
-			Command dropPartOnPart = partDropHelper.getDropPartOnPart(dropRequest, (GraphicalEditPart)getHost());
-			if((dropPartOnPart != null) && (dropPartOnPart.canExecute())) {
+			Command dropPartOnPart = partDropHelper.getDropPartOnPart(dropRequest, (GraphicalEditPart) getHost());
+			if ((dropPartOnPart != null) && (dropPartOnPart.canExecute())) {
 				commandChoice.add(dropPartOnPart);
 			}
 
 			// 2. Try to create a Part typed by the dropped object
-			Command dropAsTypedPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.PART_PROPERTY);
-			if((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
+			Command dropAsTypedPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);
+			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
 				commandChoice.add(dropAsTypedPart);
 			}
 
 			// 3. Try to create a Reference typed by the dropped object
-			Command dropAsTypedReference = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
-			if((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
+			Command dropAsTypedReference = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
+			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
 				commandChoice.add(dropAsTypedReference);
 			}
 
 			// 4. Try to create an ActorPart typed by the dropped object
-			Command dropAsTypedActorPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
-			if((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
+			Command dropAsTypedActorPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
+			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
 				commandChoice.add(dropAsTypedActorPart);
 			}
 
 			// 5. Try to create a Value typed by the dropped object
-			Command dropAsTypedValue = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.VALUE_PROPERTY);
-			if((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
+			Command dropAsTypedValue = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);
+			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
 				commandChoice.add(dropAsTypedValue);
 			}
 
 			// 6. Try to create a Property typed by the dropped object
-			Command dropAsTypedProperty = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), UMLElementTypes.PROPERTY);
-			if((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
+			Command dropAsTypedProperty = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);
+			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
 				commandChoice.add(dropAsTypedProperty);
 			}
 
 			// 7. Try to create a Property typed by the dropped object
-			Command dropAsTypedConstraintProperty = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.CONSTRAINT_PROPERTY);
-			if((dropAsTypedConstraintProperty != null) && (dropAsTypedConstraintProperty.canExecute())) {
+			Command dropAsTypedConstraintProperty = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.CONSTRAINT_PROPERTY);
+			if ((dropAsTypedConstraintProperty != null) && (dropAsTypedConstraintProperty.canExecute())) {
 				commandChoice.add(dropAsTypedConstraintProperty);
 			}
 
 			// 8. Build default drop command (show view of the dropped object)
 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
 			defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
 				commandChoice.add(defaultDropCommand);
 			}
 
 			// Prepare the selection command (if several command are available) or return the drop command
-			if(commandChoice.size() > 1) {
+			if (commandChoice.size() > 1) {
 				RunnableWithResult<ICommand> runnable;
 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
 
@@ -123,7 +123,7 @@ public class CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy exten
 				ICommand selectCommand = runnable.getResult();
 
 				return new ICommandProxy(selectCommand);
-			} else if(commandChoice.size() == 1) {
+			} else if (commandChoice.size() == 1) {
 				return commandChoice.get(0);
 			}
 
@@ -134,7 +134,7 @@ public class CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy exten
 
 		return super.getDropObjectsCommand(dropRequest);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java
index fe30f43e272..52d3922c34a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java
@@ -35,7 +35,7 @@ import org.eclipse.papyrus.uml.service.types.command.ConnectorReorientCommand;
 /**
  * <pre>
  * Custom semantic edit policy that replace DefaultSemanticEditPolicy
- * in order to manage Class Diagram specific elements (reference 
+ * in order to manage Class Diagram specific elements (reference
  * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).
  * </pre>
  */
@@ -53,21 +53,21 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 	@Override
 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
 
-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {
+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {
 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));
 		}
 
-		if(ElementTypes.CONTEXT_LINK == req.getElementType()) {
+		if (ElementTypes.CONTEXT_LINK == req.getElementType()) {
 			return getGEFWrapper(new CustomParametricContextLinkCreateCommand(req, req.getSource(), req.getTarget()));
 		}
 
 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());
 
-		if(inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {
+		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
-		if(!registry.isKnownEdgeType(newEdgeGraphicalType)) {
+		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -80,16 +80,16 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 	@Override
 	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
 
-		View reconnectedView = (View)req.getParameter(RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);
-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : IGraphicalTypeRegistry.UNDEFINED_TYPE;
+		View reconnectedView = (View) req.getParameter(RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);
+		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;
 
-		if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {
+		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {
 			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
 		}
 
-		if(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(reconnectedViewType)) {
+		if (UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(reconnectedViewType)) {
 			if (req instanceof ReorientReferenceRelationshipRequestWithGraphical) {
-				return getGEFWrapper(new CustomBindingConnectorReorientCommand((ReorientReferenceRelationshipRequestWithGraphical)req));
+				return getGEFWrapper(new CustomBindingConnectorReorientCommand((ReorientReferenceRelationshipRequestWithGraphical) req));
 			}
 			else {
 				return getGEFWrapper(new ConnectorReorientCommand(req));
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDragDropEditPolicy.java
index 9156a8a03c4..fc5f6ad3a61 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDragDropEditPolicy.java
@@ -50,7 +50,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 
 	private ConnectorUtils utils = new ConnectorUtils();
-	
+
 	/** Default constructor. */
 	public CustomDragDropEditPolicy() {
 		super(new CustomLinkMappingHelper());
@@ -74,8 +74,8 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 	 */
 	@Override
 	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {
-		if((UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(edgeType)) && (droppedEObject instanceof Connector)) {
-			return getConnectorDropCommand(dropRequest, (Connector)droppedEObject, edgeType);
+		if ((UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(edgeType)) && (droppedEObject instanceof Connector)) {
+			return getConnectorDropCommand(dropRequest, (Connector) droppedEObject, edgeType);
 		}
 
 		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
@@ -84,14 +84,14 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 	protected ICommand getConnectorDropCommand(DropObjectsRequest dropRequest, Connector droppedEObject, String edgeType) {
 
 		// Only manage binary link during drop
-		if(droppedEObject.getEnds().size() != 2) {
+		if (droppedEObject.getEnds().size() != 2) {
 			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
 		}
 
 		ConnectorEnd source = droppedEObject.getEnds().get(0);
 		ConnectorEnd target = droppedEObject.getEnds().get(1);
 
-		// Find views in current diagram representing source and target 
+		// Find views in current diagram representing source and target
 		Collection<View> sourceViews = getViewsForConnectorEnd(source);
 		Collection<View> targetViews = getViewsForConnectorEnd(target);
 
@@ -99,32 +99,32 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 		IAdaptable targetViewAdapter = null;
 
 		// If either a source or target lacks create view for these elements, abort...
-		if(sourceViews.isEmpty() || targetViews.isEmpty()) {
+		if (sourceViews.isEmpty() || targetViews.isEmpty()) {
 			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
 		}
 
 		View selectedSourceView = null;
 		View selectedTargetView = null;
 		// until a correct one is found, check that source and target views selected are correct given the current path for the connector...
-		for(View sourceView : sourceViews) {
+		for (View sourceView : sourceViews) {
 			View targetView = getFirstValidTargetViewForSource(sourceView, targetViews, droppedEObject);
-			if(targetView !=null) {
+			if (targetView != null) {
 				selectedSourceView = sourceView;
 				selectedTargetView = targetView;
 				break;
 			}
 		}
-		
-		
+
+
 		// Create source adapter
-		if(selectedSourceView!=null) { // sourceViewAdapter should still be null in this case
+		if (selectedSourceView != null) { // sourceViewAdapter should still be null in this case
 			sourceViewAdapter = new SemanticAdapter(null, selectedSourceView);
 		} else {
 			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
 		}
 
 		// Create target adapter
-		if(selectedTargetView!=null) { // targetViewAdapter should still be null in this case
+		if (selectedTargetView != null) { // targetViewAdapter should still be null in this case
 			targetViewAdapter = new SemanticAdapter(null, selectedTargetView);
 		} else {
 			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
@@ -143,54 +143,55 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 
 	/**
 	 * get the first valid target view for the given source. the couple source/target is valid if the path to them from the future container is valid
+	 * 
 	 * @param sourceView
 	 * @param targetViews
 	 * @return
 	 */
 	private View getFirstValidTargetViewForSource(View sourceView, Collection<View> targetViews, Connector droppedConnector) {
-		for(View targetView : targetViews) {
-			if(isValidTargetViewForSource(sourceView, targetView, droppedConnector)) {
+		for (View targetView : targetViews) {
+			if (isValidTargetViewForSource(sourceView, targetView, droppedConnector)) {
 				return targetView;
 			}
 		}
-		 
+
 		return null;
 	}
-	
+
 	private boolean isValidTargetViewForSource(View sourceView, View targetView, Connector droppedConnector) {
-		if(!(utils.isCrossingEncapsulation(sourceView, targetView))) {
+		if (!(utils.isCrossingEncapsulation(sourceView, targetView))) {
 			// no encapsulation. Computes the end paths
 			List<Property> sourceNestedPaths = utils.getNestedPropertyPath(sourceView, targetView);
 			List<Property> targetNestedPaths = utils.getNestedPropertyPath(targetView, sourceView);
-			
+
 			// check this is compatible with current connector
 			ConnectorEnd sourceConnectorEnd = utils.getSourceConnectorEnd(droppedConnector);
 			NestedConnectorEnd nestedSourceConnectorEnd = UMLUtil.getStereotypeApplication(sourceConnectorEnd, NestedConnectorEnd.class);
-			if(nestedSourceConnectorEnd!=null) {
+			if (nestedSourceConnectorEnd != null) {
 				List<Property> currentSourceConnectorPropertyPath = nestedSourceConnectorEnd.getPropertyPath();
 				// compare the 2 list
-				if(!sourceNestedPaths.equals(currentSourceConnectorPropertyPath)) {
+				if (!sourceNestedPaths.equals(currentSourceConnectorPropertyPath)) {
 					return false;
 				}
-				
-			} else { // no end for the current connector, so the sourceNestedPath should be empty 
-				if(!sourceNestedPaths.isEmpty()) {
+
+			} else { // no end for the current connector, so the sourceNestedPath should be empty
+				if (!sourceNestedPaths.isEmpty()) {
 					return false;
 				}
 			}
-			
-			
+
+
 			ConnectorEnd targetConnectorEnd = utils.getTargetConnectorEnd(droppedConnector);
 			NestedConnectorEnd nestedTargetConnectorEnd = UMLUtil.getStereotypeApplication(targetConnectorEnd, NestedConnectorEnd.class);
-			if(nestedTargetConnectorEnd!=null) {
+			if (nestedTargetConnectorEnd != null) {
 				List<Property> currentTargetConnectorPropertyPath = nestedTargetConnectorEnd.getPropertyPath();
 				// compare the 2 list
-				if(!targetNestedPaths.equals(currentTargetConnectorPropertyPath)) {
+				if (!targetNestedPaths.equals(currentTargetConnectorPropertyPath)) {
 					return false;
 				}
-				
-			} else { // no end for the current connector, so the targetNestedPaths should be empty 
-				if(!targetNestedPaths.isEmpty()) {
+
+			} else { // no end for the current connector, so the targetNestedPaths should be empty
+				if (!targetNestedPaths.isEmpty()) {
 					return false;
 				}
 			}
@@ -200,16 +201,16 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 
 	/**
 	 * This methods looks for views representing a given {@link ConnectorEnd} in the host diagram.
-	 * 
+	 *
 	 * @param end
-	 *        the {@link ConnectorEnd} to look for.
+	 *            the {@link ConnectorEnd} to look for.
 	 * @return the list of {@link View} representing the eObject.
 	 */
 	protected Set<View> getViewsForConnectorEnd(ConnectorEnd end) {
 		Set<View> views = new HashSet<View>();
 
 		// Retrieve host diagram
-		View hostView = ((IGraphicalEditPart)getHost()).getNotationView();
+		View hostView = ((IGraphicalEditPart) getHost()).getNotationView();
 		View hostDiagram = (hostView instanceof Diagram) ? hostView : hostView.getDiagram();
 
 		// Retrieve all views for the ConnectorEnd role
@@ -218,43 +219,43 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 		Collection<View> relatedViews = EMFCoreUtil.getReferencers(end.getRole(), refs);
 
 		// TODO: We should filter views not only for the current diagram,
-		//       but also consider only views nested within the owner of the connector that are closest to the host view
-		//       (in case there are several instances of a Part within which the connector could appear).
+		// but also consider only views nested within the owner of the connector that are closest to the host view
+		// (in case there are several instances of a Part within which the connector could appear).
 		// Connector connector = (Connector)end.getOwner();
 		// StructuredClassifier connectorOwner = (StructuredClassifier)connector.getOwner();
-		// Parse and select views from host diagram only	
+		// Parse and select views from host diagram only
 		Iterator<View> it = relatedViews.iterator();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			View currentView = it.next();
-			if(currentView.getDiagram() == hostDiagram) { // FIXME: Cf TODO above.
+			if (currentView.getDiagram() == hostDiagram) { // FIXME: Cf TODO above.
 
 				boolean isInView = false;
 				View containerView = currentView;
-				while(containerView != null && !(containerView instanceof Diagram)) {
-					if(containerView == getReferenceViewForConnectorEnd()) {
+				while (containerView != null && !(containerView instanceof Diagram)) {
+					if (containerView == getReferenceViewForConnectorEnd()) {
 						isInView = true;
 					}
 					containerView = ViewUtil.getContainerView(containerView);
 				}
 
-				if(isInView) {
+				if (isInView) {
 
 					EObject containerElement = ViewUtil.getContainerView(currentView).getElement();
 
-					// If the ConnectorEnd partWithPort is not null, only select Views for which 
+					// If the ConnectorEnd partWithPort is not null, only select Views for which
 					// the graphical parent reference partWithPort.
-					if(end.getPartWithPort() != null) {
-						if(containerElement == end.getPartWithPort()) {
+					if (end.getPartWithPort() != null) {
+						if (containerElement == end.getPartWithPort()) {
 							views.add(currentView);
 						}
 					} else {
 						// If the role is a Port, its graphical parent is a EncapsulatedClassifier
-						if(end.getRole() instanceof Port) {
-							if(containerElement instanceof EncapsulatedClassifier) {
+						if (end.getRole() instanceof Port) {
+							if (containerElement instanceof EncapsulatedClassifier) {
 								views.add(currentView);
-							} else if(containerElement instanceof Property) {
-								Property property = (Property)containerElement;
-								if(property.getType() == end.getRole().getOwner()) {
+							} else if (containerElement instanceof Property) {
+								Property property = (Property) containerElement;
+								if (property.getType() == end.getRole().getOwner()) {
 									views.add(currentView);
 								}
 							}
@@ -271,7 +272,7 @@ public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 	}
 
 	protected View getReferenceViewForConnectorEnd() {
-		return ((IGraphicalEditPart)getHost()).getNotationView();
+		return ((IGraphicalEditPart) getHost()).getNotationView();
 	}
 
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomParametricSemanticPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomParametricSemanticPolicy.java
index 1a8188dcda6..32c432e2eb7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomParametricSemanticPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomParametricSemanticPolicy.java
@@ -28,6 +28,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
 import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompositeEditPart;
@@ -60,8 +61,8 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 					return UnexecutableCommand.INSTANCE;
 				}
 				// Could not create Part/Reference/Value
-				if (request instanceof CreateElementRequest && ((CreateElementRequest)request).getElementType() instanceof SpecializationType) {
-					IElementMatcher matcher = ((SpecializationType)((CreateElementRequest)request).getElementType()).getMatcher();
+				if (request instanceof CreateElementRequest && ((CreateElementRequest) request).getElementType() instanceof SpecializationType) {
+					IElementMatcher matcher = ((SpecializationType) ((CreateElementRequest) request).getElementType()).getMatcher();
 					if (matcher instanceof PartPropertyMatcher) {
 						return UnexecutableCommand.INSTANCE;
 					}
@@ -84,16 +85,16 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 				return UnexecutableCommand.INSTANCE;
 			}
 			if (getHost() instanceof CustomConstraintBlockPropertyCompositeEditPart) {
-				return UnexecutableCommand.INSTANCE;			
+				return UnexecutableCommand.INSTANCE;
 			}
 			if (getHost() instanceof ConstraintParameterAffixedNodeEditPart) {
-				return getGEFWrapper(new CustomBindingConnectorCreateCommand(req));			
+				return getGEFWrapper(new CustomBindingConnectorCreateCommand(req));
 			}
 			if (getHost() instanceof PortAffixedNodeEditPart) {
-				return getGEFWrapper(new CustomBindingConnectorCreateCommand(req));				
+				return getGEFWrapper(new CustomBindingConnectorCreateCommand(req));
 			}
 			if (getHost() instanceof BlockPropertyCompositeEditPart) {
-				return getGEFWrapper(new CustomBindingConnectorCreateCommand(req));				
+				return getGEFWrapper(new CustomBindingConnectorCreateCommand(req));
 			}
 		}
 		return super.getCreateRelationshipCommand(req);
@@ -102,25 +103,24 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 	/**
 	 * Method getReorientRefRelationshipTargetCommand. Removes the reference the
 	 * ConnectionEditPart current has an add the new TargetEditPart
-	 * 
+	 *
 	 * @param request
 	 * @return Command
 	 */
 	@Override
-	
 	protected Command getReorientRelationshipSourceCommand(
 			ReconnectRequest request) {
-		
+
 		EditPart target = request.getTarget();
 		if (target instanceof CustomBlockCompositeEditPartTN) {
 			return UnexecutableCommand.INSTANCE;
 		}
 		if (target instanceof CustomConstraintBlockPropertyCompositeEditPart) {
-			return UnexecutableCommand.INSTANCE;			
+			return UnexecutableCommand.INSTANCE;
 		}
 
 		org.eclipse.gef.ConnectionEditPart connectionEP = (request).getConnectionEditPart();
-		
+
 		if (connectionEP instanceof ConnectionEditPart) {
 			if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
 				return null;
@@ -130,21 +130,21 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 		EditPart sourceEditPart = connectionEP.getSource();
 		EditPart targetEditPart = connectionEP.getTarget();
 		EObject referenceOwner = ViewUtil
-			.resolveSemanticElement((View) targetEditPart.getModel());
+				.resolveSemanticElement((View) targetEditPart.getModel());
 		EObject oldTarget = ViewUtil
-			.resolveSemanticElement((View) sourceEditPart.getModel());
+				.resolveSemanticElement((View) sourceEditPart.getModel());
 		EObject newTarget = ViewUtil
-			.resolveSemanticElement((View) request.getTarget().getModel());
+				.resolveSemanticElement((View) request.getTarget().getModel());
+
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
+				.getEditingDomain();
 
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
+		ReorientReferenceRelationshipRequest semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
+				editingDomain, referenceOwner, newTarget, oldTarget,
+				ReorientRequest.REORIENT_SOURCE,
+				request.getTarget(), targetEditPart);
 
-        ReorientReferenceRelationshipRequest semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
-            editingDomain, referenceOwner, newTarget, oldTarget,
-            ReorientReferenceRelationshipRequest.REORIENT_SOURCE,
-            request.getTarget(), targetEditPart);
-        
-        semRequest.addParameters(request.getExtendedData());
+		semRequest.addParameters(request.getExtendedData());
 		return getSemanticCommand(semRequest);
 	}
 
@@ -153,24 +153,24 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 	/**
 	 * Method getReorientRefRelationshipTargetCommand. Removes the reference the
 	 * ConnectionEditPart current has an add the new TargetEditPart
-	 * 
+	 *
 	 * @param request
 	 * @return Command
 	 */
 	@Override
 	protected Command getReorientRelationshipTargetCommand(
 			ReconnectRequest request) {
-		
+
 		EditPart target = request.getTarget();
 		if (target instanceof CustomBlockCompositeEditPartTN) {
 			return UnexecutableCommand.INSTANCE;
 		}
 		if (target instanceof CustomConstraintBlockPropertyCompositeEditPart) {
-			return UnexecutableCommand.INSTANCE;			
+			return UnexecutableCommand.INSTANCE;
 		}
 
 		org.eclipse.gef.ConnectionEditPart connectionEP = (request).getConnectionEditPart();
-		
+
 		if (connectionEP instanceof ConnectionEditPart) {
 			if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
 				return null;
@@ -180,21 +180,21 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 		EditPart sourceEditPart = connectionEP.getSource();
 		EditPart targetEditPart = connectionEP.getTarget();
 		EObject referenceOwner = ViewUtil
-			.resolveSemanticElement((View) sourceEditPart.getModel());
+				.resolveSemanticElement((View) sourceEditPart.getModel());
 		EObject oldTarget = ViewUtil
-			.resolveSemanticElement((View) targetEditPart.getModel());
+				.resolveSemanticElement((View) targetEditPart.getModel());
 		EObject newTarget = ViewUtil
-			.resolveSemanticElement((View) request.getTarget().getModel());
+				.resolveSemanticElement((View) request.getTarget().getModel());
+
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
+				.getEditingDomain();
 
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
+		ReorientReferenceRelationshipRequest semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
+				editingDomain, referenceOwner, newTarget, oldTarget,
+				ReorientRequest.REORIENT_TARGET,
+				sourceEditPart, request.getTarget());
 
-        ReorientReferenceRelationshipRequest semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
-                editingDomain, referenceOwner, newTarget, oldTarget,
-                ReorientReferenceRelationshipRequest.REORIENT_TARGET,
-                sourceEditPart, request.getTarget());
-        
-        semRequest.addParameters(request.getExtendedData());
+		semRequest.addParameters(request.getExtendedData());
 
 		return getSemanticCommand(semRequest);
 	}
@@ -203,9 +203,9 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 	protected Command getReorientRefRelationshipSourceCommand(
 			ReconnectRequest request) {
 
-		if(request.getConnectionEditPart() instanceof ContextLinkEditPart) {
+		if (request.getConnectionEditPart() instanceof ContextLinkEditPart) {
 			org.eclipse.gef.ConnectionEditPart connectionEP = request.getConnectionEditPart();
-			
+
 			if (connectionEP instanceof ConnectionEditPart) {
 				if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
 					return null;
@@ -215,20 +215,20 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 			EditPart sourceEditPart = connectionEP.getSource();
 			EditPart targetEditPart = connectionEP.getTarget();
 			EObject referenceOwner = ViewUtil
-				.resolveSemanticElement((View) targetEditPart.getModel());
+					.resolveSemanticElement((View) targetEditPart.getModel());
 			EObject oldTarget = ViewUtil
-				.resolveSemanticElement((View) sourceEditPart.getModel());
+					.resolveSemanticElement((View) sourceEditPart.getModel());
 			EObject newTarget = ViewUtil
-				.resolveSemanticElement((View) request.getTarget().getModel());
+					.resolveSemanticElement((View) request.getTarget().getModel());
 
-	        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-	            .getEditingDomain();
+			TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
+					.getEditingDomain();
 
-	        ReorientReferenceRelationshipRequestWithGraphical semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
-	                editingDomain, referenceOwner, newTarget, oldTarget,
-	                ReorientReferenceRelationshipRequest.REORIENT_SOURCE,
-	                sourceEditPart, targetEditPart);
-			return  getGEFWrapper(new CustomParametricContextLinkReorientCommand(semRequest));
+			ReorientReferenceRelationshipRequestWithGraphical semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
+					editingDomain, referenceOwner, newTarget, oldTarget,
+					ReorientRequest.REORIENT_SOURCE,
+					sourceEditPart, targetEditPart);
+			return getGEFWrapper(new CustomParametricContextLinkReorientCommand(semRequest));
 		}
 		return super.getReorientRefRelationshipTargetCommand(request);
 	}
@@ -236,9 +236,9 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 	@Override
 	protected Command getReorientRefRelationshipTargetCommand(
 			ReconnectRequest request) {
-		if(request.getConnectionEditPart() instanceof ContextLinkEditPart) {
+		if (request.getConnectionEditPart() instanceof ContextLinkEditPart) {
 			org.eclipse.gef.ConnectionEditPart connectionEP = request.getConnectionEditPart();
-			
+
 			if (connectionEP instanceof ConnectionEditPart) {
 				if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
 					return null;
@@ -248,23 +248,23 @@ public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
 			EditPart sourceEditPart = connectionEP.getSource();
 			EditPart targetEditPart = connectionEP.getTarget();
 			EObject referenceOwner = ViewUtil
-				.resolveSemanticElement((View) sourceEditPart.getModel());
+					.resolveSemanticElement((View) sourceEditPart.getModel());
 			EObject oldTarget = ViewUtil
-				.resolveSemanticElement((View) targetEditPart.getModel());
+					.resolveSemanticElement((View) targetEditPart.getModel());
 			EObject newTarget = ViewUtil
-				.resolveSemanticElement((View) request.getTarget().getModel());
+					.resolveSemanticElement((View) request.getTarget().getModel());
 
-	        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-	            .getEditingDomain();
+			TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
+					.getEditingDomain();
 
-	        ReorientReferenceRelationshipRequestWithGraphical semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
-	                editingDomain, referenceOwner, newTarget, oldTarget,
-	                ReorientReferenceRelationshipRequest.REORIENT_TARGET,
-	                sourceEditPart, targetEditPart);
-			return  getGEFWrapper(new CustomParametricContextLinkReorientCommand(semRequest));
+			ReorientReferenceRelationshipRequestWithGraphical semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
+					editingDomain, referenceOwner, newTarget, oldTarget,
+					ReorientRequest.REORIENT_TARGET,
+					sourceEditPart, targetEditPart);
+			return getGEFWrapper(new CustomParametricContextLinkReorientCommand(semRequest));
 		}
 		return super.getReorientRefRelationshipTargetCommand(request);
 	}
 
-	
+
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureClassifierDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureClassifierDropEditPolicy.java
index 2a6506ae688..2b1881ab51c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureClassifierDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureClassifierDropEditPolicy.java
@@ -61,56 +61,56 @@ public class CustomStructureClassifierDropEditPolicy extends CustomDragDropEditP
 		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());
 
 		// Single drop management possible drop action list can be proposed
-		if(dropRequest.getObjects().size() == 1) {
+		if (dropRequest.getObjects().size() == 1) {
 
 			// List of available drop commands
 			final List<Command> commandChoice = new ArrayList<Command>();
 
 			// 1. Try to create a Part typed by the dropped object
-			Command dropAsTypedPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.PART_PROPERTY);
-			if((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
+			Command dropAsTypedPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);
+			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
 				commandChoice.add(dropAsTypedPart);
 			}
 
 			// 2. Try to create a Reference typed by the dropped object
-			Command dropAsTypedReference = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
-			if((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
+			Command dropAsTypedReference = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
+			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
 				commandChoice.add(dropAsTypedReference);
 			}
 
 			// 3. Try to create an ActorPart typed by the dropped object
-			Command dropAsTypedActorPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
-			if((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
+			Command dropAsTypedActorPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
+			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
 				commandChoice.add(dropAsTypedActorPart);
 			}
 
 			// 4. Try to create a Value typed by the dropped object
-			Command dropAsTypedValue = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.VALUE_PROPERTY);
-			if((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
+			Command dropAsTypedValue = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);
+			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
 				commandChoice.add(dropAsTypedValue);
 			}
 
 			// 5. Try to create a Property typed by the dropped object
-			Command dropAsTypedProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), UMLElementTypes.PROPERTY);
-			if((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
+			Command dropAsTypedProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);
+			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
 				commandChoice.add(dropAsTypedProperty);
 			}
 
 			// 6. Try to create a ConstraintProperty typed by the dropped object
-			Command dropAsTypedConstraintProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.CONSTRAINT_PROPERTY);
-			if((dropAsTypedConstraintProperty != null) && (dropAsTypedConstraintProperty.canExecute())) {
+			Command dropAsTypedConstraintProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.CONSTRAINT_PROPERTY);
+			if ((dropAsTypedConstraintProperty != null) && (dropAsTypedConstraintProperty.canExecute())) {
 				commandChoice.add(dropAsTypedConstraintProperty);
 			}
 
 			// 7. Build default drop command (show view of the dropped object)
 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
 				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
 				commandChoice.add(defaultDropCommand);
 			}
 
 			// Prepare the selection command (if several command are available) or return the drop command
-			if(commandChoice.size() > 1) {
+			if (commandChoice.size() > 1) {
 				RunnableWithResult<ICommand> runnable;
 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
 
@@ -123,7 +123,7 @@ public class CustomStructureClassifierDropEditPolicy extends CustomDragDropEditP
 
 				return new ICommandProxy(selectCommand);
 
-			} else if(commandChoice.size() == 1) {
+			} else if (commandChoice.size() == 1) {
 				return commandChoice.get(0);
 			}
 
@@ -145,13 +145,13 @@ public class CustomStructureClassifierDropEditPolicy extends CustomDragDropEditP
 
 	@Override
 	protected ICommand getDropObjectCommand(DropObjectsRequest dropRequest, EObject droppedObject) {
-		View dropTargetView = ((IGraphicalEditPart)getHost()).getNotationView();
+		View dropTargetView = ((IGraphicalEditPart) getHost()).getNotationView();
 		EObject dropTargetElement = dropTargetView.getElement();
 
 		EObject diagramOwner = getDiagramOwner(dropTargetView);
-		if(UMLUtil.getStereotypeApplication((Element)diagramOwner, ConstraintBlock.class) != null) {
+		if (UMLUtil.getStereotypeApplication((Element) diagramOwner, ConstraintBlock.class) != null) {
 			// ConstraintBlock
-			if(UMLUtil.getStereotypeApplication((Element)dropTargetElement, ConstraintProperty.class) == null) {
+			if (UMLUtil.getStereotypeApplication((Element) dropTargetElement, ConstraintProperty.class) == null) {
 				// only ConstraintProperty can be dropped in structure compartment of a diagram owned by a ConstraintBlock
 				return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
 			}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/StructureClassifierDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/StructureClassifierDropEditPolicy.java
index c1379b00b91..c4687b40541 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/StructureClassifierDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/StructureClassifierDropEditPolicy.java
@@ -55,56 +55,56 @@ public class StructureClassifierDropEditPolicy extends CustomDragDropEditPolicy
 		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());
 
 		// Single drop management possible drop action list can be proposed
-		if(dropRequest.getObjects().size() == 1) {
+		if (dropRequest.getObjects().size() == 1) {
 
 			// List of available drop commands
 			final List<Command> commandChoice = new ArrayList<Command>();
 
 			// 1. Try to create a Part typed by the dropped object
-			Command dropAsTypedPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.PART_PROPERTY);
-			if((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
+			Command dropAsTypedPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);
+			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
 				commandChoice.add(dropAsTypedPart);
 			}
 
 			// 2. Try to create a Reference typed by the dropped object
-			Command dropAsTypedReference = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
-			if((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
+			Command dropAsTypedReference = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
+			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
 				commandChoice.add(dropAsTypedReference);
 			}
 
 			// 3. Try to create an ActorPart typed by the dropped object
-			Command dropAsTypedActorPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
-			if((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
+			Command dropAsTypedActorPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
+			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
 				commandChoice.add(dropAsTypedActorPart);
 			}
 
 			// 4. Try to create a Value typed by the dropped object
-			Command dropAsTypedValue = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.VALUE_PROPERTY);
-			if((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
+			Command dropAsTypedValue = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);
+			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
 				commandChoice.add(dropAsTypedValue);
 			}
 
 			// 5. Try to create a Property typed by the dropped object
-			Command dropAsTypedProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), UMLElementTypes.PROPERTY);
-			if((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
+			Command dropAsTypedProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);
+			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
 				commandChoice.add(dropAsTypedProperty);
 			}
-			
+
 			// 6. Try to create a ConstraintProperty typed by the dropped object
-			Command dropAsTypedConstraintProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart)getHost(), SysMLElementTypes.CONSTRAINT_PROPERTY);
-			if((dropAsTypedConstraintProperty != null) && (dropAsTypedConstraintProperty.canExecute())) {
+			Command dropAsTypedConstraintProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.CONSTRAINT_PROPERTY);
+			if ((dropAsTypedConstraintProperty != null) && (dropAsTypedConstraintProperty.canExecute())) {
 				commandChoice.add(dropAsTypedConstraintProperty);
 			}
 
 			// 7. Build default drop command (show view of the dropped object)
 			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
 			defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-			if((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
+			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
 				commandChoice.add(defaultDropCommand);
 			}
 
 			// Prepare the selection command (if several command are available) or return the drop command
-			if(commandChoice.size() > 1) {
+			if (commandChoice.size() > 1) {
 				RunnableWithResult<ICommand> runnable;
 				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
 
@@ -117,7 +117,7 @@ public class StructureClassifierDropEditPolicy extends CustomDragDropEditPolicy
 
 				return new ICommandProxy(selectCommand);
 
-			} else if(commandChoice.size() == 1) {
+			} else if (commandChoice.size() == 1) {
 				return commandChoice.get(0);
 			}
 
@@ -128,7 +128,7 @@ public class StructureClassifierDropEditPolicy extends CustomDragDropEditPolicy
 
 		return super.getDropObjectsCommand(dropRequest);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockPropertyCompositePreferencePage.java
index b544b1e664a..bbdd7af189a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockPropertyCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockPropertyCompositePreferencePage.java
@@ -27,7 +27,7 @@ public class BlockPropertyCompositePreferencePage extends AbstractPreferencePage
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		CustomBlockPropertyCompositePreferencePage.initDefaults(store);
-		/*CustomNestedBlockPropertyCompositePreferencePage.initDefaults(store);*/
+		/* CustomNestedBlockPropertyCompositePreferencePage.initDefaults(store); */
 	}
 
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java
index 4fd862e09a4..2ffc26dbd2c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java
@@ -70,13 +70,13 @@ public class CustomBlockPropertyCompositePreferencePage extends ParametricDiagra
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -87,7 +87,7 @@ public class CustomBlockPropertyCompositePreferencePage extends ParametricDiagra
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -97,7 +97,7 @@ public class CustomBlockPropertyCompositePreferencePage extends ParametricDiagra
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java
index eb59e954379..7634ef678be 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java
@@ -68,13 +68,13 @@ public class CustomConstraintPropertyCompositePreferencePage extends ParametricD
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -85,7 +85,7 @@ public class CustomConstraintPropertyCompositePreferencePage extends ParametricD
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -95,7 +95,7 @@ public class CustomConstraintPropertyCompositePreferencePage extends ParametricD
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java
index 0bda174013c..7987ab758c1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java
@@ -57,9 +57,9 @@ public class CustomPreferenceInitializer extends ParametricDiagramPreferenceInit
 	 * Initialize default position of a link label in preferences.
 	 *
 	 * @param parentGraphicalType
-	 *        the graphical type of the view owning the label
+	 *            the graphical type of the view owning the label
 	 * @param graphicalType
-	 *        the graphical type of the label
+	 *            the graphical type of the label
 	 * @param x
 	 * @param y
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPolicyProvider.java
index 965593ca01a..8d298bfde1a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPolicyProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPolicyProvider.java
@@ -64,45 +64,45 @@ public class CustomEditPolicyProvider extends ParametricDiagramEditPolicyProvide
 	@Override
 	public boolean provides(IOperation operation) {
 
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;
-		if(!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+		if (!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {
 			return false;
 		}
 
 		// Make sure this concern Parametric Diagram only
-		IGraphicalEditPart gep = (IGraphicalEditPart)epOperation.getEditPart();
+		IGraphicalEditPart gep = (IGraphicalEditPart) epOperation.getEditPart();
 		String diagramType = gep.getNotationView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
 		// provides for the main diagram edit part
-		if(gep instanceof ParametricDiagramEditPart) {
+		if (gep instanceof ParametricDiagramEditPart) {
 			return true;
 		}
 
 		// Provides for edit parts that represent nodes in Internal Block diagram
-		if(gep instanceof AbstractElementEditPart) {
+		if (gep instanceof AbstractElementEditPart) {
 			return true;
 		}
-		if(gep instanceof AbstractElementBorderEditPart) {
+		if (gep instanceof AbstractElementBorderEditPart) {
 			return true;
 		}
 
 		// Provides for edit parts that represent edges in Internal Block diagram
-		if(gep instanceof AbstractElementLinkEditPart) {
+		if (gep instanceof AbstractElementLinkEditPart) {
 			return true;
 		}
 
-		if(gep instanceof ResizableCompartmentEditPart) {
+		if (gep instanceof ResizableCompartmentEditPart) {
 			return true;
 		}
 
-		if(gep instanceof ConstraintSpecificationEditPartCN) {
+		if (gep instanceof ConstraintSpecificationEditPartCN) {
 			return true;
 		}
 
-		if(gep instanceof ConstraintEditPartCN) {
+		if (gep instanceof ConstraintEditPartCN) {
 			return true;
 		}
 
@@ -113,74 +113,74 @@ public class CustomEditPolicyProvider extends ParametricDiagramEditPolicyProvide
 	public void createEditPolicies(EditPart editPart) {
 		super.createEditPolicies(editPart);
 
-		if(editPart instanceof ParametricDiagramEditPart) {
+		if (editPart instanceof ParametricDiagramEditPart) {
 			editPart.installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());
 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDropEditPolicy());
-			// no installation of other policies. 
+			// no installation of other policies.
 			return;
 		}
 
 		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
 
-		if((editPart instanceof ConstraintEditPart) || (editPart instanceof ConstraintEditPartCN)) {
+		if ((editPart instanceof ConstraintEditPart) || (editPart instanceof ConstraintEditPartCN)) {
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
 		}
 
-		if((editPart instanceof CommentEditPart) || (editPart instanceof CommentEditPartCN)) {
+		if ((editPart instanceof CommentEditPart) || (editPart instanceof CommentEditPartCN)) {
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());
 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
 		}
 
-		if(editPart instanceof BlockPropertyCompositeEditPart) {
+		if (editPart instanceof BlockPropertyCompositeEditPart) {
 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyCompositeDropEditPolicy());
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
 		}
 
-		if(editPart instanceof BlockPropertyStructureCompartmentEditPart) {
+		if (editPart instanceof BlockPropertyStructureCompartmentEditPart) {
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockPropertyStructureCompartmentSemanticEditPolicy());
 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy());
 			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());
 		}
 
-		if(editPart instanceof CustomBlockCompositeEditPartTN) {
+		if (editPart instanceof CustomBlockCompositeEditPartTN) {
 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockCompositeDropEditPolicy());
 			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new StructuredClassifierCreationEditPolicy());
 
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockCompositeSemanticEditPolicy());
 		}
 
-		if(editPart instanceof StructureCompartmentEditPart) {
+		if (editPart instanceof StructureCompartmentEditPart) {
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomStructureCompartmentSemanticEditPolicy());
 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomStructureClassifierDropEditPolicy());
 			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());
 		}
 
-		if(editPart instanceof DependencyEditPart) {
+		if (editPart instanceof DependencyEditPart) {
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());
 		}
 
-		if(editPart instanceof ConnectorEditPart) {
+		if (editPart instanceof ConnectorEditPart) {
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());
 		}
-		
-		if(editPart instanceof CustomConstraintBlockPropertyCompositeEditPart) {
+
+		if (editPart instanceof CustomConstraintBlockPropertyCompositeEditPart) {
 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyCompositeDropEditPolicy());
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
 		}
-		if(editPart instanceof ConstraintParameterAffixedNodeEditPart) {
+		if (editPart instanceof ConstraintParameterAffixedNodeEditPart) {
 			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new TypedElementDropEditPolicy());
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
 		}
-		if(editPart instanceof CustomBlockCompositeEditPartTN) {
+		if (editPart instanceof CustomBlockCompositeEditPartTN) {
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
 		}
-		if(editPart instanceof ConstraintSpecificationEditPartCN) {
+		if (editPart instanceof ConstraintSpecificationEditPartCN) {
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
 		}
-		if(editPart instanceof ConstraintEditPartCN) {
+		if (editPart instanceof ConstraintEditPartCN) {
 			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParserProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParserProvider.java
index 2c3beff1b44..da517cf5297 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParserProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParserProvider.java
@@ -60,10 +60,10 @@ public class ParserProvider extends AbstractProvider implements IParserProvider
 	 * {@inheritDoc}
 	 */
 	public boolean provides(IOperation operation) {
-		if(operation instanceof GetParserOperation) {
-			IAdaptable hint = ((GetParserOperation)operation).getHint();
+		if (operation instanceof GetParserOperation) {
+			IAdaptable hint = ((GetParserOperation) operation).getHint();
 
-			if(!ElementTypes.DIAGRAM_ID.equals(getDiagramType(hint))) {
+			if (!ElementTypes.DIAGRAM_ID.equals(getDiagramType(hint))) {
 				return false;
 			}
 
@@ -76,18 +76,18 @@ public class ParserProvider extends AbstractProvider implements IParserProvider
 	 * {@inheritDoc}
 	 */
 	public IParser getParser(IAdaptable hint) {
-		String parserHint = (String)hint.getAdapter(String.class);
-		if(parserHint != null) {
+		String parserHint = (String) hint.getAdapter(String.class);
+		if (parserHint != null) {
 			IParser parser = graphicalHintToParser.get(parserHint);
-			if(parser != null) {
+			if (parser != null) {
 				return parser;
 			}
 		}
 
-		View view = (View)hint.getAdapter(View.class);
-		if(view != null) {
+		View view = (View) hint.getAdapter(View.class);
+		if (view != null) {
 			IParser parser = graphicalHintToParser.get(view.getType());
-			if(parser != null) {
+			if (parser != null) {
 				return parser;
 			}
 		}
@@ -96,8 +96,8 @@ public class ParserProvider extends AbstractProvider implements IParserProvider
 	}
 
 	private String getDiagramType(IAdaptable hint) {
-		Diagram diagram = (Diagram)hint.getAdapter(Diagram.class);
-		if(diagram != null) {
+		Diagram diagram = (Diagram) hint.getAdapter(Diagram.class);
+		if (diagram != null) {
 			return diagram.getType();
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/BlockDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/BlockDropHelper.java
index 9c071800de2..6f7d5d57c10 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/BlockDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/BlockDropHelper.java
@@ -61,75 +61,75 @@ public class BlockDropHelper extends ElementHelper {
 	public Command getDropAsStructureItemOnPart(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {
 		Object droppedEObject = request.getObjects().get(0);
 		String label = "";
-		if(elementType == SysMLElementTypes.PART_PROPERTY) {
+		if (elementType == SysMLElementTypes.PART_PROPERTY) {
 			label = "Create a new Part";
 			// Exclude ConstraintProperty
 			if (droppedEObject instanceof Type) {
-				if (((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type)droppedEObject)) {
+				if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
 					return UnexecutableCommand.INSTANCE;
 				}
 			}
 			// Exclude reference drop in diagram owned by a ConstraintBlock
-			Element editPartOwner = (Element)host.resolveSemanticElement();
+			Element editPartOwner = (Element) host.resolveSemanticElement();
 			if (editPartOwner instanceof Property) {
 				editPartOwner = ((Property) editPartOwner).getType();
 			}
-			if (editPartOwner != null && ((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(editPartOwner)) {
+			if (editPartOwner != null && ((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(editPartOwner)) {
 				return UnexecutableCommand.INSTANCE;
 			}
 		}
-		if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
+		if (elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
 			label = "Create a new Reference";
 			// Exclude ConstraintProperty
 			if (droppedEObject instanceof Type) {
-				if (((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type)droppedEObject)) {
+				if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
 					return UnexecutableCommand.INSTANCE;
 				}
 			}
 			// Exclude reference drop in diagram owned by a ConstraintBlock
-			Element editPartOwner = (Element)host.resolveSemanticElement();
+			Element editPartOwner = (Element) host.resolveSemanticElement();
 			if (editPartOwner instanceof Property) {
 				editPartOwner = ((Property) editPartOwner).getType();
 			}
-			if (editPartOwner != null && ((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(editPartOwner)) {
+			if (editPartOwner != null && ((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(editPartOwner)) {
 				return UnexecutableCommand.INSTANCE;
 			}
 		}
-		if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
+		if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
 			label = "Create a new ActorPart";
 		}
-		if(elementType == SysMLElementTypes.VALUE_PROPERTY) {
+		if (elementType == SysMLElementTypes.VALUE_PROPERTY) {
 			label = "Create a new Value";
 		}
-		if(elementType == UMLElementTypes.PROPERTY) {
+		if (elementType == UMLElementTypes.PROPERTY) {
 			label = "Create a new Property";
 		}
 		// New kind of element
-		if(elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {
+		if (elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {
 			label = "Create a new ConstraintProperty";
 			// Constraint Property on ConstraintBlock strictly
 			if (droppedEObject instanceof Type) {
-				if (!((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type)droppedEObject)) {
+				if (!((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
 					return UnexecutableCommand.INSTANCE;
 				}
 			}
 		}
-		
+
 		CompoundCommand cc = new CompoundCommand(label);
 
-		if(!isValidStructureItemType(droppedEObject, elementType)) {
+		if (!isValidStructureItemType(droppedEObject, elementType)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		// Verify target nature
 		EObject target = getHostEObject(host);
-		if((!(target instanceof TypedElement)) || (((TypedElement)target).getType() == null)) {
+		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		// The target type has to be a Block (will hold the created Port)
-		Type targetType = ((TypedElement)target).getType();
-		if(!((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {
+		Type targetType = ((TypedElement) target).getType();
+		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -140,13 +140,13 @@ public class BlockDropHelper extends ElementHelper {
 		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, elementType);
 		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);
-		if(provider != null) {
+		if (provider != null) {
 			createElementCommand = provider.getEditCommand(createElementRequest);
 		}
 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
 
 		// 2. Prepare the drop command
-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
 		createViewRequest.setLocation(request.getLocation().getCopy());
 		Command viewCreateCommand = host.getCommand(createViewRequest);
@@ -161,59 +161,59 @@ public class BlockDropHelper extends ElementHelper {
 	public Command getDropAsStructureItem(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {
 		Object droppedEObject = request.getObjects().get(0);
 		String label = "";
-		
+
 		// Filter part/reference : a property type by a ConstraintBlock MUST be a ConstraintProperty
-		if(elementType == SysMLElementTypes.PART_PROPERTY) {
+		if (elementType == SysMLElementTypes.PART_PROPERTY) {
 			label = "Create a new Part";
 			// Exclude ConstraintProperty
 			if (droppedEObject instanceof Type) {
-				if (((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type)droppedEObject)) {
+				if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
 					return UnexecutableCommand.INSTANCE;
 				}
 			}
 			// Exclude reference drop in diagram owned by a ConstraintBlock
 			Element diagramOwner = getDiagramOwner(host);
-			if (diagramOwner != null && ((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(diagramOwner)) {
+			if (diagramOwner != null && ((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(diagramOwner)) {
 				return UnexecutableCommand.INSTANCE;
 			}
 		}
-		if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
+		if (elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
 			label = "Create a new Reference";
 			// Exclude ConstraintProperty
 			if (droppedEObject instanceof Type) {
-				if (((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type)droppedEObject)) {
+				if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
 					return UnexecutableCommand.INSTANCE;
 				}
 			}
 			// Exclude reference drop in diagram owned by a ConstraintBlock
 			Element diagramOwner = getDiagramOwner(host);
-			if (diagramOwner != null && ((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(diagramOwner)) {
+			if (diagramOwner != null && ((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(diagramOwner)) {
 				return UnexecutableCommand.INSTANCE;
 			}
 		}
-		if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
+		if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
 			label = "Create a new ActorPart";
 		}
-		if(elementType == SysMLElementTypes.VALUE_PROPERTY) {
+		if (elementType == SysMLElementTypes.VALUE_PROPERTY) {
 			label = "Create a new Value";
 		}
-		if(elementType == UMLElementTypes.PROPERTY) {
+		if (elementType == UMLElementTypes.PROPERTY) {
 			label = "Create a new Property";
 		}
-		
+
 		// New kind of element
-		if(elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {
+		if (elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {
 			label = "Create a new ConstraintProperty";
 			// Constraint Property on ConstraintBlock strictly
 			if (droppedEObject instanceof Type) {
-				if (!((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type)droppedEObject)) {
+				if (!((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
 					return UnexecutableCommand.INSTANCE;
 				}
 			}
 		}
 		CompoundCommand cc = new CompoundCommand(label);
 
-		if(!isValidStructureItemType(droppedEObject, elementType)) {
+		if (!isValidStructureItemType(droppedEObject, elementType)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -224,13 +224,13 @@ public class BlockDropHelper extends ElementHelper {
 		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), elementType);
 		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));
-		if(provider != null) {
+		if (provider != null) {
 			createElementCommand = provider.getEditCommand(createElementRequest);
 		}
 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
 
 		// 2. Prepare the drop command
-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
 		createViewRequest.setLocation(request.getLocation().getCopy());
 		Command viewCreateCommand = host.getCommand(createViewRequest);
@@ -245,7 +245,7 @@ public class BlockDropHelper extends ElementHelper {
 	private Element getDiagramOwner(GraphicalEditPart host) {
 		Object model = host.getRoot().getContents().getModel();
 		if (model instanceof View) {
-			return (Element)((View) model).getElement();
+			return (Element) ((View) model).getElement();
 		}
 		return null;
 	}
@@ -253,34 +253,34 @@ public class BlockDropHelper extends ElementHelper {
 	private boolean isValidStructureItemType(Object object, IElementType elementType) {
 		boolean isValid = false;
 
-		if((object != null) && (object instanceof Type) && !(object instanceof Association)) {
+		if ((object != null) && (object instanceof Type) && !(object instanceof Association)) {
 
-			Type type = (Type)object;
-			if((elementType == SysMLElementTypes.PART_PROPERTY) || (elementType == SysMLElementTypes.REFERENCE_PROPERTY)) {
-				if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(type)) {
+			Type type = (Type) object;
+			if ((elementType == SysMLElementTypes.PART_PROPERTY) || (elementType == SysMLElementTypes.REFERENCE_PROPERTY)) {
+				if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {
 					isValid = true;
 				}
 			}
-			if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
-				if(type instanceof Actor) {
+			if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
+				if (type instanceof Actor) {
 					isValid = true;
 				}
 			}
-			if(elementType == SysMLElementTypes.VALUE_PROPERTY) {
-				if(((ISpecializationType)SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type) || (type instanceof DataType)) {
+			if (elementType == SysMLElementTypes.VALUE_PROPERTY) {
+				if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type) || (type instanceof DataType)) {
 					isValid = true;
 				}
 			}
-			if((elementType == SysMLElementTypes.CONSTRAINT_PROPERTY)) {
-				if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(type)) {
+			if ((elementType == SysMLElementTypes.CONSTRAINT_PROPERTY)) {
+				if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {
 					isValid = true;
 				}
 			}
-			if(elementType == UMLElementTypes.PROPERTY) {
-				if(!((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(type)
+			if (elementType == UMLElementTypes.PROPERTY) {
+				if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)
 						&& !(type instanceof Actor)
 						&& !(type instanceof DataType)
-						&& !((ISpecializationType)SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {
+						&& !((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {
 					isValid = true;
 				}
 			}
@@ -292,10 +292,10 @@ public class BlockDropHelper extends ElementHelper {
 	/**
 	 * return the host Edit Part's semantic element, if the semantic element
 	 * is <code>null</code> or unresolvable it will return <code>null</code>
-	 * 
+	 *
 	 * @return EObject
 	 */
 	protected EObject getHostEObject(GraphicalEditPart host) {
-		return ViewUtil.resolveSemanticElement((View)host.getModel());
+		return ViewUtil.resolveSemanticElement((View) host.getModel());
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/ConstraintParameterDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/ConstraintParameterDropHelper.java
index 317ed34f8ff..957993c457e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/ConstraintParameterDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/ConstraintParameterDropHelper.java
@@ -37,7 +37,8 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
  * This class provides convenience methods to create Type specific drop action (Show Port on BlockPropertyComposite).
- */public class ConstraintParameterDropHelper extends ElementHelper {
+ */
+public class ConstraintParameterDropHelper extends ElementHelper {
 
 	public ConstraintParameterDropHelper(TransactionalEditingDomain editDomain) {
 		this.editDomain = editDomain;
@@ -49,12 +50,12 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 	public Command getDropConstraintParameterOnPart(Property droppedConstraintParameter, Point location, GraphicalEditPart host) {
 
-		if(!isValidConstraintParameter(droppedConstraintParameter, getHostEObject(host))) {
+		if (!isValidConstraintParameter(droppedConstraintParameter, getHostEObject(host))) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		// Prepare the view creation command
-		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter((EObject)droppedConstraintParameter, null), Node.class, /* explicit semantic hint is mandatory */ null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
+		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter(droppedConstraintParameter, null), Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
 		createViewRequest.setLocation(location);
 		Command viewCreateCommand = host.getCommand(createViewRequest);
@@ -68,14 +69,14 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 			return false;
 		}
 		// drop on a Block/ConstraintBlock
-		if (dropTarget instanceof Class && UMLUtil.getStereotypeApplication((Class)dropTarget, ConstraintBlock.class) != null) {
-			return ((Class)dropTarget).getOwnedAttributes().contains(object);
+		if (dropTarget instanceof Class && UMLUtil.getStereotypeApplication((Class) dropTarget, ConstraintBlock.class) != null) {
+			return ((Class) dropTarget).getOwnedAttributes().contains(object);
 		}
 		// drop on a part
-		if (dropTarget instanceof Property && UMLUtil.getStereotypeApplication((Property)dropTarget, ConstraintProperty.class) != null) {
-			Type type = ((Property)dropTarget).getType();
-			if (type instanceof Class && UMLUtil.getStereotypeApplication((Class)type, ConstraintBlock.class) != null) {
-				return ((Class)type).getOwnedAttributes().contains(object);
+		if (dropTarget instanceof Property && UMLUtil.getStereotypeApplication((Property) dropTarget, ConstraintProperty.class) != null) {
+			Type type = ((Property) dropTarget).getType();
+			if (type instanceof Class && UMLUtil.getStereotypeApplication(type, ConstraintBlock.class) != null) {
+				return ((Class) type).getOwnedAttributes().contains(object);
 			}
 		}
 		return false;
@@ -84,10 +85,10 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 	/**
 	 * return the host Edit Part's semantic element, if the semantic element
 	 * is <code>null</code> or unresolvable it will return <code>null</code>
-	 * 
+	 *
 	 * @return EObject
 	 */
 	protected EObject getHostEObject(GraphicalEditPart host) {
-		return ViewUtil.resolveSemanticElement((View)host.getModel());
+		return ViewUtil.resolveSemanticElement((View) host.getModel());
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/Activator.java
index 336dc2d16ca..72203f563e2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/Activator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -74,7 +74,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getInstance() {
@@ -83,10 +83,10 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 * 
+	 *
 	 * @generated
 	 * @param path
-	 *        the path
+	 *            the path
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getBundledImageDescriptor(String path) {
@@ -94,9 +94,9 @@ public class Activator extends AbstractUIPlugin {
 	}
 
 	/**
-	 * 
+	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 * 
+	 *
 	 * @return Shared Preference Store.
 	 */
 	@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
index 7c486c47b57..cc37e98bf73 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,10 +21,11 @@ import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 
 /**
  * Represents the creation command for a SysML requirements diagram
+ * 
  * @author Laurent Wouters
  */
 public class RequirementDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java
index e97ac79b3f3..4bcb876fabf 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java
index c80d84b0f74..0fe44cb82cc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013, 2014 CEA LIST and others.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,7 +34,7 @@ import org.eclipse.ui.PartInitException;
 
 /**
  * An editor to be used in multitabs editor. This editor extends the original UML Diagram.
- * 
+ *
  */
 public class RequirementDiagramForMultiEditor extends RequirementDiagramEditor {
 
@@ -50,16 +50,16 @@ public class RequirementDiagramForMultiEditor extends RequirementDiagramEditor {
 
 	/** The editor splitter. */
 	private Composite splitter;
-	
+
 	private Image titleImage;
 
 	/**
 	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
 	 * ServiceRegistry.
-	 * 
+	 *
 	 * @throws BackboneException
 	 * @throws ServiceException
-	 * 
+	 *
 	 */
 	public RequirementDiagramForMultiEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws BackboneException, ServiceException {
 		super(servicesRegistry, diagram);
@@ -78,11 +78,11 @@ public class RequirementDiagramForMultiEditor extends RequirementDiagramEditor {
 
 	@Override
 	public void dispose() {
-		if(titleImage != null) {
+		if (titleImage != null) {
 			titleImage.dispose();
 			titleImage = null;
 		}
-		
+
 		super.dispose();
 	}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java
index c093dd3f61c..809073d5155 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,15 +14,14 @@
  ****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.requirement.edit.part;
 
-import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
 
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;		
-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;		
-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;		
-import org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomDragDropEditPolicy;		
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;
+import org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomDragDropEditPolicy;
 
 public class RequirementDiagramEditPart extends DiagramEditPart {
 
@@ -30,6 +29,7 @@ public class RequirementDiagramEditPart extends DiagramEditPart {
 		super(view);
 	}
 
+	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java
index 9a67a63599d..5dbada8837e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,7 +37,7 @@ public class RequirementDiagramDragDropEditPolicy extends ClassDiagramDragDropEd
 		}
 		return new Integer(domainType);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java
index e42aad52add..90a8202768b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ import org.eclipse.gmf.runtime.notation.MeasurementUnit;
 
 public class RequirementDiagramViewFactory extends DiagramViewFactory {
 
+	@Override
 	protected MeasurementUnit getMeasurementUnit() {
 		return MeasurementUnit.PIXEL_LITERAL;
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/part/RequirementDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/part/RequirementDiagramEditor.java
index f0a2aae193b..cad1483ef0f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/part/RequirementDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/part/RequirementDiagramEditor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -41,13 +41,13 @@ public class RequirementDiagramEditor extends org.eclipse.papyrus.uml.diagram.cl
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @param servicesRegistry
-	 *        registry to find services (label providers, editing domain, etc.)
+	 *            registry to find services (label providers, editing domain, etc.)
 	 * @param diagram
-	 *        edited diagram
+	 *            edited diagram
 	 * @throws ServiceException
-	 *         exception thrown ni case of issue during initialization
+	 *             exception thrown ni case of issue during initialization
 	 */
 	public RequirementDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
 		super(servicesRegistry, diagram);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java
index 4f03c32f4e0..07677239eab 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class AbstractionPreferencePage extends RequirementDiagramLinkPreferenceP
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java
index 8de918565c1..5ba3aaa4584 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -31,9 +31,9 @@ public class CommentPreferencePage extends RequirementDiagramNodePreferencePage
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java
index 14ff2edaae1..23f96109921 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -31,9 +31,9 @@ public class ConstraintPreferencePage extends RequirementDiagramNodePreferencePa
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java
index 13e50640961..38985102b72 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -31,9 +31,9 @@ public class ContainmentLinkPreferencePage extends RequirementDiagramLinkPrefere
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java
index 23c3071f860..8983bb2cb42 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class DataTypePreferencePage extends RequirementDiagramNodePreferencePage
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java
index 888012a1804..6e63109724e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class DependencyPreferencePage extends RequirementDiagramLinkPreferencePa
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java
index e652837068c..084d0559a65 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class EnumerationPreferencePage extends RequirementDiagramNodePreferenceP
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java
index 640bfc0c8ae..96d23f5c491 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class InterfacePreferencePage extends RequirementDiagramNodePreferencePag
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java
index eae5350af11..6228737c50b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -32,9 +32,9 @@ public class NamedElementPreferencePage extends RequirementDiagramNodePreference
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java
index a45ec60575f..7288117d01b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class OperationPreferencePage extends RequirementDiagramNodePreferencePag
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java
index c9be8d17763..89471a0023c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class PackageImportPreferencePage extends RequirementDiagramLinkPreferenc
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java
index 462310d98f2..48780806add 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -36,7 +36,7 @@ public class PackagePreferencePage extends RequirementDiagramNodePreferencePage
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
 		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
@@ -57,9 +57,9 @@ public class PackagePreferencePage extends RequirementDiagramNodePreferencePage
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
@@ -68,13 +68,13 @@ public class PackagePreferencePage extends RequirementDiagramNodePreferencePage
 		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
 		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
-		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
 			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
-		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
 			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
@@ -85,7 +85,7 @@ public class PackagePreferencePage extends RequirementDiagramNodePreferencePage
 	 */
 	@Override
 	protected void initializeCompartmentNamesList() {
-		for(String name : compartmentDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentDefaultVisibilityMap.keySet()) {
 			this.compartmentNamesList.add(name);
 		}
 	}
@@ -95,7 +95,7 @@ public class PackagePreferencePage extends RequirementDiagramNodePreferencePage
 	 */
 	@Override
 	protected void initializeCompartmentTitlesList() {
-		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
 			this.compartmentTitlesList.add(name);
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java
index 0486714cf8a..5caa28773e0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class PrimitiveTypePreferencePage extends RequirementDiagramNodePreferenc
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java
index 8dcf6541bcc..254b22afddb 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class PropertyPreferencePage extends RequirementDiagramNodePreferencePage
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java
index c0f853c9375..782d4b76e45 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class RealizationPreferencePage extends RequirementDiagramLinkPreferenceP
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java
index a5de853a477..53cb8baf8ca 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class ReceptionPreferencePage extends RequirementDiagramNodePreferencePag
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java
index 810a6d4d059..4852b83277e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,9 +21,9 @@ import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 public class RequirementDiagramGeneralPreferencePage extends DiagramPreferencePage {
 
 	/**
-	 * 
+	 *
 	 * Constructor.
-	 * 
+	 *
 	 * @G
 	 */
 	public RequirementDiagramGeneralPreferencePage() {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java
index b51416ce4f7..bee3d73a4d6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -44,7 +44,7 @@ public class RequirementDiagramLinkPreferencePage extends AbstractPapyrusLinkPre
 		super.createPageContents(parent);
 
 		// Add label visibility group
-		if(!labelsList.isEmpty()) {
+		if (!labelsList.isEmpty()) {
 			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
 			addAbstractGroup(compartmentGroup);
 		}
@@ -61,7 +61,7 @@ public class RequirementDiagramLinkPreferencePage extends AbstractPapyrusLinkPre
 
 	/** Initialize the list containing names of labels. */
 	protected void initializeLabelsList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java
index 74e38e30286..1274279ca76 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -59,13 +59,13 @@ public class RequirementDiagramNodePreferencePage extends AbstractPapyrusNodePre
 		super.createPageContents(parent);
 
 		// Add compartments visibility group
-		if(!compartmentNamesList.isEmpty()) {
+		if (!compartmentNamesList.isEmpty()) {
 			OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());
 			addAbstractGroup(compartmentGroup);
 		}
 
 		// Add label visibility group
-		if(!labelsList.isEmpty()) {
+		if (!labelsList.isEmpty()) {
 			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
 			addAbstractGroup(compartmentGroup);
 		}
@@ -81,17 +81,17 @@ public class RequirementDiagramNodePreferencePage extends AbstractPapyrusNodePre
 
 	/** Initialize the list containing names of labels. */
 	protected void initializeLabelsList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/** Initialize the list containing the names of compartments. */
 	protected void initializeCompartmentNamesList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/** Initialize the list containing the names of compartment that have titles. */
 	protected void initializeCompartmentTitlesList() {
-		//  Implemented by subclasses.
+		// Implemented by subclasses.
 	}
 
 	/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java
index 6ac4721b02a..70a3ba92fb9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java
index bc5f3666656..516470fdf68 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ public class SignalPreferencePage extends RequirementDiagramNodePreferencePage {
 
 	/**
 	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 * 
+	 *
 	 * @param store
-	 *        the preference store.
+	 *            the preference store.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java
index f2cf68fd1c2..68ddd01b3b0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -35,21 +35,21 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
 
 
 	/** ClassDiagram :: PACKAGE */
-	public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
+	public static final IHintedType PACKAGE = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
 
 	public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7016"; //$NON-NLS-1$
 
 	public static final String PACKAGE_LABEL_NAME_HINT = "5026"; //$NON-NLS-1$
 
 	/** ClassDiagram :: PACKAGE_CN */
-	public static final IHintedType PACKAGE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
+	public static final IHintedType PACKAGE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
 
 	public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7010"; //$NON-NLS-1$
 
 	public static final String PACKAGE_CN_LABEL_NAME_HINT = "5017"; //$NON-NLS-1$
 
 	/** ClassDiagram :: CLASS */
-	public static final IHintedType CLASS = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_2008"); //$NON-NLS-1$
+	public static final IHintedType CLASS = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_2008"); //$NON-NLS-1$
 
 	public static final String CLASS_COMPARTMENT_ATTRIBUTE_HINT = "7017"; //$NON-NLS-1$
 
@@ -60,7 +60,7 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
 	public static final String CLASS_LABEL_NAME_HINT = "5029"; //$NON-NLS-1$
 
 	/** ClassDiagram :: CLASS_CN */
-	public static final IHintedType CLASS_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3010"); //$NON-NLS-1$
+	public static final IHintedType CLASS_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3010"); //$NON-NLS-1$
 
 	public static final String CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT = "7011"; //$NON-NLS-1$
 
@@ -71,32 +71,32 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
 	public static final String CLASS_CN_LABEL_NAME_HINT = "5014"; //$NON-NLS-1$
 
 	/** ClassDiagram :: DEFAULT_NAMED_ELEMENT */
-	public static final IHintedType DEFAULT_NAMED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097"); //$NON-NLS-1$
+	public static final IHintedType DEFAULT_NAMED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097"); //$NON-NLS-1$
 
 	public static final String DEFAULT_NAMED_ELEMENT_LABEL_NAME_HINT = "5157"; //$NON-NLS-1$
 
 	/** ClassDiagram :: CONTAINMENT_CIRCLE_CN */
-	public static final IHintedType CONTAINMENT_CIRCLE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.ContainmentCircle_3032"); //$NON-NLS-1$
+	public static final IHintedType CONTAINMENT_CIRCLE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.ContainmentCircle_3032"); //$NON-NLS-1$
 
 	/** ClassDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$
+	public static final IHintedType COMMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$
 
 	public static final String COMMENT_LABEL_BODY_HINT = "5038"; //$NON-NLS-1$
 
 	/** ClassDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$
 
 	public static final String COMMENT_CN_LABEL_BODY_HINT = "5063"; //$NON-NLS-1$
 
 	/** ClassDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$
 
 	public static final String CONSTRAINT_LABEL_NAME_HINT = "5037"; //$NON-NLS-1$
 
 	public static final String CONSTRAINT_LABEL_BODY_HINT = "5159"; //$NON-NLS-1$
 
 	/** ClassDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$
 
 	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "5064"; //$NON-NLS-1$
 
@@ -104,60 +104,60 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
 
 
 	/** ClassDiagram :: ABSTRACTION */
-	public static final IHintedType ABSTRACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"); //$NON-NLS-1$
+	public static final IHintedType ABSTRACTION = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"); //$NON-NLS-1$
 
 	public static final String ABSTRACTION_LABEL_NAME_HINT = "6014"; //$NON-NLS-1$
 
 	public static final String ABSTRACTION_LABEL_APPLIED_STEREOTYPE_HINT = "6015"; //$NON-NLS-1$
 
 	/** ClassDiagram :: CONTAINMENT_LINK */
-	public static final IHintedType CONTAINMENT_LINK = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"); //$NON-NLS-1$
+	public static final IHintedType CONTAINMENT_LINK = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"); //$NON-NLS-1$
 
 	/** ClassDiagram :: CONTAINMENT_SUB_LINK */
-	public static final IHintedType CONTAINMENT_SUB_LINK = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.AddedLink_4022"); //$NON-NLS-1$
+	public static final IHintedType CONTAINMENT_SUB_LINK = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.AddedLink_4022"); //$NON-NLS-1$
 
 	/** ClassDiagram :: DEPENDENCY */
-	public static final IHintedType DEPENDENCY = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"); //$NON-NLS-1$
+	public static final IHintedType DEPENDENCY = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"); //$NON-NLS-1$
 
 	public static final String DEPENDENCY_LABEL_NAME_HINT = "6026"; //$NON-NLS-1$
 
 	public static final String DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT = "6027"; //$NON-NLS-1$
 
 	/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
 
 	/** ClassDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$
+	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$
 
 	/** ClassDiagram :: REALIZATION */
-	public static final IHintedType REALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"); //$NON-NLS-1$
+	public static final IHintedType REALIZATION = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"); //$NON-NLS-1$
 
 	public static final String REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT = "6012"; //$NON-NLS-1$
 
 	public static final String REALIZATION_LABEL_NAME_HINT = "6013"; //$NON-NLS-1$
 
 	/** ClassDiagram :: PACKAGE_IMPORT */
-	public static final IHintedType PACKAGE_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$
+	public static final IHintedType PACKAGE_IMPORT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$
 
 	public static final String PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT = "6022"; //$NON-NLS-1$
 
 	/** ClassDiagram :: ChildLabelNodes */
-	public static final IHintedType CLASS_PROPERTY_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3012"); //$NON-NLS-1$
+	public static final IHintedType CLASS_PROPERTY_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3012"); //$NON-NLS-1$
 
-	public static final IHintedType CLASS_RECEPTION_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"); //$NON-NLS-1$
+	public static final IHintedType CLASS_RECEPTION_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"); //$NON-NLS-1$
 
-	public static final IHintedType CLASS_OPERATION_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3013"); //$NON-NLS-1$
+	public static final IHintedType CLASS_OPERATION_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3013"); //$NON-NLS-1$
 
-	public static final IHintedType CLASS_CLASS_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3014"); //$NON-NLS-1$
+	public static final IHintedType CLASS_CLASS_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3014"); //$NON-NLS-1$
 
-	public static final IHintedType CLASS_INTERFACE_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_3036"); //$NON-NLS-1$
+	public static final IHintedType CLASS_INTERFACE_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_3036"); //$NON-NLS-1$
 
-	public static final IHintedType CLASS_ENUMERATION_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052"); //$NON-NLS-1$
+	public static final IHintedType CLASS_ENUMERATION_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052"); //$NON-NLS-1$
 
-	public static final IHintedType CLASS_PRIMITIVE_TYPE_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047"); //$NON-NLS-1$
+	public static final IHintedType CLASS_PRIMITIVE_TYPE_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047"); //$NON-NLS-1$
 
-	public static final IHintedType CLASS_DATA_TYPE_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_3044"); //$NON-NLS-1$
+	public static final IHintedType CLASS_DATA_TYPE_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_3044"); //$NON-NLS-1$
 
-	public static final IHintedType CLASS_SIGNAL_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"); //$NON-NLS-1$
+	public static final IHintedType CLASS_SIGNAL_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"); //$NON-NLS-1$
 
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java
index 5f6e1e50482..6843043c76b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -74,22 +74,23 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getEdgeGraphicalType(EObject domainElement) {
 
 		String graphicalType = UNDEFINED_TYPE;
-		if(domainElement == null) {
+		if (domainElement == null) {
 			return UNDEFINED_TYPE;
 		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Abstraction) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Abstraction) {
 			graphicalType = ElementTypes.ABSTRACTION.getSemanticHint();
 		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Dependency) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Dependency) {
 			graphicalType = ElementTypes.DEPENDENCY.getSemanticHint();
 		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Realization) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Realization) {
 			graphicalType = ElementTypes.REALIZATION.getSemanticHint();
 		}
-		if(domainElement instanceof org.eclipse.uml2.uml.PackageImport) {
+		if (domainElement instanceof org.eclipse.uml2.uml.PackageImport) {
 			graphicalType = ElementTypes.PACKAGE_IMPORT.getSemanticHint();
 		}
 		return graphicalType;
@@ -98,9 +99,10 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getEdgeGraphicalType(IElementType elementType) {
-		if(elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType)elementType).getSemanticHint();
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
 			return getEdgeGraphicalType(semanticHint);
 		}
 
@@ -110,8 +112,9 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getEdgeGraphicalType(String proposedType) {
-		if(isKnownEdgeType(proposedType)) {
+		if (isKnownEdgeType(proposedType)) {
 			return proposedType;
 		}
 
@@ -121,154 +124,155 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getNodeGraphicalType(EObject domainElement, String containerType) {
 
 		String graphicalType = UNDEFINED_TYPE;
-		if((containerType == null) || (domainElement == null)) {
+		if ((containerType == null) || (domainElement == null)) {
 			return UNDEFINED_TYPE;
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Package TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Package) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Package TopNode
 				graphicalType = ElementTypes.PACKAGE.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
 				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
 				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Class) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Class TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Class) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Class TopNode
 				graphicalType = ElementTypes.CLASS.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Class ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Class ChildNode
 				graphicalType = ElementTypes.CLASS_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Class ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Class ChildNode
 				graphicalType = ElementTypes.CLASS_CN.getSemanticHint();
 			}
 
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Class ChildLabelNode
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Class ChildLabelNode
 				graphicalType = ElementTypes.CLASS_CLASS_CLN.getSemanticHint();
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Class ChildLabelNode
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Class ChildLabelNode
 				graphicalType = ElementTypes.CLASS_CLASS_CLN.getSemanticHint();
 			}
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.NamedElement) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // NamedElement TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.NamedElement) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // NamedElement TopNode
 				graphicalType = ElementTypes.DEFAULT_NAMED_ELEMENT.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Comment) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
 				graphicalType = ElementTypes.COMMENT.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
 				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
+		if (domainElement instanceof org.eclipse.uml2.uml.Constraint) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
 				graphicalType = ElementTypes.CONSTRAINT.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
 				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
 			}
 
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Property) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Property) {
 
-			if(ElementTypes.CLASS_COMPARTMENT_ATTRIBUTE_HINT.equals(containerType)) { // Property ChildLabelNode
+			if (ElementTypes.CLASS_COMPARTMENT_ATTRIBUTE_HINT.equals(containerType)) { // Property ChildLabelNode
 				graphicalType = ElementTypes.CLASS_PROPERTY_CLN.getSemanticHint();
 			}
-			if(ElementTypes.CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerType)) { // Property ChildLabelNode
+			if (ElementTypes.CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerType)) { // Property ChildLabelNode
 				graphicalType = ElementTypes.CLASS_PROPERTY_CLN.getSemanticHint();
 			}
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Reception) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Reception) {
 
-			if(ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Reception ChildLabelNode
+			if (ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Reception ChildLabelNode
 				graphicalType = ElementTypes.CLASS_RECEPTION_CLN.getSemanticHint();
 			}
-			if(ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Reception ChildLabelNode
+			if (ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Reception ChildLabelNode
 				graphicalType = ElementTypes.CLASS_RECEPTION_CLN.getSemanticHint();
 			}
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Operation) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Operation) {
 
-			if(ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Operation ChildLabelNode
+			if (ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Operation ChildLabelNode
 				graphicalType = ElementTypes.CLASS_OPERATION_CLN.getSemanticHint();
 			}
-			if(ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Operation ChildLabelNode
+			if (ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Operation ChildLabelNode
 				graphicalType = ElementTypes.CLASS_OPERATION_CLN.getSemanticHint();
 			}
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Interface) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Interface) {
 
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Interface ChildLabelNode
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Interface ChildLabelNode
 				graphicalType = ElementTypes.CLASS_INTERFACE_CLN.getSemanticHint();
 			}
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Interface ChildLabelNode
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Interface ChildLabelNode
 				graphicalType = ElementTypes.CLASS_INTERFACE_CLN.getSemanticHint();
 			}
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Enumeration) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Enumeration) {
 
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Enumeration ChildLabelNode
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Enumeration ChildLabelNode
 				graphicalType = ElementTypes.CLASS_ENUMERATION_CLN.getSemanticHint();
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Enumeration ChildLabelNode
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Enumeration ChildLabelNode
 				graphicalType = ElementTypes.CLASS_ENUMERATION_CLN.getSemanticHint();
 			}
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.PrimitiveType) {
+		if (domainElement instanceof org.eclipse.uml2.uml.PrimitiveType) {
 
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // PrimitiveType ChildLabelNode
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // PrimitiveType ChildLabelNode
 				graphicalType = ElementTypes.CLASS_PRIMITIVE_TYPE_CLN.getSemanticHint();
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // PrimitiveType ChildLabelNode
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // PrimitiveType ChildLabelNode
 				graphicalType = ElementTypes.CLASS_PRIMITIVE_TYPE_CLN.getSemanticHint();
 			}
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.DataType) {
+		if (domainElement instanceof org.eclipse.uml2.uml.DataType) {
 
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // DataType ChildLabelNode
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // DataType ChildLabelNode
 				graphicalType = ElementTypes.CLASS_DATA_TYPE_CLN.getSemanticHint();
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // DataType ChildLabelNode
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // DataType ChildLabelNode
 				graphicalType = ElementTypes.CLASS_DATA_TYPE_CLN.getSemanticHint();
 			}
 		}
 
-		if(domainElement instanceof org.eclipse.uml2.uml.Signal) {
+		if (domainElement instanceof org.eclipse.uml2.uml.Signal) {
 
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Signal ChildLabelNode
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Signal ChildLabelNode
 				graphicalType = ElementTypes.CLASS_SIGNAL_CLN.getSemanticHint();
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Signal ChildLabelNode
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Signal ChildLabelNode
 				graphicalType = ElementTypes.CLASS_SIGNAL_CLN.getSemanticHint();
 			}
 		}
@@ -279,9 +283,10 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getNodeGraphicalType(IElementType elementType, String containerType) {
-		if(elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType)elementType).getSemanticHint();
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
 			return getNodeGraphicalType(semanticHint, containerType);
 		}
 
@@ -291,8 +296,9 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getNodeGraphicalType(String proposedType, String containerType) {
-		if(isKnownNodeType(proposedType)) {
+		if (isKnownNodeType(proposedType)) {
 			return proposedType;
 		}
 
@@ -302,6 +308,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean isKnownEdgeType(String type) {
 		return knownEdges.contains(type);
 	}
@@ -309,6 +316,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean isKnownNodeType(String type) {
 		return knownNodes.contains(type);
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java
index f473f6b2321..9ba927778d5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,82 +28,82 @@ public interface IGraphicalTypeRegistry {
 
 	/**
 	 * Get a valid edge graphical type for the domain element.
-	 * 
+	 *
 	 * @param domainElement
-	 *        the domain element.
+	 *            the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getEdgeGraphicalType(EObject domainElement);
 
 	/**
 	 * Get a valid edge graphical type for the element type.
-	 * 
+	 *
 	 * @param elementType
-	 *        the element type.
+	 *            the element type.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getEdgeGraphicalType(IElementType elementType);
 
 	/**
 	 * Get a valid edge graphical type for the proposed type.
-	 * 
+	 *
 	 * @param proposedType
-	 *        the proposed type.
+	 *            the proposed type.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getEdgeGraphicalType(String proposedType);
 
 	/**
 	 * Get a valid node graphical type for the domain element.
-	 * 
+	 *
 	 * @param domainElement
-	 *        the domain element.
+	 *            the domain element.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getNodeGraphicalType(EObject domainElement, String containerType);
 
 	/**
 	 * Get a valid node graphical type for the element type.
-	 * 
+	 *
 	 * @param elementType
-	 *        the element type.
+	 *            the element type.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getNodeGraphicalType(IElementType elementType, String containerType);
 
 	/**
 	 * Get a valid node graphical type for the proposed type.
-	 * 
+	 *
 	 * @param proposedType
-	 *        the proposed type.
+	 *            the proposed type.
 	 * @param containerType
-	 *        the type of the graphical owner of the domain element.
+	 *            the type of the graphical owner of the domain element.
 	 * @return the domain element graphical type.
 	 */
 	public String getNodeGraphicalType(String proposedType, String containerType);
 
 	/**
 	 * Test if the type is a known edge graphical type in this diagram
-	 * 
+	 *
 	 * @param type
-	 *        the type to test
+	 *            the type to test
 	 * @return true if the type is known
 	 */
 	public boolean isKnownEdgeType(String type);
 
 	/**
 	 * Test if the type is a known node graphical type in this diagram
-	 * 
+	 *
 	 * @param type
-	 *        the type to test
+	 *            the type to test
 	 * @return true if the type is known
 	 */
 	public boolean isKnownNodeType(String type);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java
index 1e93ce08d69..21bcbad83e1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,11 +25,11 @@ public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider {
 
 	@Override
 	public synchronized boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View view = ((IEditPartOperation) operation).getView();
 
 			// Ensure current diagram is a Requirement Diagram
-			if(!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
+			if (!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
 				return false;
 			}
 
@@ -37,57 +37,57 @@ public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider {
 			EObject eobject = view.getElement();
 
 			/** Nodes (and ChildLabelNodes) *********** */
-			if(eobject instanceof org.eclipse.uml2.uml.Package) {
+			if (eobject instanceof org.eclipse.uml2.uml.Package) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Class) {
+			if (eobject instanceof org.eclipse.uml2.uml.Class) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.NamedElement) {
+			if (eobject instanceof org.eclipse.uml2.uml.NamedElement) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Comment) {
+			if (eobject instanceof org.eclipse.uml2.uml.Comment) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Constraint) {
+			if (eobject instanceof org.eclipse.uml2.uml.Constraint) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Property) {
+			if (eobject instanceof org.eclipse.uml2.uml.Property) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Reception) {
+			if (eobject instanceof org.eclipse.uml2.uml.Reception) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Operation) {
+			if (eobject instanceof org.eclipse.uml2.uml.Operation) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Interface) {
+			if (eobject instanceof org.eclipse.uml2.uml.Interface) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Enumeration) {
+			if (eobject instanceof org.eclipse.uml2.uml.Enumeration) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.PrimitiveType) {
+			if (eobject instanceof org.eclipse.uml2.uml.PrimitiveType) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.DataType) {
+			if (eobject instanceof org.eclipse.uml2.uml.DataType) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Signal) {
+			if (eobject instanceof org.eclipse.uml2.uml.Signal) {
 				return true;
 			}
 
 			/** Edges *********** */
-			if(eobject instanceof org.eclipse.uml2.uml.Abstraction) {
+			if (eobject instanceof org.eclipse.uml2.uml.Abstraction) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Dependency) {
+			if (eobject instanceof org.eclipse.uml2.uml.Dependency) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.Realization) {
+			if (eobject instanceof org.eclipse.uml2.uml.Realization) {
 				return true;
 			}
-			if(eobject instanceof org.eclipse.uml2.uml.PackageImport) {
+			if (eobject instanceof org.eclipse.uml2.uml.PackageImport) {
 				return true;
 			}
 
@@ -98,25 +98,25 @@ public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider {
 			String hint = view.getType();
 
 			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
+			if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
 				return true;
 			}
 			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
+			if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
 				return true;
 			}
 
 			/** Edges (NotationType) : CONTAINMENT_LINK *********** */
-			if(ElementTypes.CONTAINMENT_LINK.getSemanticHint().equals(hint)) {
+			if (ElementTypes.CONTAINMENT_LINK.getSemanticHint().equals(hint)) {
 				return true;
 			}
 			/** Edges (NotationType) : CONTAINMENT_SUB_LINK *********** */
-			if(ElementTypes.CONTAINMENT_SUB_LINK.getSemanticHint().equals(hint)) {
+			if (ElementTypes.CONTAINMENT_SUB_LINK.getSemanticHint().equals(hint)) {
 				return true;
 			}
 
 			/** Nodes (NotationType) : CONTAINMENT_CIRCLE_CN *********** */
-			if(ElementTypes.CONTAINMENT_CIRCLE_CN.getSemanticHint().equals(hint)) {
+			if (ElementTypes.CONTAINMENT_CIRCLE_CN.getSemanticHint().equals(hint)) {
 				return true;
 			}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java
index 606cb3fbd85..a1030520265 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,50 +37,50 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
 		Edge createdEdge = null;
 
-		IElementType elementType = (IElementType)semanticAdapter.getAdapter(IElementType.class);
-		if(elementType != null) {
+		IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
+		if (elementType != null) {
 			createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
 		} else {
 
-			EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
+			EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
 
 			String domainElementGraphicalType = semanticHint;
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
 
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+			if ((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
 				// Cannot use createEdge from super class as it never take the graphical type (semanticHint) into account.
 				// createdEdge = super.createEdge(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
 
-				if(ElementTypes.ABSTRACTION.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.ABSTRACTION.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createAbstraction_4006(domainElement, containerView, index, persisted, preferencesHint);
 				}
-				if(ElementTypes.CONTAINMENT_LINK.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.CONTAINMENT_LINK.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createLink_4023(containerView, index, persisted, preferencesHint);
 				}
-				if(ElementTypes.CONTAINMENT_SUB_LINK.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.CONTAINMENT_SUB_LINK.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createLink_4022(containerView, index, persisted, preferencesHint);
 				}
-				if(ElementTypes.DEPENDENCY.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.DEPENDENCY.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createDependency_4008(domainElement, containerView, index, persisted, preferencesHint);
 				}
-				if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createCommentAnnotatedElement_4013(containerView, index, persisted, preferencesHint);
 				}
-				if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createConstraintConstrainedElement_4014(containerView, index, persisted, preferencesHint);
 				}
-				if(ElementTypes.REALIZATION.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.REALIZATION.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createRealization_4005(domainElement, containerView, index, persisted, preferencesHint);
 				}
-				if(ElementTypes.PACKAGE_IMPORT.getSemanticHint().equals(domainElementGraphicalType)) {
+				if (ElementTypes.PACKAGE_IMPORT.getSemanticHint().equals(domainElementGraphicalType)) {
 					createdEdge = createPackageImport_4010(domainElement, containerView, index, persisted, preferencesHint);
 				}
 			}
 		}
 
-		if(createdEdge == null) {
+		if (createdEdge == null) {
 			Activator.log.error(new Exception("Could not create Edge."));
 		}
 
@@ -92,7 +92,7 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 
 		// This provider is registered for Requirement Diagram only
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
@@ -103,39 +103,39 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 	protected boolean provides(CreateEdgeViewOperation op) {
 
 		// Must have a container
-		if(op.getContainerView() == null) {
+		if (op.getContainerView() == null) {
 			return false;
 		}
 
 		// This provider is registered for Requirement Diagram only
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if(elementType == ElementTypes.ABSTRACTION) {
+		if (elementType == ElementTypes.ABSTRACTION) {
 			return true;
 		}
-		if(elementType == ElementTypes.CONTAINMENT_LINK) {
+		if (elementType == ElementTypes.CONTAINMENT_LINK) {
 			return true;
 		}
-		if(elementType == ElementTypes.CONTAINMENT_SUB_LINK) {
+		if (elementType == ElementTypes.CONTAINMENT_SUB_LINK) {
 			return true;
 		}
-		if(elementType == ElementTypes.DEPENDENCY) {
+		if (elementType == ElementTypes.DEPENDENCY) {
 			return true;
 		}
-		if(elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
+		if (elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
 			return true;
 		}
-		if(elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
+		if (elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
 			return true;
 		}
-		if(elementType == ElementTypes.REALIZATION) {
+		if (elementType == ElementTypes.REALIZATION) {
 			return true;
 		}
-		if(elementType == ElementTypes.PACKAGE_IMPORT) {
+		if (elementType == ElementTypes.PACKAGE_IMPORT) {
 			return true;
 		}
 
@@ -144,15 +144,15 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 		// /////////////////////////////////////////////////////////////////////
 
 		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.	
-		if(elementType == null) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		// In such a case, test the semantic EObject instead.
+		if (elementType == null) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
 			}
 
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+			if ((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
@@ -163,7 +163,7 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 	@Override
 	protected boolean provides(CreateNodeViewOperation op) {
 		// Must have a container
-		if(op.getContainerView() == null) {
+		if (op.getContainerView() == null) {
 			return false;
 		}
 		// Get the type of the container
@@ -171,7 +171,7 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 
 		// This provider is registered for Requirement Diagram only
 		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
@@ -179,153 +179,192 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 		// Test possibility to provide a view based on the ElementType and its expected container.
 		// /////////////////////////////////////////////////////////////////////
 
-		IElementType elementType = (IElementType)op.getSemanticAdapter().getAdapter(IElementType.class);
-		if(elementType == ElementTypes.PACKAGE) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		IElementType elementType = (IElementType) op.getSemanticAdapter().getAdapter(IElementType.class);
+		if (elementType == ElementTypes.PACKAGE) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.PACKAGE_CN) {
-			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@fe0154 (visualID: 3009, editPartClassName: PackageEditPartCN, itemSemanticEditPolicyClassName: PackageItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackageCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: PackageGraphicalNodeEditPolicyCN, createCommandClassName: PackageCreateCommandCN)
-			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)
+		if (elementType == ElementTypes.PACKAGE_CN) {
+			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@fe0154 (visualID: 3009, editPartClassName: PackageEditPartCN, itemSemanticEditPolicyClassName: PackageItemSemanticEditPolicyCN, notationViewFactoryClassName: null)
+			// (canonicalEditPolicyClassName: PackageCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: PackageGraphicalNodeEditPolicyCN, createCommandClassName: PackageCreateCommandCN)
+			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
+			// PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName:
+			// ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
+			// ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName:
+			// PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)
 			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@758773cc (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_CN) {
-			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@49e8801d (visualID: 3010, editPartClassName: ClassEditPartCN, itemSemanticEditPolicyClassName: ClassItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ClassCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ClassGraphicalNodeEditPolicyCN, createCommandClassName: ClassCreateCommandCN)
-			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7615ece4 (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@49766b48 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7d7d69a5 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@45f05c4d (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)
+		if (elementType == ElementTypes.CLASS_CN) {
+			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@49e8801d (visualID: 3010, editPartClassName: ClassEditPartCN, itemSemanticEditPolicyClassName: ClassItemSemanticEditPolicyCN, notationViewFactoryClassName: null)
+			// (canonicalEditPolicyClassName: ClassCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ClassGraphicalNodeEditPolicyCN, createCommandClassName: ClassCreateCommandCN)
+			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7615ece4 (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
+			// PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@49766b48 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName:
+			// ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7d7d69a5 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
+			// ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@45f05c4d (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName:
+			// PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)
 			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@42242af9 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.DEFAULT_NAMED_ELEMENT) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.DEFAULT_NAMED_ELEMENT) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CONTAINMENT_CIRCLE_CN) {
-            // node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildSideAffixedNodeImpl@6585f639 (visualID: 3032, editPartClassName: ContainmentCircleEditPart, itemSemanticEditPolicyClassName: ContainmentCircleItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ContainmentCircleCanonicalEditPolicy) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ContainmentCircleGraphicalNodeEditPolicy, createCommandClassName: ContainmentCircleCreateCommand) (preferredSideName: NORTH)
-			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenTopLevelNodeImpl@a94a7a8 (visualID: 2008, editPartClassName: ClassEditPart, itemSemanticEditPolicyClassName: ClassItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ClassCanonicalEditPolicy) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ClassGraphicalNodeEditPolicy, createCommandClassName: ClassCreateCommand)
+		if (elementType == ElementTypes.CONTAINMENT_CIRCLE_CN) {
+			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildSideAffixedNodeImpl@6585f639 (visualID: 3032, editPartClassName: ContainmentCircleEditPart, itemSemanticEditPolicyClassName: ContainmentCircleItemSemanticEditPolicy, notationViewFactoryClassName:
+			// null) (canonicalEditPolicyClassName: ContainmentCircleCanonicalEditPolicy) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ContainmentCircleGraphicalNodeEditPolicy, createCommandClassName:
+			// ContainmentCircleCreateCommand) (preferredSideName: NORTH)
+			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenTopLevelNodeImpl@a94a7a8 (visualID: 2008, editPartClassName: ClassEditPart, itemSemanticEditPolicyClassName: ClassItemSemanticEditPolicy, notationViewFactoryClassName: null)
+			// (canonicalEditPolicyClassName: ClassCanonicalEditPolicy) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ClassGraphicalNodeEditPolicy, createCommandClassName: ClassCreateCommand)
 			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@6eca2ca5 (name: ) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
-			if(ElementTypes.CLASS.getSemanticHint().equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS.getSemanticHint().equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.COMMENT) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.COMMENT) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.COMMENT_CN) {
-			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@1e625e00 (visualID: 3028, editPartClassName: CommentEditPartCN, itemSemanticEditPolicyClassName: CommentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: CommentCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: CommentGraphicalNodeEditPolicyCN, createCommandClassName: CommentCreateCommandCN)
-			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)
+		if (elementType == ElementTypes.COMMENT_CN) {
+			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@1e625e00 (visualID: 3028, editPartClassName: CommentEditPartCN, itemSemanticEditPolicyClassName: CommentItemSemanticEditPolicyCN, notationViewFactoryClassName: null)
+			// (canonicalEditPolicyClassName: CommentCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: CommentGraphicalNodeEditPolicyCN, createCommandClassName: CommentCreateCommandCN)
+			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
+			// PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName:
+			// ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
+			// ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName:
+			// PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)
 			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@4af21bf0 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CONSTRAINT) {
-			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CONSTRAINT) {
+			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CONSTRAINT_CN) {
-			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@4d55cb27 (visualID: 3029, editPartClassName: ConstraintEditPartCN, itemSemanticEditPolicyClassName: ConstraintItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ConstraintCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ConstraintGraphicalNodeEditPolicyCN, createCommandClassName: ConstraintCreateCommandCN)
-			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)
+		if (elementType == ElementTypes.CONSTRAINT_CN) {
+			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@4d55cb27 (visualID: 3029, editPartClassName: ConstraintEditPartCN, itemSemanticEditPolicyClassName: ConstraintItemSemanticEditPolicyCN, notationViewFactoryClassName: null)
+			// (canonicalEditPolicyClassName: ConstraintCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ConstraintGraphicalNodeEditPolicyCN, createCommandClassName: ConstraintCreateCommandCN)
+			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
+			// PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName:
+			// ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
+			// ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName:
+			// PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: true, listLayout: false)
 			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@4cbc5fb7 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
-			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_PROPERTY_CLN) {
-			if(ElementTypes.CLASS_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS_PROPERTY_CLN) {
+			if (ElementTypes.CLASS_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_RECEPTION_CLN) {
-			if(ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS_RECEPTION_CLN) {
+			if (ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_OPERATION_CLN) {
-			if(ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS_OPERATION_CLN) {
+			if (ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_CLASS_CLN) {
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS_CLASS_CLN) {
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_INTERFACE_CLN) {
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS_INTERFACE_CLN) {
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_ENUMERATION_CLN) {
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS_ENUMERATION_CLN) {
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_PRIMITIVE_TYPE_CLN) {
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS_PRIMITIVE_TYPE_CLN) {
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_DATA_TYPE_CLN) {
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS_DATA_TYPE_CLN) {
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
-		if(elementType == ElementTypes.CLASS_SIGNAL_CLN) {
-			if(ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+		if (elementType == ElementTypes.CLASS_SIGNAL_CLN) {
+			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
-			if(ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
+			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
 				return true;
 			}
 		}
@@ -336,16 +375,16 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 
 		// IElementType may be null (especially when drop from ModelExplorer).
 		// In such a case, test the semantic EObject instead.
-		if(elementType == null) {
-			EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+		if (elementType == null) {
+			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
 			String domainElementGraphicalType = op.getSemanticHint();
-			if(domainElementGraphicalType == null) {
+			if (domainElementGraphicalType == null) {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 			} else {
 				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
 			}
 
-			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
+			if ((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
 				return true;
 			}
 		}
@@ -355,7 +394,7 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 	@Override
 	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
 
-		if(semanticHint != null) {
+		if (semanticHint != null) {
 			return super.createNode(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
 		}
 
@@ -363,11 +402,11 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 		// Get the type of the container
 		String containerGraphicalType = containerView.getType();
 		// Get the type of the domain element
-		EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
+		EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
 		String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
 
 		// Create the expected node
-		if(!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
+		if (!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
 			return super.createNode(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
 		}
 
@@ -377,7 +416,7 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 
 	@Override
 	protected void stampShortcut(View containerView, Node target) {
-		if(!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
+		if (!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
 			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
 			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
 			shortcutAnnotation.getDetails().put("modelID", ElementTypes.DIAGRAM_ID); //$NON-NLS-1$
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java
index 7e24989e5a8..728917af7a1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,11 +26,11 @@ public class RequirementDiagramEditPartProvider extends AbstractEditPartProvider
 
 	@Override
 	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			View view = ((IEditPartOperation) operation).getView();
 
 			// Ensure current diagram is Requirement Diagram
-			if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+			if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
 				return true;
 			}
 		}
@@ -40,7 +40,7 @@ public class RequirementDiagramEditPartProvider extends AbstractEditPartProvider
 
 	@Override
 	protected Class<?> getDiagramEditPartClass(View view) {
-		if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+		if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
 			return RequirementDiagramEditPart.class;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java
index dbeb55cfd35..657e8f908b7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,76 +25,78 @@ import org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomDragDropE
 
 public class RequirementDiagramEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
 
+	@Override
 	public boolean provides(IOperation operation) {
 
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;
-		if(!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
 			return false;
 		}
-		GraphicalEditPart gep = (GraphicalEditPart)epOperation.getEditPart();
+		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();
 		String diagramType = gep.getNotationView().getDiagram().getType();
-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
 			return false;
 		}
 
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentCircleEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentCircleEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {
+		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {
 			return true;
 		}
 
 		return false;
 	}
 
+	@Override
 	public void createEditPolicies(EditPart editPart) {
 		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java
index cfd6a5183b3..e2f43e52aba 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@ public class RequirementDiagramViewProvider extends AbstractViewProvider {
 	@Override
 	protected boolean provides(CreateDiagramViewOperation operation) {
 
-		if(ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
+		if (ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
 			return true;
 		}
 
@@ -34,7 +34,7 @@ public class RequirementDiagramViewProvider extends AbstractViewProvider {
 
 	@Override
 	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if(ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
+		if (ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
 			return RequirementDiagramViewFactory.class;
 		}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java
index fc375e93633..3651d89e983 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/Messages.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/Messages.java
index 3d8a84a4633..17b09d4509d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/Messages.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/Messages.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java
index 721426b721f..44f842c0b23 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 Atos Origin.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -25,6 +25,7 @@ public class RequirementDiagramCreationCondition extends PerspectiveContextDepen
 	/**

 	 * {@inheritDoc}

 	 */

+	@Override

 	public boolean create(EObject selectedElement) {

 		return false;

 	}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomAbstractRequirementInformationLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomAbstractRequirementInformationLabelEditPart.java
index fd93fcd7e8c..fce18347ab4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomAbstractRequirementInformationLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomAbstractRequirementInformationLabelEditPart.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2012 ATOS.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -42,7 +42,7 @@ public abstract class CustomAbstractRequirementInformationLabelEditPart extends
 		 */

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new CustomRequirementInfoLabelUpdateEditPolicy());

 		super.createDefaultEditPolicies();

-		//Removing useless edit policies installed by superclasses.

+		// Removing useless edit policies installed by superclasses.

 		removeEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

 		removeEditPolicy(EditPolicy.COMPONENT_ROLE);

 	}

@@ -50,7 +50,7 @@ public abstract class CustomAbstractRequirementInformationLabelEditPart extends
 	@Override

 	protected IFigure createFigure() {

 		IFigure figure = new WrappingLabel();

-		((WrappingLabel)figure).setTextWrap(true);

+		((WrappingLabel) figure).setTextWrap(true);

 		figure.setFont(Display.getDefault().getSystemFont());

 		return figure;

 	}

@@ -79,13 +79,13 @@ public abstract class CustomAbstractRequirementInformationLabelEditPart extends
 	protected Requirement getRequirement() {

 		EditPart compartment = this.getParent();

 		EditPart classEditPart = compartment.getParent();

-		//Getting the class out of the edit part.

-		Element clazz = (Element)((View)classEditPart.getModel()).getElement();

-		//Getting the requirement out of the class.

-		if(clazz != null) {

-			for(EObject appliedStereotype : clazz.getStereotypeApplications()) {

-				if(appliedStereotype instanceof Requirement) {

-					return ((Requirement)appliedStereotype);

+		// Getting the class out of the edit part.

+		Element clazz = (Element) ((View) classEditPart.getModel()).getElement();

+		// Getting the requirement out of the class.

+		if (clazz != null) {

+			for (EObject appliedStereotype : clazz.getStereotypeApplications()) {

+				if (appliedStereotype instanceof Requirement) {

+					return ((Requirement) appliedStereotype);

 				}

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementEditPart.java
index 00bb7a17f85..0ee257a59dc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementEditPart.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2012 ATOS.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,46 +21,44 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.sysml.diagram.requirement.figure.CustomRequirementFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

 import org.eclipse.papyrus.uml.diagram.common.commands.ShowHideCompartmentRequest;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

 import org.eclipse.uml2.uml.NamedElement;

 

 public class CustomRequirementEditPart extends ClassEditPart {

 

 	//protected static final String ICONS_PATH = "/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif"; //$NON-NLS-1$

-	

+

 	public CustomRequirementEditPart(View view) {

 		super(view);

 	}

 

-	

+

 	@Override

 	protected IFigure createNodeShape() {

-		//Showing the information compartment.

+		// Showing the information compartment.

 		View notationView = getNotationView();

 		Request request = new ShowHideCompartmentRequest(ShowHideCompartmentRequest.SHOW, notationView);

 		request.setType(ShowHideCompartmentRequest.SHOW_HIDE_COMPARTMENT);

 		Command showCompartmentCommand = this.getCommand(request);

 		getEditDomain().getCommandStack().execute(showCompartmentCommand);

-		

-		primaryShape = new CustomRequirementFigure(); //$NON-NLS-1$

-		//((CustomRequirementFigure)primaryShape).setTagIcon(Activator.getPluginIconImage(Activator.ID, ICONS_PATH));

+

+		primaryShape = new CustomRequirementFigure();

+		// ((CustomRequirementFigure)primaryShape).setTagIcon(Activator.getPluginIconImage(Activator.ID, ICONS_PATH));

 		return primaryShape;

 	}

 

 	public void refreshTitle() {

-		NamedElement clazz = (NamedElement)((View)this.getModel()).getElement();

+		NamedElement clazz = (NamedElement) ((View) this.getModel()).getElement();

 		String requirementName = clazz.getName();

-		((CustomRequirementFigure)this.getFigure()).setName(requirementName);

+		((CustomRequirementFigure) this.getFigure()).setName(requirementName);

 	}

 

 	@Override

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if(childEditPart instanceof CustomRequirementInformationCompartmentEditPart) {

-			IFigure pane = ((CustomRequirementFigure)getPrimaryShape()).getRequirementIdInformationCompartmentFigure();

-			setupContentPane(pane); // FIXME each compartment should handle his content pane in his own way 

-			pane.add(((CustomRequirementInformationCompartmentEditPart)childEditPart).getFigure());

+		if (childEditPart instanceof CustomRequirementInformationCompartmentEditPart) {

+			IFigure pane = ((CustomRequirementFigure) getPrimaryShape()).getRequirementIdInformationCompartmentFigure();

+			setupContentPane(pane); // FIXME each compartment should handle his content pane in his own way

+			pane.add(((CustomRequirementInformationCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 		return super.addFixedChild(childEditPart);

@@ -68,10 +66,10 @@ public class CustomRequirementEditPart extends ClassEditPart {
 

 	@Override

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if(childEditPart instanceof CustomRequirementInformationCompartmentEditPart) {

-			IFigure pane = ((CustomRequirementFigure)getPrimaryShape()).getRequirementIdInformationCompartmentFigure();

-			setupContentPane(pane); // FIXME each compartment should handle his content pane in his own way 

-			pane.remove(((CustomRequirementInformationCompartmentEditPart)childEditPart).getFigure());

+		if (childEditPart instanceof CustomRequirementInformationCompartmentEditPart) {

+			IFigure pane = ((CustomRequirementFigure) getPrimaryShape()).getRequirementIdInformationCompartmentFigure();

+			setupContentPane(pane); // FIXME each compartment should handle his content pane in his own way

+			pane.remove(((CustomRequirementInformationCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 		return super.removeFixedChild(childEditPart);

@@ -79,8 +77,8 @@ public class CustomRequirementEditPart extends ClassEditPart {
 

 	@Override

 	public IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if(editPart instanceof CustomRequirementInformationCompartmentEditPart) {

-			return ((CustomRequirementFigure)getPrimaryShape()).getRequirementIdInformationCompartmentFigure();

+		if (editPart instanceof CustomRequirementInformationCompartmentEditPart) {

+			return ((CustomRequirementFigure) getPrimaryShape()).getRequirementIdInformationCompartmentFigure();

 		}

 		return super.getContentPaneFor(editPart);

 	}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementIdLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementIdLabelEditPart.java
index fe61ee84211..eee3e13b79c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementIdLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementIdLabelEditPart.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2012 ATOS.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -28,11 +28,11 @@ public class CustomRequirementIdLabelEditPart extends CustomAbstractRequirementI
 

 	@Override

 	public void refreshLabelText() {

-		if(this.figure != null && this.getRequirement() != null) {

-			WrappingLabel wrappingLabel = (WrappingLabel)figure;

+		if (this.figure != null && this.getRequirement() != null) {

+			WrappingLabel wrappingLabel = (WrappingLabel) figure;

 			Requirement req = this.getRequirement();

 			String id = req.getId();

-			if(id == null) {

+			if (id == null) {

 				id = ""; //$NON-NLS-1$

 			}

 			wrappingLabel.setText("id = \"" + id + "\""); //$NON-NLS-1$ //$NON-NLS-2$

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementInformationCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementInformationCompartmentEditPart.java
index b2f7b92b855..eac5cbf99b4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementInformationCompartmentEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementInformationCompartmentEditPart.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2012 ATOS.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPol
  * Compartment used to display the id and the text of the requirement.

  * The actual display of these information is performed by

  * RequirementIdLabelEditPart and RequirementTextLabelEditPart

- * 

+ *

  */

 public class CustomRequirementInformationCompartmentEditPart extends ResizeableListCompartmentEditPart {

 

@@ -43,14 +43,17 @@ public class CustomRequirementInformationCompartmentEditPart extends ResizeableL
 		super(model);

 	}

 

+	@Override

 	protected boolean hasModelChildrenChanged(Notification evt) {

 		return false;

 	}

 

+	@Override

 	public String getCompartmentName() {

 		return COMPARTMENT_NAME;

 	}

 

+	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

@@ -59,30 +62,34 @@ public class CustomRequirementInformationCompartmentEditPart extends ResizeableL
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 	}

 

+	@Override

 	protected void setRatio(Double ratio) {

-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

 		}

 	}

 

+	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

 	}

 

+	@Override

 	protected void refreshBounds() {

-		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		Dimension size = new Dimension(width, height);

-		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

+	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementNameEditPart.java
index 7c56f185623..da5a3de1894 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementNameEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementNameEditPart.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -22,22 +22,23 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;
 import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.swt.graphics.Image;

 

-public class CustomRequirementNameEditPart  extends ClassNameEditPart{ //NamedElementNodeLabelNameEditPart {

+public class CustomRequirementNameEditPart extends ClassNameEditPart { // NamedElementNodeLabelNameEditPart {

 

 	/** Constructor */

 	public CustomRequirementNameEditPart(View view) {

 		super(view);

 	}

 

+	@Override

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if(parserElement == null) {

+		if (parserElement == null) {

 			return null;

 		}

 

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for(View view : views) {

-			if( AppearanceHelper.showElementIcon(view)) {

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

 				return org.eclipse.papyrus.sysml.diagram.common.Activator.getInstance().getLabelProvider().getImage(parserElement);

 			}

 		}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementTextLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementTextLabelEditPart.java
index 56349791e57..c89c739bb41 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementTextLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementTextLabelEditPart.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2012 ATOS.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -28,11 +28,11 @@ public class CustomRequirementTextLabelEditPart extends CustomAbstractRequiremen
 

 	@Override

 	public void refreshLabelText() {

-		if(this.figure != null && this.getRequirement() != null) {

-			WrappingLabel wrappingLabel = (WrappingLabel)figure;

+		if (this.figure != null && this.getRequirement() != null) {

+			WrappingLabel wrappingLabel = (WrappingLabel) figure;

 			Requirement req = this.getRequirement();

 			String text = req.getText();

-			if(text == null) {

+			if (text == null) {

 				text = ""; //$NON-NLS-1$

 			}

 			wrappingLabel.setText("text = \"" + text + "\""); //$NON-NLS-1$ //$NON-NLS-2$

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomAppliedStereotypeLabelDisplayEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomAppliedStereotypeLabelDisplayEditPolicy.java
index 89d98668ef5..30e91c16bf2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomAppliedStereotypeLabelDisplayEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomAppliedStereotypeLabelDisplayEditPolicy.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2012 ATOS.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Stereotype;
  * on commands to get the stereotypes (the computation of the text was

  * formerly processed by commands executed when the object was dragged

  * from a palette, from instance).

- * 

+ *

  * @author omelois

  */

 public class CustomAppliedStereotypeLabelDisplayEditPolicy extends AppliedStereotypeNodeLabelDisplayEditPolicy {

@@ -39,26 +39,26 @@ public class CustomAppliedStereotypeLabelDisplayEditPolicy extends AppliedStereo
 	public String stereotypesOnlyToDisplay() {

 		Object hostModel = getHost().getModel();

 		String result = ""; //$NON-NLS-1$

-		View view = (View)hostModel;

+		View view = (View) hostModel;

 		EObject viewElement = view.getElement();

-		Element element = (Element)viewElement;

+		Element element = (Element) viewElement;

 		Iterator<Stereotype> listStereotype = element.getAppliedStereotypes().iterator();

 		StringBuffer buffer = new StringBuffer();

-		while(listStereotype.hasNext()) {

+		while (listStereotype.hasNext()) {

 			Stereotype stereotypec = listStereotype.next();

 			String stereotype_string = stereotypec.getQualifiedName();

 			buffer.append(stereotype_string);

-			if(listStereotype.hasNext()) {

+			if (listStereotype.hasNext()) {

 				buffer.append(","); //$NON-NLS-1$

 			}

 		}

 		result = buffer.toString();

 

-		if(result.length() != 0) {

+		if (result.length() != 0) {

 			String stereotypespresentationKind = AppliedStereotypeHelper.getAppliedStereotypePresentationKind(view);

 

 			// vertical representation

-			if(UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION.equals(stereotypespresentationKind)) {

+			if (UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION.equals(stereotypespresentationKind)) {

 				return Activator.ST_LEFT + stereotypesToDisplay(Activator.ST_RIGHT + "\n" + Activator.ST_LEFT, result, "") + Activator.ST_RIGHT;

 			} else {// horizontal representation

 				return Activator.ST_LEFT + stereotypesToDisplay(", ", result, "") + Activator.ST_RIGHT;

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomDragDropEditPolicy.java
index 3b76ae9aa31..b361c190785 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomDragDropEditPolicy.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -37,87 +37,87 @@ public class CustomDragDropEditPolicy extends RequirementDiagramDragDropEditPoli
 		Set<Integer> droppableElementsVisualID = new HashSet<Integer>();

 		return droppableElementsVisualID;

 	}

-	

+

 	@Override

 	public int getNodeVisualID(View containerView, EObject domainElement) {

 		String semanticHint = "-1";

 

 		// Fill the semantic hint during the drop when the top level is the Requirement Diagram

-		if(containerView instanceof Diagram) {

-			if(domainElement instanceof org.eclipse.uml2.uml.Package) {

+		if (containerView instanceof Diagram) {

+			if (domainElement instanceof org.eclipse.uml2.uml.Package) {

 				semanticHint = ElementTypes.PACKAGE.getSemanticHint();

 			}

-			if((domainElement instanceof org.eclipse.uml2.uml.Class)) {

-				org.eclipse.uml2.uml.Class domainElementClass = (org.eclipse.uml2.uml.Class)domainElement;

-				if(domainElementClass.getAppliedStereotype(SysmlResource.REQUIREMENT_ID) != null) {

+			if ((domainElement instanceof org.eclipse.uml2.uml.Class)) {

+				org.eclipse.uml2.uml.Class domainElementClass = (org.eclipse.uml2.uml.Class) domainElement;

+				if (domainElementClass.getAppliedStereotype(SysmlResource.REQUIREMENT_ID) != null) {

 					semanticHint = ElementTypes.CLASS.getSemanticHint();

 				}

 			}

-			

-			if(domainElement instanceof Comment) {

+

+			if (domainElement instanceof Comment) {

 				semanticHint = ElementTypes.COMMENT.getSemanticHint();

 			}

-			

-			if(domainElement instanceof Constraint) {

+

+			if (domainElement instanceof Constraint) {

 				semanticHint = ElementTypes.CONSTRAINT.getSemanticHint();

 			}

-						

+

 		}

 

-		// Fill the semantic hint during the drop when the top level is the an element in the Requirement Diagram  (a Package for instance)

+		// Fill the semantic hint during the drop when the top level is the an element in the Requirement Diagram (a Package for instance)

 		else {

-			if(domainElement instanceof org.eclipse.uml2.uml.Package) {

+			if (domainElement instanceof org.eclipse.uml2.uml.Package) {

 				semanticHint = ElementTypes.PACKAGE_CN.getSemanticHint();

 			}

-			if((domainElement instanceof org.eclipse.uml2.uml.Class)) {

-				org.eclipse.uml2.uml.Class domainElementClass = (org.eclipse.uml2.uml.Class)domainElement;

-				if(domainElementClass.getAppliedStereotype(SysmlResource.REQUIREMENT_ID) != null) {

+			if ((domainElement instanceof org.eclipse.uml2.uml.Class)) {

+				org.eclipse.uml2.uml.Class domainElementClass = (org.eclipse.uml2.uml.Class) domainElement;

+				if (domainElementClass.getAppliedStereotype(SysmlResource.REQUIREMENT_ID) != null) {

 					semanticHint = ElementTypes.CLASS_CN.getSemanticHint();

 				}

 			}

-			

-			if(domainElement instanceof Comment) {

+

+			if (domainElement instanceof Comment) {

 				semanticHint = ElementTypes.COMMENT_CN.getSemanticHint();

 			}

-			

-			if(domainElement instanceof Constraint) {

+

+			if (domainElement instanceof Constraint) {

 				semanticHint = ElementTypes.CONSTRAINT_CN.getSemanticHint();

 			}

-			

+

 		}

 

-		// In the case of we want to Drag and drop something else than a package or a Requirement, if this is a NamedElement, 

+		// In the case of we want to Drag and drop something else than a package or a Requirement, if this is a NamedElement,

 		// we can fill the semanticHint with the NamedElement dedicated Value

-		if(semanticHint == "-1") {

-			if((domainElement instanceof org.eclipse.uml2.uml.NamedElement)) {

+		if (semanticHint == "-1") {

+			if ((domainElement instanceof org.eclipse.uml2.uml.NamedElement)) {

 				semanticHint = ElementTypes.DEFAULT_NAMED_ELEMENT.getSemanticHint();

 			}

 		}

 

 		return new Integer(semanticHint);

 	}

-	

+

 	@Override

 	public int getLinkWithClassVisualID(EObject domainElement) {

 		String semanticHint = "-1";

 

-		if(domainElement instanceof Abstraction) {

+		if (domainElement instanceof Abstraction) {

 			semanticHint = ElementTypes.ABSTRACTION.getSemanticHint();

 		}

 

-		if(domainElement instanceof Dependency) {

+		if (domainElement instanceof Dependency) {

 			semanticHint = ElementTypes.DEPENDENCY.getSemanticHint();

 		}

-		

-		if(domainElement instanceof PackageImport) {

+

+		if (domainElement instanceof PackageImport) {

 			semanticHint = ElementTypes.PACKAGE_IMPORT.getSemanticHint();

 		}

-		if(domainElement instanceof Realization) {

+		if (domainElement instanceof Realization) {

 			semanticHint = ElementTypes.REALIZATION.getSemanticHint();

 		}

-		

+

 		return new Integer(semanticHint);

 

 	}

-	

+

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomRequirementInfoLabelUpdateEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomRequirementInfoLabelUpdateEditPolicy.java
index 9fe3b8052fe..1215afe21ab 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomRequirementInfoLabelUpdateEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomRequirementInfoLabelUpdateEditPolicy.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2012 ATOS.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.uml2.uml.Element;
 

 /**

  * Edit policy used to refresh the label that display the id and the text of a requirement.

- * 

+ *

  */

 public class CustomRequirementInfoLabelUpdateEditPolicy extends AbstractAppliedStereotypeDisplayEditPolicy {

 

@@ -33,11 +33,11 @@ public class CustomRequirementInfoLabelUpdateEditPolicy extends AbstractAppliedS
 	@Override

 	protected Element getUMLElement() {

 		EditPart host = this.getHost();

-		//Reminder : the label is in the compartment, which is in the class edit part.

+		// Reminder : the label is in the compartment, which is in the class edit part.

 		EditPart compartment = host.getParent();

 		EditPart classEditPart = compartment.getParent();

-		//Getting the class out of the edit part.

-		Element clazz = (Element)((View)classEditPart.getModel()).getElement();

+		// Getting the class out of the edit part.

+		Element clazz = (Element) ((View) classEditPart.getModel()).getElement();

 		return clazz;

 	}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/factory/CustomRequirementUMLEditPartFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/factory/CustomRequirementUMLEditPartFactory.java
index 2b04741195b..0d76a52404b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/factory/CustomRequirementUMLEditPartFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/factory/CustomRequirementUMLEditPartFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -25,6 +25,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
  */

 public class CustomRequirementUMLEditPartFactory extends CustomUMLEditPartFactory {

 

+	@Override

 	public EditPart createEditPart(EditPart context, Object model) {

 		if (model instanceof View) {

 			View view = (View) model;

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/figure/CustomRequirementFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/figure/CustomRequirementFigure.java
index 90b7758510e..0403a285a73 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/figure/CustomRequirementFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/figure/CustomRequirementFigure.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2012 ATOS.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CUMLEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CUMLEditPartProvider.java
index 268ffb6f4c0..1f940b5fa18 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CUMLEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CUMLEditPartProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomEditPolicyProvider.java
index db4cf50d50b..6b898bf2b87 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomEditPolicyProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomEditPolicyProvider.java
@@ -23,24 +23,26 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElemen
  */

 public class CustomEditPolicyProvider extends RequirementDiagramEditPolicyProvider {

 

+	@Override

 	public boolean provides(IOperation operation) {

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;

-		if(!(epOperation.getEditPart() instanceof GraphicalEditPart)) {

+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

+		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {

 			return false;

 		}

-		GraphicalEditPart gep = (GraphicalEditPart)epOperation.getEditPart();

+		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();

 		String diagramType = gep.getNotationView().getDiagram().getType();

-		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

+		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

 			return false;

 		}

 

-		if((gep instanceof PackagePackageableElementCompartmentEditPart) || (gep instanceof PackagePackageableElementCompartmentEditPartCN)) {

+		if ((gep instanceof PackagePackageableElementCompartmentEditPart) || (gep instanceof PackagePackageableElementCompartmentEditPartCN)) {

 			return true;

 		}

 

 		return false;

 	}

 

+	@Override

 	public void createEditPolicies(EditPart editPart) {

 		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());

 	}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
index 7f9a2fe2c8a..51bf43cdc3b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

 import org.eclipse.papyrus.sysml.diagram.requirement.edit.part.CustomRequirementNameEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

@@ -27,14 +28,14 @@ import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForEle
 

 /**

  * SysML Requirement diagram inherited elements view providers from UML Class diagram view providers

- * 

+ *

  */

 public class CustomInheritedElementViewProvider extends InheritedClassDiagramViewProvider {

 

-	public CustomInheritedElementViewProvider(){

+	public CustomInheritedElementViewProvider() {

 		super();

 	}

-	

+

 	@Override

 	public Node createClass_2008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

 

@@ -44,17 +45,17 @@ public class CustomInheritedElementViewProvider extends InheritedClassDiagramVie
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+		// initializeFromPreferences

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Class");

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

 		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Class");

-		

-		//createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID));

-		

-		createLabel(node, UMLVisualIDRegistry.getType(CustomRequirementNameEditPart.VISUAL_ID));

-		

-		

+

+		// createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID));

+

+		createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID));

+

+

 		createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

 		createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

 		createCompartment(node, UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomRequirementEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomRequirementEditPartProvider.java
index 45cd8157860..5b705edfdf1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomRequirementEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomRequirementEditPartProvider.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

- * 

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -25,7 +25,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
 

 /**

  * Reuse the Custom EditPartProvider from the Class Diagram

- * 

+ *

  * @author Nizar GUEDIDI

  */

 public class CustomRequirementEditPartProvider extends CUMLEditPartProvider {

@@ -33,16 +33,16 @@ public class CustomRequirementEditPartProvider extends CUMLEditPartProvider {
 	@Override

 	public synchronized boolean provides(IOperation operation) {

 		super.provides(operation);

-		if(operation instanceof CreateGraphicEditPartOperation) {

-			View view = ((IEditPartOperation)operation).getView();

-			if(!ElementTypes.DIAGRAM_ID.equals(UMLVisualIDRegistry.getModelID(view))) {

+		if (operation instanceof CreateGraphicEditPartOperation) {

+			View view = ((IEditPartOperation) operation).getView();

+			if (!ElementTypes.DIAGRAM_ID.equals(UMLVisualIDRegistry.getModelID(view))) {

 				return false;

 			}

-			if(isAllowCaching() && getCachedPart(view) != null) {

+			if (isAllowCaching() && getCachedPart(view) != null) {

 				return true;

 			}

 			IGraphicalEditPart part = createEditPart(view);

-			if(part != null) {

+			if (part != null) {

 				return true;

 			}

 		}

@@ -51,16 +51,16 @@ public class CustomRequirementEditPartProvider extends CUMLEditPartProvider {
 

 	@Override

 	protected IGraphicalEditPart createEditPart(View view) {

-		if(view.getType().equals(SysMLGraphicalTypes.COMPARTMENT_SYSML_REQUIREMENT_IDINFO_AS_LIST_ID)) {

+		if (view.getType().equals(SysMLGraphicalTypes.COMPARTMENT_SYSML_REQUIREMENT_IDINFO_AS_LIST_ID)) {

 			return new CustomRequirementInformationCompartmentEditPart(view);

 		}

-		if(view.getType().equals(SysMLGraphicalTypes.SHAPE_SYSML_REQUIREMENT_AS_CLASSIFER_ID)) {

+		if (view.getType().equals(SysMLGraphicalTypes.SHAPE_SYSML_REQUIREMENT_AS_CLASSIFER_ID)) {

 			return new CustomRequirementEditPart(view);

 		}

-		if(view.getType().equals(SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_ID_ID)) {

+		if (view.getType().equals(SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_ID_ID)) {

 			return new CustomRequirementIdLabelEditPart(view);

 		}

-		if(view.getType().equals(SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_TEXT_ID)) {

+		if (view.getType().equals(SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_TEXT_ID)) {

 			return new CustomRequirementTextLabelEditPart(view);

 		}

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/Activator.java
index cd1164a430f..48d9c486814 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/Activator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,7 +26,7 @@ public class Activator extends Plugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java
index 6682cadff91..e1e62c61860 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

 on * Copyright (c) 2010, 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -41,18 +41,18 @@ public class NewSysMLModelWizard extends CreateModelWizard {
 		super.init(workbench, selection);

 		setWindowTitle("New SysML Model");

 	}

-	

+

 	@Override

 	public String getModelKindName() {

 		return "Papyrus SysML";

 	}

-	

+

 	/**

 	 * {@inheritDoc}

 	 */

 	@Override

 	protected String[] getDiagramCategoryIds() {

-		return new String[]{CreateSysMLModelCommand.COMMAND_ID};

+		return new String[] { CreateSysMLModelCommand.COMMAND_ID };

 	}

 

 	/**

@@ -60,16 +60,16 @@ public class NewSysMLModelWizard extends CreateModelWizard {
 	 */

 	@Override

 	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {

-		//here SysML is the only available category

+		// here SysML is the only available category

 		return null;

 	}

-	

+

 	/**

 	 * {@inheritDoc}

 	 */

 	@Override

 	protected void saveDiagramCategorySettings() {

-		//here SysML is the only available category

+		// here SysML is the only available category

 	}

 

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java
index 0905a00ae42..3994ea393e9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -51,7 +51,7 @@ public class NewSysMLProjectWizard extends NewPapyrusProjectWizard {
 	 */

 	@Override

 	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {

-		//here SysML is the only available category

+		// here SysML is the only available category

 		return null;

 	}

 

@@ -60,8 +60,8 @@ public class NewSysMLProjectWizard extends NewPapyrusProjectWizard {
 	 */

 	@Override

 	protected void saveDiagramCategorySettings() {

-		//do nothing

-		//here SysML is the only available category

+		// do nothing

+		// here SysML is the only available category

 	}

 

 	/**

@@ -69,7 +69,7 @@ public class NewSysMLProjectWizard extends NewPapyrusProjectWizard {
 	 */

 	@Override

 	protected String[] getDiagramCategoryIds() {

-		return new String[]{CreateSysMLModelCommand.COMMAND_ID};

+		return new String[] { CreateSysMLModelCommand.COMMAND_ID };

 	}

 

 }

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java
index c1d402c9997..fb2783814d2 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -25,8 +25,9 @@ public class CommandFilter implements ICommandFilter {
 
 	private List<IElementType> visibleCommands;
 
+	@Override
 	public List<IElementType> getVisibleCommands() {
-		if(visibleCommands == null) {
+		if (visibleCommands == null) {
 			visibleCommands = new ArrayList<IElementType>();
 
 			visibleCommands.add(SysMLElementTypes.ACTOR_PART_PROPERTY);
@@ -68,7 +69,7 @@ public class CommandFilter implements ICommandFilter {
 			visibleCommands.add(SysMLElementTypes.VIEW);
 			visibleCommands.add(SysMLElementTypes.VIEW_POINT);
 
-			// UMLElementTypes.PROPERTY is required by ConstraintBlock Parameter 
+			// UMLElementTypes.PROPERTY is required by ConstraintBlock Parameter
 			visibleCommands.add(UMLElementTypes.PROPERTY);
 
 		}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ActorPartPropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ActorPartPropertyHandler.java
index 83d5a26eabe..e1f63407ac8 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ActorPartPropertyHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ActorPartPropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,9 +28,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ActorPart (Property) creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ActorPartPropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -40,11 +40,12 @@ public class ActorPartPropertyHandler extends AbstractSysmlModelExplorerCreateCo
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ACTOR_PART_PROPERTY;
 	}
@@ -55,7 +56,7 @@ public class ActorPartPropertyHandler extends AbstractSysmlModelExplorerCreateCo
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -63,12 +64,12 @@ public class ActorPartPropertyHandler extends AbstractSysmlModelExplorerCreateCo
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -77,7 +78,7 @@ public class ActorPartPropertyHandler extends AbstractSysmlModelExplorerCreateCo
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java
index beb872b5f97..2ab3f0bec72 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Allocate creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AllocateHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AllocateHandler extends AbstractSysmlModelExplorerCreateCommandHand
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ALLOCATE;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeDirectedHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeDirectedHandler.java
index 2a958a236a3..a67d6b29d91 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeDirectedHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeDirectedHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationCompositeDirected creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationCompositeDirectedHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationCompositeDirectedHandler extends AbstractSysmlModelExplo
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeHandler.java
index 06b181c8de1..54be5040433 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationComposite creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationCompositeHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationCompositeHandler extends AbstractSysmlModelExplorerCreat
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_COMPOSITE;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationHandler.java
index 4ecdb7aaabf..d8cf9055f52 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Association creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationHandler extends AbstractSysmlModelExplorerCreateCommandH
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneDirectedHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneDirectedHandler.java
index a00839e790a..383a03b98d1 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneDirectedHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneDirectedHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationNoneDirected creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationNoneDirectedHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationNoneDirectedHandler extends AbstractSysmlModelExplorerCr
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_NONE_DIRECTED;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneHandler.java
index f6a64d68881..9c3a412b817 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationNone creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationNoneHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationNoneHandler extends AbstractSysmlModelExplorerCreateComm
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_NONE;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedDirectedHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedDirectedHandler.java
index 285e6e392e9..ed0611fb073 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedDirectedHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedDirectedHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationSharedDirected creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationSharedDirectedHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationSharedDirectedHandler extends AbstractSysmlModelExplorer
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedHandler.java
index 7e10ea7a20c..1621403d4f6 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationShared creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationSharedHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationSharedHandler extends AbstractSysmlModelExplorerCreateCo
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_SHARED;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java
index b368686abb1..55260382b75 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Block creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class BlockHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class BlockHandler extends AbstractSysmlModelExplorerCreateCommandHandler
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.BLOCK;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java
index 17276fd4dcb..1cd79b08b81 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Conform creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ConformHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ConformHandler extends AbstractSysmlModelExplorerCreateCommandHandl
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.CONFORM;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java
index b606e4c7f91..3a8bc6bad8b 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ConstraintBlock creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ConstraintBlockHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ConstraintBlockHandler extends AbstractSysmlModelExplorerCreateComm
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.CONSTRAINT_BLOCK;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockParameterHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockParameterHandler.java
index 1f3738e6bdc..22288637d97 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockParameterHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockParameterHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,9 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * <pre>
  * Command handler for Problem creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ConstraintBlockParameterHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -42,11 +42,12 @@ public class ConstraintBlockParameterHandler extends AbstractSysmlModelExplorerC
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PROPERTY;
 	}
@@ -57,35 +58,35 @@ public class ConstraintBlockParameterHandler extends AbstractSysmlModelExplorerC
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		EObject container = getCommandContext().getContainer();
 		EReference reference = getCommandContext().getReference();
 
-		if(!(container instanceof Element)) {
+		if (!(container instanceof Element)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
 		}
 
-		String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", ((Element)container).eContents()); //$NON-NLS-1$
+		String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", ((Element) container).eContents()); //$NON-NLS-1$
 		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), name));
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java
index d70faf68fd8..ce618c176b2 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,15 +22,14 @@ import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.sysml.diagram.common.commands.CreateConstraintPropertyWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreatePartWithTypeConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 
 /**
  * <pre>
  * Command handler for ConstraintProperty creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ConstraintPropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -40,22 +39,23 @@ public class ConstraintPropertyHandler extends AbstractSysmlModelExplorerCreateC
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.CONSTRAINT_PROPERTY;
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -63,12 +63,12 @@ public class ConstraintPropertyHandler extends AbstractSysmlModelExplorerCreateC
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java
index 480dce0f9ac..645bf8c98e9 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Copy creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class CopyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class CopyHandler extends AbstractSysmlModelExplorerCreateCommandHandler
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.COPY;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java
index 81b7a04052d..89537704747 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for DeriveReqt creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class DeriveReqtHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class DeriveReqtHandler extends AbstractSysmlModelExplorerCreateCommandHa
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.DERIVE_REQT;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java
index e7c38d2b7be..5fce84ff6de 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Dimension creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class DimensionHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class DimensionHandler extends AbstractSysmlModelExplorerCreateCommandHan
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.DIMENSION;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java
index d7b2af297a9..36a81af4119 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowPort creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPortHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPortHandler extends AbstractSysmlModelExplorerCreateCommandHand
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PORT;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java
index 39b7a689dc4..94dcfdf4530 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowPort_In creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPort_InHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPort_InHandler extends AbstractSysmlModelExplorerCreateCommandH
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PORT_IN;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java
index 6963f96737e..d9041776606 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowPort_InOut creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPort_InOutHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPort_InOutHandler extends AbstractSysmlModelExplorerCreateComma
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PORT_IN_OUT;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_NAHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_NAHandler.java
index ffe87032a94..e759e3f6313 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_NAHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_NAHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,9 +25,9 @@ import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowS
 /**
  * <pre>
  * Command handler for FlowPort non atomic creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPort_NAHandler extends FlowPortHandler {
@@ -38,7 +38,7 @@ public class FlowPort_NAHandler extends FlowPortHandler {
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -46,12 +46,12 @@ public class FlowPort_NAHandler extends FlowPortHandler {
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -60,7 +60,7 @@ public class FlowPort_NAHandler extends FlowPortHandler {
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java
index f2e05871f1f..086b4883f53 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowPort_Out creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPort_OutHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPort_OutHandler extends AbstractSysmlModelExplorerCreateCommand
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PORT_OUT;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java
index 85c6fa3324b..e683162701e 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowProperty creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPropertyHandler extends AbstractSysmlModelExplorerCreateCommand
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PROPERTY;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java
index f2170733c55..24388c8218b 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowSpecification creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowSpecificationHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowSpecificationHandler extends AbstractSysmlModelExplorerCreateCo
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_SPECIFICATION;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java
index 66d47e84a2f..763de27b9e5 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ItemFlow creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ItemFlowHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ItemFlowHandler extends AbstractSysmlModelExplorerCreateCommandHand
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ITEM_FLOW;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/PartPropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/PartPropertyHandler.java
index a216960c45d..e720f836a48 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/PartPropertyHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/PartPropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,9 +27,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Part (Property) creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class PartPropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -39,11 +39,12 @@ public class PartPropertyHandler extends AbstractSysmlModelExplorerCreateCommand
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.PART_PROPERTY;
 	}
@@ -54,7 +55,7 @@ public class PartPropertyHandler extends AbstractSysmlModelExplorerCreateCommand
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -62,12 +63,12 @@ public class PartPropertyHandler extends AbstractSysmlModelExplorerCreateCommand
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -76,7 +77,7 @@ public class PartPropertyHandler extends AbstractSysmlModelExplorerCreateCommand
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java
index 64a4a64ab3d..e43f55a872f 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Problem creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ProblemHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ProblemHandler extends AbstractSysmlModelExplorerCreateCommandHandl
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.PROBLEM;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java
index 3929eae12b8..9ee0c5e13e6 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Rationale creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class RationaleHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class RationaleHandler extends AbstractSysmlModelExplorerCreateCommandHan
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.RATIONALE;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ReferencePropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ReferencePropertyHandler.java
index 83f10a94f62..676e9517f7c 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ReferencePropertyHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ReferencePropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,9 +27,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Reference (Property) creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ReferencePropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -39,11 +39,12 @@ public class ReferencePropertyHandler extends AbstractSysmlModelExplorerCreateCo
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.REFERENCE_PROPERTY;
 	}
@@ -54,7 +55,7 @@ public class ReferencePropertyHandler extends AbstractSysmlModelExplorerCreateCo
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -62,12 +63,12 @@ public class ReferencePropertyHandler extends AbstractSysmlModelExplorerCreateCo
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -76,7 +77,7 @@ public class ReferencePropertyHandler extends AbstractSysmlModelExplorerCreateCo
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java
index 1b7017e3847..a9962c01806 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Requirement creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class RequirementHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class RequirementHandler extends AbstractSysmlModelExplorerCreateCommandH
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.REQUIREMENT;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java
index 69f926ed9fa..76c7ef78574 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Satisfy creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class SatisfyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class SatisfyHandler extends AbstractSysmlModelExplorerCreateCommandHandl
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.SATISFY;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java
index 652272142b0..5c3204f349b 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Unit creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class UnitHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class UnitHandler extends AbstractSysmlModelExplorerCreateCommandHandler
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.UNIT;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValuePropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValuePropertyHandler.java
index 40ac386bfb4..c4b10a996d9 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValuePropertyHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValuePropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,9 +27,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Value (Property) creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ValuePropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -39,11 +39,12 @@ public class ValuePropertyHandler extends AbstractSysmlModelExplorerCreateComman
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VALUE_PROPERTY;
 	}
@@ -54,7 +55,7 @@ public class ValuePropertyHandler extends AbstractSysmlModelExplorerCreateComman
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -62,12 +63,12 @@ public class ValuePropertyHandler extends AbstractSysmlModelExplorerCreateComman
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -76,7 +77,7 @@ public class ValuePropertyHandler extends AbstractSysmlModelExplorerCreateComman
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java
index a74b6fb24d3..38deecf7760 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ValueType creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ValueTypeHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ValueTypeHandler extends AbstractSysmlModelExplorerCreateCommandHan
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VALUE_TYPE;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java
index 1d14ad5bd0a..dc8ea1bb09d 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ValueType_Enumeration creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ValueType_EnumerationHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ValueType_EnumerationHandler extends AbstractSysmlModelExplorerCrea
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VALUE_TYPE_ENUMERATION;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java
index 57332ef81da..06e1ffad66d 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ValueType_PrimitiveType creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ValueType_PrimitiveTypeHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ValueType_PrimitiveTypeHandler extends AbstractSysmlModelExplorerCr
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VALUE_TYPE_PRIMITIVE_TYPE;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java
index ee636315ba4..f2c5e480920 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Verify creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class VerifyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class VerifyHandler extends AbstractSysmlModelExplorerCreateCommandHandle
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VERIFY;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java
index 627268b84a1..ca20c65f936 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for View creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ViewHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ViewHandler extends AbstractSysmlModelExplorerCreateCommandHandler
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VIEW;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java
index 5209f723d3b..e36b84d7632 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ViewPoint creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ViewPointHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ViewPointHandler extends AbstractSysmlModelExplorerCreateCommandHan
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VIEW_POINT;
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/Activator.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/Activator.java
index fed66390e27..5e9a146f202 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/Activator.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -47,7 +47,7 @@ public class Activator extends Plugin {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getDefault() {
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/AbstractSysmlModelExplorerCreateCommandHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/AbstractSysmlModelExplorerCreateCommandHandler.java
index 0c94e02f38c..16552a57810 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/AbstractSysmlModelExplorerCreateCommandHandler.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/AbstractSysmlModelExplorerCreateCommandHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,11 +23,12 @@ import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;
 public abstract class AbstractSysmlModelExplorerCreateCommandHandler extends AbstractSysmlCreateCommandHandler {
 
 	/**
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCommandHandler#getCommandContext()
-	 * 
+	 *
 	 * @return
 	 */
+	@Override
 	protected ICommandContext getCommandContext() {
 		return ModelExplorerUtils.getSelectionCommandContext();
 	}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java
index f6683fc4eaa..39e1a4013a8 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,18 +13,14 @@
 package org.eclipse.papyrus.sysml.modelexplorer.query;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;
 import org.eclipse.papyrus.emf.facet.custom.ui.ImageUtils;
-import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.ImageWrapper;
 import org.eclipse.papyrus.emf.facet.custom.ui.internal.query.ImageQuery;
 import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
 import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
 import org.eclipse.papyrus.uml.tools.utils.ElementUtil;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Stereotype;
 
@@ -37,12 +33,12 @@ public class GetImageQuery implements IJavaQuery2<Element, IImage> {
 	@Override
 	public IImage evaluate(Element source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
 		String iconPath = "";
-		if(!source.getAppliedStereotypes().isEmpty()) {
+		if (!source.getAppliedStereotypes().isEmpty()) {
 			Stereotype first_stereotype = source.getAppliedStereotypes().get(0);
 
-			if(!first_stereotype.getIcons().isEmpty()) {
+			if (!first_stereotype.getIcons().isEmpty()) {
 				org.eclipse.uml2.uml.Image icon = ElementUtil.getStereotypeImage(source, first_stereotype, "icon");
-				if(icon != null) {
+				if (icon != null) {
 					iconPath = icon.getLocation();
 				}
 			}
@@ -50,15 +46,15 @@ public class GetImageQuery implements IJavaQuery2<Element, IImage> {
 
 		String imagePath = "";
 
-		if(iconPath != null && !"".equals(iconPath)) {
+		if (iconPath != null && !"".equals(iconPath)) {
 			URI iconURI = URI.createURI(iconPath);
-			if(iconURI.isRelative()) {
+			if (iconURI.isRelative()) {
 				imagePath = sysml_plugin_path + iconPath;
 			} else {
 				imagePath = iconURI.toString();
 			}
 		}
-		if("".equals(imagePath)){
+		if ("".equals(imagePath)) {
 			return ImageQuery.getEObjectImage(source);
 		}
 		return ImageUtils.wrap(imagePath);
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetLabelQuery.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetLabelQuery.java
index 8c0ed095de9..20295188017 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetLabelQuery.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetLabelQuery.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,13 +28,13 @@ public class GetLabelQuery implements IJavaQuery2<NamedElement, String> {
 
 	@Override
 	public String evaluate(NamedElement source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-		ParameterValue parameterValue= (ParameterValue)parameterValues.getParameterValueByName("eObject");
-		if(parameterValue.getValue() instanceof EStructuralFeature){
-			return ((EStructuralFeature)parameterValue.getValue()).getName();
+		ParameterValue parameterValue = parameterValues.getParameterValueByName("eObject");
+		if (parameterValue.getValue() instanceof EStructuralFeature) {
+			return ((EStructuralFeature) parameterValue.getValue()).getName();
 		}
-		
+
 		String label = UNNAMED;
-		if(source.isSetName() && (!"".equals(source.getName().trim()))) {
+		if (source.isSetName() && (!"".equals(source.getName().trim()))) {
 			label = source.getName();
 		}
 		return label;
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/HasImageQuery.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/HasImageQuery.java
index 410008d4475..7c07417ea63 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/HasImageQuery.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/HasImageQuery.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,11 +24,11 @@ public class HasImageQuery implements IJavaQuery2<Element, Boolean> {
 
 	@Override
 	public Boolean evaluate(Element source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-//		IJavaQuery2<Element, String> ImgageGetter = new GetImageQuery();
-//		String temp_img_path = ImgageGetter.evaluate(source, parameterValues,facetManager);
-//		if(!"".equals(temp_img_path)) {
-//			return true;
-//		}
+		// IJavaQuery2<Element, String> ImgageGetter = new GetImageQuery();
+		// String temp_img_path = ImgageGetter.evaluate(source, parameterValues,facetManager);
+		// if(!"".equals(temp_img_path)) {
+		// return true;
+		// }
 
 		return false;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java
index 5138a0ef4e7..6eee56a9011 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,8 +27,9 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	public static LogHelper log;

+

 	/**

 	 * The constructor

 	 */

@@ -37,6 +38,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

 	@Override

@@ -48,6 +50,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

 	@Override

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java
index e9117687ad2..67de9234ef3 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,9 +21,9 @@ import org.eclipse.papyrus.sysml.nattable.menu.handlers.AllocateHandler;
 

 /**

  * This handler allows to create an Allocate object, only if the table is a PapyrusSysMLAllocationTable

- * 

+ *

  * @author vl222926

- * 

+ *

  */

 public class CreateAllocateHandler extends AllocateHandler {

 

@@ -33,9 +33,9 @@ public class CreateAllocateHandler extends AllocateHandler {
 	public static final String TABLE_ALLOCATION_TYPE = "PapyrusSysMLAllocationTable"; //$NON-NLS-1$

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.nattable.menu.handlers.AbstractSysmlNattableCreateCommandHandler#setEnabled(java.lang.Object)

-	 * 

+	 *

 	 * @param evaluationContext

 	 */

 	@Override

@@ -44,7 +44,7 @@ public class CreateAllocateHandler extends AllocateHandler {
 		boolean isEnabled = command.canExecute();

 		INattableModelManager tableManager = INattableModelManagerUtils.getTableManagerFromWorkbenchPart(getActiveWorkbenchPart());

 		isEnabled = isEnabled && tableManager.getTable().getTableConfiguration().getType().equals(TABLE_ALLOCATION_TYPE);

-		if(isEnabled) {

+		if (isEnabled) {

 			IElementType newElementType = getElementTypeToCreate();

 			String id = newElementType.getId();

 			isEnabled = tableManager.canCreateRowElement(id);

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java
index 69b8c6d62f4..f2c3071a370 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -25,8 +25,8 @@ public class AllocationPropertyTester extends NattableWidgetPropertyTester {
 	@Override

 	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

 		final INattableModelManager manager = getNattableModelManager();

-		if(manager != null) {

-			if(IS_ALLOCATION_TABLE.equals(property) && expectedValue instanceof Boolean) {

+		if (manager != null) {

+			if (IS_ALLOCATION_TABLE.equals(property) && expectedValue instanceof Boolean) {

 				return expectedValue.equals(manager.getTable().getTableConfiguration().getType().equals(CreateAllocateHandler.TABLE_ALLOCATION_TYPE));

 			}

 		}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java
index fe263b8a146..b2383e36a65 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,20 +26,21 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 public class TableAllocationCreationTester implements ITableTester {

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.infra.nattable.tester.ITableTester#isAllowed(java.lang.Object)

-	 * 

+	 *

 	 * @param context

 	 * @return

 	 */

+	@Override

 	public IStatus isAllowed(Object context) {

-		if(context instanceof Element) {

-			Element el = (Element)context;

+		if (context instanceof Element) {

+			Element el = (Element) context;

 			boolean result = context instanceof Package;

-			if(result) {

+			if (result) {

 				final String packageQN = UMLUtil.getProfile(AllocationsPackage.eINSTANCE, el).getQualifiedName();

 				result = result && el.getNearestPackage().getAppliedProfile(packageQN, true) != null;

-				if(result) {

+				if (result) {

 					return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.TableAllocationCreationTester_OKMessage);

 				} else {

 					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format(Messages.TableAllocationCreationTester_ProfileNotApplied, packageQN));

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java
index e7ff72a44a8..385b1c71246 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java
@@ -13,7 +13,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

@@ -22,8 +22,10 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		plugin = this;

@@ -31,8 +33,10 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		super.stop(context);

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java
index 6811853d0b3..0641ba719ec 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,9 +27,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ActorPart (Property) creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ActorPartPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -39,11 +39,12 @@ public class ActorPartPropertyHandler extends AbstractSysmlNattableCreateCommand
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ACTOR_PART_PROPERTY;
 	}
@@ -54,7 +55,7 @@ public class ActorPartPropertyHandler extends AbstractSysmlNattableCreateCommand
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -62,12 +63,12 @@ public class ActorPartPropertyHandler extends AbstractSysmlNattableCreateCommand
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -76,7 +77,7 @@ public class ActorPartPropertyHandler extends AbstractSysmlNattableCreateCommand
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java
index cd6c240b30d..66352a171b7 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Allocate creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AllocateHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AllocateHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ALLOCATE;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java
index 7351afe4c4a..6414fd9aa68 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationCompositeDirected creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationCompositeDirectedHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationCompositeDirectedHandler extends AbstractSysmlNattableCr
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java
index 5decd16389a..da10a2d58b3 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationComposite creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationCompositeHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationCompositeHandler extends AbstractSysmlNattableCreateComm
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_COMPOSITE;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java
index c1f7afececf..8a883a790b9 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Association creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationHandler extends AbstractSysmlNattableCreateCommandHandle
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java
index ebc0b910a9d..52b6ad251f5 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationNoneDirected creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationNoneDirectedHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationNoneDirectedHandler extends AbstractSysmlNattableCreateC
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_NONE_DIRECTED;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java
index 638c915fe26..8b3ab32b05f 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationNone creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationNoneHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationNoneHandler extends AbstractSysmlNattableCreateCommandHa
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_NONE;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java
index e0165df25fc..56c1262441c 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationSharedDirected creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationSharedDirectedHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationSharedDirectedHandler extends AbstractSysmlNattableCreat
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java
index 99eb5a8c074..a77f10c6702 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for AssociationShared creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class AssociationSharedHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class AssociationSharedHandler extends AbstractSysmlNattableCreateCommand
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ASSOCIATION_SHARED;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java
index 73f90304e76..165a02852c0 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Block creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class BlockHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class BlockHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.BLOCK;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java
index 6cf23d19dec..e238c7919bb 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Conform creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ConformHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ConformHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.CONFORM;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java
index 49675d0492a..d1d88607dcf 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ConstraintBlock creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ConstraintBlockHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ConstraintBlockHandler extends AbstractSysmlNattableCreateCommandHa
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.CONSTRAINT_BLOCK;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java
index 8c8a0b47d13..8018395d1af 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -31,9 +31,9 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * <pre>
  * Command handler for Problem creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ConstraintBlockParameterHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -43,11 +43,12 @@ public class ConstraintBlockParameterHandler extends AbstractSysmlNattableCreate
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PROPERTY;
 	}
@@ -58,7 +59,7 @@ public class ConstraintBlockParameterHandler extends AbstractSysmlNattableCreate
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -66,23 +67,23 @@ public class ConstraintBlockParameterHandler extends AbstractSysmlNattableCreate
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
 		}
 
-		String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", ((Element)container).eContents()); //$NON-NLS-1$
+		String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", ((Element) container).eContents()); //$NON-NLS-1$
 		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), name));
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java
index 3164d6ae3be..ab0258fe53b 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ConstraintProperty creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ConstraintPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ConstraintPropertyHandler extends AbstractSysmlNattableCreateComman
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.CONSTRAINT_PROPERTY;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java
index 343496d20db..19807d0541c 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Copy creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class CopyHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class CopyHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.COPY;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java
index 9fc7ec1aaed..edc363acb75 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for DeriveReqt creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class DeriveReqtHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class DeriveReqtHandler extends AbstractSysmlNattableCreateCommandHandler
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.DERIVE_REQT;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java
index 013a01ffecd..aec6229ab66 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Dimension creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class DimensionHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class DimensionHandler extends AbstractSysmlNattableCreateCommandHandler
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.DIMENSION;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java
index 27cba566b1a..78e0c62ed24 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowPort creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPortHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPortHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PORT;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java
index da01f4d17ea..8ecc601e434 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowPort_In creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPort_InHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPort_InHandler extends AbstractSysmlNattableCreateCommandHandle
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PORT_IN;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java
index 16a7e75db13..a0bf99550d8 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowPort_InOut creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPort_InOutHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPort_InOutHandler extends AbstractSysmlNattableCreateCommandHan
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PORT_IN_OUT;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java
index 8706e61f5f4..c81ec2579bd 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,9 +25,9 @@ import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowS
 /**
  * <pre>
  * Command handler for FlowPort non atomic creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPort_NAHandler extends FlowPortHandler {
@@ -38,7 +38,7 @@ public class FlowPort_NAHandler extends FlowPortHandler {
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -46,12 +46,12 @@ public class FlowPort_NAHandler extends FlowPortHandler {
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -60,7 +60,7 @@ public class FlowPort_NAHandler extends FlowPortHandler {
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java
index a6da5639599..8cfd1073249 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowPort_Out creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPort_OutHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPort_OutHandler extends AbstractSysmlNattableCreateCommandHandl
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PORT_OUT;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java
index 3aecc84d251..5ca9d0d7168 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowProperty creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowPropertyHandler extends AbstractSysmlNattableCreateCommandHandl
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_PROPERTY;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java
index 150eafeba16..3e24b3a23e0 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for FlowSpecification creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class FlowSpecificationHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class FlowSpecificationHandler extends AbstractSysmlNattableCreateCommand
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.FLOW_SPECIFICATION;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java
index 9ef7134d78e..2d5e7afdfa7 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ItemFlow creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ItemFlowHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ItemFlowHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.ITEM_FLOW;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java
index 257a24cc2a6..d67c5c8b254 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,9 +27,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Part (Property) creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class PartPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -39,11 +39,12 @@ public class PartPropertyHandler extends AbstractSysmlNattableCreateCommandHandl
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.PART_PROPERTY;
 	}
@@ -54,7 +55,7 @@ public class PartPropertyHandler extends AbstractSysmlNattableCreateCommandHandl
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -62,12 +63,12 @@ public class PartPropertyHandler extends AbstractSysmlNattableCreateCommandHandl
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -76,7 +77,7 @@ public class PartPropertyHandler extends AbstractSysmlNattableCreateCommandHandl
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java
index 2503eaab89a..6647300603f 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Problem creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ProblemHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ProblemHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.PROBLEM;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java
index 3c0347349d3..b142bc10f42 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Rationale creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class RationaleHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class RationaleHandler extends AbstractSysmlNattableCreateCommandHandler
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.RATIONALE;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java
index 1e36d9c7a5a..524aa2ae811 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,9 +27,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Reference (Property) creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ReferencePropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -39,11 +39,12 @@ public class ReferencePropertyHandler extends AbstractSysmlNattableCreateCommand
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.REFERENCE_PROPERTY;
 	}
@@ -54,7 +55,7 @@ public class ReferencePropertyHandler extends AbstractSysmlNattableCreateCommand
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -62,12 +63,12 @@ public class ReferencePropertyHandler extends AbstractSysmlNattableCreateCommand
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -76,7 +77,7 @@ public class ReferencePropertyHandler extends AbstractSysmlNattableCreateCommand
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java
index bcc62ea4b78..a9cbb9cf042 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Requirement creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class RequirementHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class RequirementHandler extends AbstractSysmlNattableCreateCommandHandle
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.REQUIREMENT;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java
index 3890db13e8d..4f1b7ec4be5 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Satisfy creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class SatisfyHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class SatisfyHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.SATISFY;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java
index 1ce7e203e44..7520a997c53 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Unit creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class UnitHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class UnitHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.UNIT;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java
index 9cda6ae7c05..b5d71023028 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,9 +27,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Value (Property) creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ValuePropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -39,11 +39,12 @@ public class ValuePropertyHandler extends AbstractSysmlNattableCreateCommandHand
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VALUE_PROPERTY;
 	}
@@ -54,7 +55,7 @@ public class ValuePropertyHandler extends AbstractSysmlNattableCreateCommandHand
 	@Override
 	protected Command buildCommand() {
 
-		if(getCommandContext() == null) {
+		if (getCommandContext() == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
@@ -62,12 +63,12 @@ public class ValuePropertyHandler extends AbstractSysmlNattableCreateCommandHand
 		EReference reference = getCommandContext().getReference();
 
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
+		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		CreateElementRequest createRequest = null;
-		if(reference == null) {
+		if (reference == null) {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
 		} else {
 			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
@@ -76,7 +77,7 @@ public class ValuePropertyHandler extends AbstractSysmlNattableCreateCommandHand
 
 		// Retrieve create command from the Element Edit service
 		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if(createGMFCommand != null) {
+		if (createGMFCommand != null) {
 			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
 			return emfCommand;
 		}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java
index 26146d4455d..d2d31564fd8 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ValueType creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ValueTypeHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ValueTypeHandler extends AbstractSysmlNattableCreateCommandHandler
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VALUE_TYPE;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java
index e3be61c44bc..916d5fb3654 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ValueType_Enumeration creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ValueType_EnumerationHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ValueType_EnumerationHandler extends AbstractSysmlNattableCreateCom
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VALUE_TYPE_ENUMERATION;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java
index 606489e01c8..542a6ee204a 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ValueType_PrimitiveType creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ValueType_PrimitiveTypeHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ValueType_PrimitiveTypeHandler extends AbstractSysmlNattableCreateC
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VALUE_TYPE_PRIMITIVE_TYPE;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java
index 4f4db61a51a..c762b83fbfc 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for Verify creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class VerifyHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class VerifyHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VERIFY;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java
index ccbd234f146..bcd5db4e814 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for View creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ViewHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ViewHandler extends AbstractSysmlNattableCreateCommandHandler {
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VIEW;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java
index 3a5011639ba..b33a743b911 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 /**
  * <pre>
  * Command handler for ViewPoint creation
- * 
+ *
  * </pre>
- * 
+ *
  * @generated
  */
 public class ViewPointHandler extends AbstractSysmlNattableCreateCommandHandler {
@@ -29,11 +29,12 @@ public class ViewPointHandler extends AbstractSysmlNattableCreateCommandHandler
 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
 	 * 
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
+	 *
 	 * @generated
 	 */
+	@Override
 	protected IElementType getElementTypeToCreate() {
 		return SysMLElementTypes.VIEW_POINT;
 	}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java
index e6bcdeb5749..f9535dce376 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

- * 

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,7 +27,7 @@ public class Activator extends AbstractUIPlugin {
 	private static Activator plugin;

 

 	public static LogHelper log;

-	

+

 	/**

 	 * The constructor

 	 */

@@ -36,8 +36,10 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		plugin = this;

@@ -46,8 +48,10 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		super.stop(context);

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java
index 91c1d35ce7e..90b9eebc066 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

- * 

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,21 +21,22 @@ import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;
 

 /**

  * Abstract handler for the creation commands of Sysml elements in the Nattable editor

- * 

+ *

  */

 public abstract class AbstractSysmlNattableCreateCommandHandler extends AbstractSysmlCreateCommandHandler {

 

 	/**

 	 * <pre>

-	 * 

+	 *

 	 * Build the create command for an element creation in the selected container.

-	 * The create command is given by the {@link IElementEditService} of selected 

+	 * The create command is given by the {@link IElementEditService} of selected

 	 * element.

 	 * 

 	 * @return the composite creation command for current selection

-	 * 

+	 *

 	 * </pre>

 	 */

+	@Override

 	protected Command buildCommand() {

 		Command createCmd = super.buildCommand();

 		return TableMenuUtils.buildNattableCreationCommand(createCmd, this.createRequest);

@@ -43,11 +44,12 @@ public abstract class AbstractSysmlNattableCreateCommandHandler extends Abstract
 

 	/**

 	 * Obtain the context of the active table editor.

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCommandHandler#getCommandContext()

-	 * 

+	 *

 	 * @return

 	 */

+	@Override

 	protected ICommandContext getCommandContext() {

 		return TableMenuUtils.getTableCommandContext(INattableModelManagerUtils.getTableManagerFromWorkbenchPart(getActiveWorkbenchPart()));

 

@@ -55,16 +57,17 @@ public abstract class AbstractSysmlNattableCreateCommandHandler extends Abstract
 

 	/**

 	 * Verify if this handler is currently active and the command can execute. Additionally, verify if this table can add this type of element.

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#setEnabled(java.lang.Object)

-	 * 

+	 *

 	 * @param evaluationContext

 	 */

+	@Override

 	public void setEnabled(Object evaluationContext) {

 		INattableModelManager tableManager = INattableModelManagerUtils.getTableManagerFromWorkbenchPart(getActiveWorkbenchPart());

 		boolean isEnabled = tableManager.canCreateRowElement(getElementTypeToCreate().getId());

-		if(isEnabled) {

-			//we test the enable of the super implementation

+		if (isEnabled) {

+			// we test the enable of the super implementation

 			super.setEnabled(evaluationContext);

 			isEnabled = super.isEnabled();

 		}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java
index 47b2c66344c..824b86527b7 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

- * 

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -28,7 +28,7 @@ public class SysmlNattableCreateMenu extends AbstractCreateSysmlChildMenu {
 	@Override

 	public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {

 		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();

-		if(tester.test(part, NattableWidgetPropertyTester.IS_NATTABLE_WIDGET, null, Boolean.TRUE)) {

+		if (tester.test(part, NattableWidgetPropertyTester.IS_NATTABLE_WIDGET, null, Boolean.TRUE)) {

 			super.createContributionItems(serviceLocator, additions);

 		}

 	}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java
index 57be7a1d493..e559b6abf9b 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java
@@ -13,7 +13,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

@@ -22,8 +22,10 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		plugin = this;

@@ -31,8 +33,10 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		super.stop(context);

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java
index 7ae7fa32a92..dca1839203c 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,29 +26,30 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 

 /**

  * The tester used to know if we can create requirement table

- * 

+ *

  * @author Vincent Lorenzo

- * 

+ *

  */

 public class RequirementTableTester implements ITableTester {

 

 	private static final IElementMatcher matcher = new RequirementMatcher();

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.infra.nattable.tester.ITableTester#isAllowed(java.lang.Object)

-	 * 

+	 *

 	 * @param context

 	 * @return

 	 */

+	@Override

 	public IStatus isAllowed(Object context) {

-		if(context instanceof Element) {

-			Element el = (Element)context;

+		if (context instanceof Element) {

+			Element el = (Element) context;

 			boolean result = context instanceof Package || matcher.matches(el);

-			if(result) {

+			if (result) {

 				final String packageQN = UMLUtil.getProfile(RequirementsPackage.eINSTANCE, el).getQualifiedName();

 				result = result && el.getNearestPackage().getAppliedProfile(packageQN, true) != null;

-				if(result) {

+				if (result) {

 					return new Status(IStatus.OK, Activator.PLUGIN_ID, "The context allowed to create a Requirement Table");

 				} else {

 					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("The profile {0} is not applied on the model", packageQN));

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java
index 6b7c089656a..0be7f2694af 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -57,7 +57,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/Activator.java
index f89d457eb0d..7c81ac19f6c 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/Activator.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/Activator.java
@@ -28,6 +28,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		log = new LogHelper(this);

@@ -39,6 +40,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		super.stop(context);

@@ -46,7 +48,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java
index 6a356d73fd3..81e4e10f12d 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -24,29 +24,29 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 

 /**

  * Axis Manager for Allocate

- * 

+ *

  * @author vl222926

- * 

+ *

  */

 public class AllocateAxisManager extends AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager<Allocate> {

 

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)

-	 * 

+	 *

 	 * @param elementId

 	 * @return

 	 */

 	@Override

 	public boolean canCreateAxisElement(final String elementId) {

-		return ((ISpecializationType)SysMLElementTypes.ALLOCATE).getId().equals(elementId);

+		return ((ISpecializationType) SysMLElementTypes.ALLOCATE).getId().equals(elementId);

 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isInstanceOfRequiredStereotypeApplication(java.lang.Object)

-	 * 

+	 *

 	 * @param object

 	 * @return

 	 */

@@ -57,9 +57,9 @@ public class AllocateAxisManager extends AbstractStereotypedElementUMLSynchroniz
 

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplication(org.eclipse.uml2.uml.Element)

-	 * 

+	 *

 	 * @param el

 	 * @return

 	 */

@@ -69,9 +69,9 @@ public class AllocateAxisManager extends AbstractStereotypedElementUMLSynchroniz
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeBaseElement(org.eclipse.emf.ecore.EObject)

-	 * 

+	 *

 	 * @param stereotypeApplication

 	 * @return

 	 */

@@ -82,9 +82,9 @@ public class AllocateAxisManager extends AbstractStereotypedElementUMLSynchroniz
 

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplicationBasePropertyName()

-	 * 

+	 *

 	 * @return

 	 */

 	@Override

@@ -93,9 +93,9 @@ public class AllocateAxisManager extends AbstractStereotypedElementUMLSynchroniz
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isAllowedAsBaseElement(org.eclipse.uml2.uml.Element)

-	 * 

+	 *

 	 * @param element

 	 * @return

 	 */

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java
index 881e2a7e88a..937bfd4f960 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,29 +26,29 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 

 /**

  * AxisManager for SysML Requirements

- * 

+ *

  * @author Vincent Lorenzo

- * 

+ *

  */

 public class RequirementAxisManager extends AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager<Requirement> {

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)

-	 * 

+	 *

 	 * @param elementId

 	 * @return

 	 */

 	@Override

 	public boolean canCreateAxisElement(String elementId) {

-		return ((ISpecializationType)SysMLElementTypes.REQUIREMENT).getId().equals(elementId);

+		return ((ISpecializationType) SysMLElementTypes.REQUIREMENT).getId().equals(elementId);

 	}

 

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplication(org.eclipse.uml2.uml.Element)

-	 * 

+	 *

 	 * @param el

 	 * @return

 	 */

@@ -58,9 +58,9 @@ public class RequirementAxisManager extends AbstractStereotypedElementUMLSynchro
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isInstanceOfRequiredStereotypeApplication(java.lang.Object)

-	 * 

+	 *

 	 * @param object

 	 * @return

 	 */

@@ -70,9 +70,9 @@ public class RequirementAxisManager extends AbstractStereotypedElementUMLSynchro
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeBaseElement(org.eclipse.emf.ecore.EObject)

-	 * 

+	 *

 	 * @param stereotypeApplication

 	 * @return

 	 */

@@ -82,9 +82,9 @@ public class RequirementAxisManager extends AbstractStereotypedElementUMLSynchro
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isAllowedAsBaseElement(org.eclipse.uml2.uml.Element)

-	 * 

+	 *

 	 * @param element

 	 * @return

 	 */

@@ -95,9 +95,9 @@ public class RequirementAxisManager extends AbstractStereotypedElementUMLSynchro
 

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplicationBasePropertyName()

-	 * 

+	 *

 	 * @return

 	 */

 	@Override

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java
index 7fdbf1f20be..7bb59c32d35 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java
@@ -22,10 +22,10 @@ import org.eclipse.papyrus.uml.nattable.utils.Constants;
 import org.eclipse.uml2.uml.Port;

 

 /**

- * 

+ *

  * This cell manager manages the cell displaying the direction of the FlowPort.

  * If the flowport is not atomic, the cell is not editable and the direction is N/A.

- * 

+ *

  */

 public class SysMLStereotypePropertyCellManager extends StereotypePropertyCellManager {

 

@@ -36,21 +36,21 @@ public class SysMLStereotypePropertyCellManager extends StereotypePropertyCellMa
 

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.cell.manager.StereotypePropertyCellManager#handles(java.lang.Object, java.lang.Object)

-	 * 

+	 *

 	 * @param columnElement

 	 * @param rowElement

 	 * @return

 	 */

 	@Override

 	public boolean handles(final Object columnElement, final Object rowElement) {

-		if(super.handles(columnElement, rowElement)) {

+		if (super.handles(columnElement, rowElement)) {

 			final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement, null);

-			if(objects.size() == 2) {

-				final EObject object = (EObject)objects.get(0);

-				if(object instanceof Port) {

-					String propertyQualifiedName = (String)objects.get(1);

+			if (objects.size() == 2) {

+				final EObject object = (EObject) objects.get(0);

+				if (object instanceof Port) {

+					String propertyQualifiedName = (String) objects.get(1);

 					propertyQualifiedName = propertyQualifiedName.substring(Constants.PROPERTY_OF_STEREOTYPE_PREFIX.length(), propertyQualifiedName.length());

 					return propertyQualifiedName.equals(org.eclipse.papyrus.sysml.nattable.utils.Constants.STEREOTYPE_FLOWPORT_DIRECTION);

 				}

@@ -61,9 +61,9 @@ public class SysMLStereotypePropertyCellManager extends StereotypePropertyCellMa
 

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.uml.nattable.manager.cell.manager.StereotypePropertyCellManager#isCellEditable(java.lang.Object, java.lang.Object)

-	 * 

+	 *

 	 * @param columnElement

 	 * @param rowElement

 	 * @return

@@ -71,11 +71,11 @@ public class SysMLStereotypePropertyCellManager extends StereotypePropertyCellMa
 	@Override

 	public boolean isCellEditable(final Object columnElement, final Object rowElement) {

 		boolean value = super.isCellEditable(columnElement, rowElement);

-		if(value) {

+		if (value) {

 			final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement, null);

-			if(objects.size() == 2) {

-				final EObject object = (EObject)objects.get(0);

-				if(matcher.matches(object)) {

+			if (objects.size() == 2) {

+				final EObject object = (EObject) objects.get(0);

+				if (matcher.matches(object)) {

 					value = false;

 				}

 			}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
index 1ab8c233723..dd08ded4134 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -24,9 +24,9 @@ import org.eclipse.uml2.uml.Port;
 

 /**

  * This label provider allows to display N/A for the direction of the FlowPort when its requred!

- * 

+ *

  * @author Vincent Lorenzo

- * 

+ *

  */

 public class SysMLFlowPortDirectionLabelProvider extends AbstractUMLNattableCellLabelProvider {

 

@@ -36,24 +36,24 @@ public class SysMLFlowPortDirectionLabelProvider extends AbstractUMLNattableCell
 	private static final FlowPortNAMatcher matcher = new FlowPortNAMatcher();

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.infra.nattable.provider.GenericCellLabelProvider#accept(java.lang.Object)

-	 * 

+	 *

 	 * @param element

 	 * @return

 	 */

 	@Override

 	public boolean accept(final Object element) {

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			final ILayerCell cell = ((LabelProviderCellContextElementWrapper)element);

-			final IConfigRegistry registry = ((LabelProviderCellContextElementWrapper)element).getConfigRegistry();

+		if (element instanceof LabelProviderCellContextElementWrapper) {

+			final ILayerCell cell = ((LabelProviderCellContextElementWrapper) element);

+			final IConfigRegistry registry = ((LabelProviderCellContextElementWrapper) element).getConfigRegistry();

 			final Object columnObject = getColumnObject(cell, registry);

 			String str = AxisUtils.getPropertyId(columnObject);

-			if(str == null) {

+			if (str == null) {

 				final Object rowObject = getRowObject(cell, registry);

 				str = AxisUtils.getPropertyId(rowObject);

 			}

-			if(str != null) {

+			if (str != null) {

 				return str.endsWith(org.eclipse.papyrus.sysml.nattable.utils.Constants.STEREOTYPE_FLOWPORT_DIRECTION);

 			}

 		}

@@ -62,17 +62,17 @@ public class SysMLFlowPortDirectionLabelProvider extends AbstractUMLNattableCell
 

 	@Override

 	public String getText(Object element) {

-		final ILayerCell cell = ((LabelProviderCellContextElementWrapper)element);

-		final IConfigRegistry configRegistry = ((LabelProviderCellContextElementWrapper)element).getConfigRegistry();

+		final ILayerCell cell = ((LabelProviderCellContextElementWrapper) element);

+		final IConfigRegistry configRegistry = ((LabelProviderCellContextElementWrapper) element).getConfigRegistry();

 		final Object rowObject = getRowObject(cell, configRegistry);

 		final Object columObject = getColumnObject(cell, configRegistry);

 		Port port = null;

-		if(rowObject instanceof Port) {

-			port = (Port)rowObject;

-		} else if(columObject instanceof Port) {

-			port = (Port)columObject;

+		if (rowObject instanceof Port) {

+			port = (Port) rowObject;

+		} else if (columObject instanceof Port) {

+			port = (Port) columObject;

 		}

-		if(port != null && matcher.matches(port)) {

+		if (port != null && matcher.matches(port)) {

 			return Constants.NOT_AVALAIBLE;

 		}

 		return super.getText(element);

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java
index a9c51896525..dbe83d90d9d 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -17,7 +17,7 @@ package org.eclipse.papyrus.sysml.nattable.utils;
 public class Constants {

 

 	private Constants() {

-		//to prevent instanciation

+		// to prevent instanciation

 	}

 

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IComposableAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IComposableAdapterFactory.java
index a0321c63f3b..2d26dfc1a9c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IComposableAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IComposableAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 Atos.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -16,23 +16,23 @@ package org.eclipse.papyrus.sysml.edit.provider;
 /**

  * The purpose of this interface is to create composable adapterFactory but in a

  * way much simpler than EMF does.

- * 

+ *

  * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net

  *         ">arthur.daussy@atos.net</a>"

- * 

+ *

  */

 public interface IComposableAdapterFactory {

 

 	/**

 	 * Return the root of the adapter factory

-	 * 

+	 *

 	 * @return {@link AdapterFactory}

 	 */

 	public IRootAdapterFactory getIRootAdapterFactory();

 

 	/**

 	 * Set the root AdapterFactory

-	 * 

+	 *

 	 * @param root

 	 */

 	public void setRootAdapterFactory(IRootAdapterFactory root);

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IRootAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IRootAdapterFactory.java
index 59f9b2272b0..06663c15a02 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IRootAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IRootAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 Atos.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ public interface IRootAdapterFactory {
 	/**

 	 * Give back the itemProvider which correspond to the given EClass In this

 	 * prog : used to get back the UML ItemProvider of the EClass

-	 * 

+	 *

 	 * @param eClass

 	 * @return

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IVisibilityOverlayImage.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IVisibilityOverlayImage.java
index 2e55a3c587d..5dbb64dfac3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IVisibilityOverlayImage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IVisibilityOverlayImage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 Atos.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -17,10 +17,10 @@ import org.eclipse.emf.edit.provider.ComposedImage;
 /**

  * Interface that allow an ItemProvider to compose an overlay that handle

  * visibility logo

- * 

+ *

  * @author Arthur Daussy <a

  *         href=mailto:arthur.daussy@atos.net>arthur.daussy@atos.net</a>

- * 

+ *

  */

 public interface IVisibilityOverlayImage {

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/SysMLItemProviderAdapter.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/SysMLItemProviderAdapter.java
index 6f4b7342cf8..9f7876c3d9c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/SysMLItemProviderAdapter.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/SysMLItemProviderAdapter.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 Atos Origin.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -22,10 +22,10 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
 /**

  * Extends org.eclipse.emf.edit.provider.ItemProviderAdapter in order to

  * implement specific SysML itemProvider fonctions

- * 

+ *

  * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net

  *         ">arthur.daussy@atos.net</a>"

- * 

+ *

  */

 public class SysMLItemProviderAdapter extends ItemProviderAdapter implements IVisibilityOverlayImage {

 

@@ -36,16 +36,17 @@ public class SysMLItemProviderAdapter extends ItemProviderAdapter implements IVi
 	/**

 	 * Compose the image with specific visibility logo Copied from UML

 	 * implementation

-	 * 

+	 *

 	 * @param object

 	 * @param composedImage

 	 * @return {@link ComposedImage}

 	 */

+	@Override

 	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement)object;

-		if(namedElement.isSetVisibility()) {

+		NamedElement namedElement = (NamedElement) object;

+		if (namedElement.isSetVisibility()) {

 			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-				+ namedElement.getVisibility().getName()));

+					+ namedElement.getVisibility().getName()));

 		}

 		return composedImage;

 	}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/umllayer/SysLMOverUMLItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/umllayer/SysLMOverUMLItemProviderAdapterFactory.java
index eeeb83a039d..e425847bd39 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/umllayer/SysLMOverUMLItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/umllayer/SysLMOverUMLItemProviderAdapterFactory.java
@@ -1,14 +1,14 @@
 /**

  *  Copyright (c) 2011 Atos.

- *  

+ *

  *  All rights reserved. This program and the accompanying materials

  *  are made available under the terms of the Eclipse Public License v1.0

  *  which accompanies this distribution, and is available at

  *  http://www.eclipse.org/legal/epl-v10.html

- *  

+ *

  *  Contributors:

  *  Atos - Initial API and implementation

- * 

+ *

  */

 package org.eclipse.papyrus.sysml.edit.umllayer;

 

@@ -45,9 +45,9 @@ import org.eclipse.uml2.uml.UMLPackage;
  * new layer in order to have only one ItemProvider instead of one for each

  * EPackage. Moreover this ItemProvider will accept UML elements stereotypes by

  * SysML profile in order to display them as SysML elements

- * 

+ *

  * @author Arthur Daussy - arthur.daussy@atos.net

- * 

+ *

  */

 public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl implements IChildCreationExtender, IRootAdapterFactory, ComposeableAdapterFactory {

 

@@ -59,7 +59,7 @@ public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl i
 	/**

 	 * This helps manage the child creation extenders. <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 */

 	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(SysmlEditPlugin.INSTANCE, UMLPackage.eNS_URI);

 

@@ -71,7 +71,7 @@ public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl i
 	/**

 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

 

@@ -99,7 +99,7 @@ public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl i
 		 * Initialize model package

 		 */

 		supportedTypes.add(IItemPropertySource.class);

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = UMLPackage.eINSTANCE;

 		}

 		/**

@@ -116,22 +116,22 @@ public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl i
 	@Override

 	public Adapter adapt(Notifier target, Object type) {

 		Adapter result = null;

-		for(AdapterFactory adFac : getSysmlRegistryAdapterFactoryRegistry().getAdapterFactoriesForType((Object)target)) {

+		for (AdapterFactory adFac : getSysmlRegistryAdapterFactoryRegistry().getAdapterFactoriesForType(target)) {

 			result = adFac.adaptNew(target, type);

-			if(result != null) {

+			if (result != null) {

 				return result;

 			}

 		}

-		return (Adapter)getSysmlRegistryAdapterFactoryRegistry().getDefaultAdapterFactory().adapt(target, type);

+		return getSysmlRegistryAdapterFactoryRegistry().getDefaultAdapterFactory().adapt(target, type);

 	}

 

 	/**

 	 * Get the getSysmlRegistryAdapterFactoryRegistry

-	 * 

+	 *

 	 * @return

 	 */

 	private SysmlRegistryAdapterFactoryRegistry getSysmlRegistryAdapterFactoryRegistry() {

-		if(registery == null) {

+		if (registery == null) {

 			registery = SysmlRegistryAdapterFactoryRegistry.getSingleton();

 		}

 		return registery;

@@ -142,9 +142,9 @@ public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl i
 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

-		if(isFactoryForType(type)) {

+		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -161,16 +161,16 @@ public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl i
 

 	/**

 	 * Test if the EPackage correspond to UML

-	 * 

+	 *

 	 * @param object

 	 * @return

 	 */

 	public boolean superIsFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

-			return (((EObject)object).eClass().getEPackage() == modelPackage);

+		if (object instanceof EObject) {

+			return (((EObject) object).eClass().getEPackage() == modelPackage);

 		}

 		return false;

 	}

@@ -178,6 +178,7 @@ public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl i
 	/**

 	 * {@link IChildCreationExtender}

 	 */

+	@Override

 	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {

 		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);

 	}

@@ -185,18 +186,22 @@ public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl i
 	/**

 	 * {@link IChildCreationExtender}

 	 */

+	@Override

 	public ResourceLocator getResourceLocator() {

 		return childCreationExtenderManager;

 	}

 

+	@Override

 	public ItemProviderAdapter getItemProvider(EClass eClass) {

 		return umlItemProviderRegistery.get(eClass);

 	}

 

+	@Override

 	public ComposeableAdapterFactory getRootAdapterFactory() {

 		return this;

 	}

 

+	@Override

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

 	}

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
index eab80c140ab..33095e29941 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,7 +38,7 @@ import org.eclipse.papyrus.sysml.activities.util.ActivitiesAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc --> <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +46,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -54,7 +54,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -63,7 +63,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -71,7 +71,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivitiesItemProviderAdapterFactory() {

@@ -85,7 +85,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Optional} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected OptionalItemProvider optionalItemProvider;

@@ -93,12 +93,12 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Optional}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createOptionalAdapter() {

-		if(optionalItemProvider == null) {

+		if (optionalItemProvider == null) {

 			optionalItemProvider = new OptionalItemProvider(this);

 		}

 

@@ -108,7 +108,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Rate} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RateItemProvider rateItemProvider;

@@ -117,12 +117,12 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Rate}.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createRateAdapter() {

-		if(rateItemProvider == null) {

+		if (rateItemProvider == null) {

 			rateItemProvider = new RateItemProvider(this);

 		}

 

@@ -132,7 +132,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Probability} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ProbabilityItemProvider probabilityItemProvider;

@@ -140,12 +140,12 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Probability}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createProbabilityAdapter() {

-		if(probabilityItemProvider == null) {

+		if (probabilityItemProvider == null) {

 			probabilityItemProvider = new ProbabilityItemProvider(this);

 		}

 

@@ -155,7 +155,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Continuous} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ContinuousItemProvider continuousItemProvider;

@@ -163,12 +163,12 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Continuous}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createContinuousAdapter() {

-		if(continuousItemProvider == null) {

+		if (continuousItemProvider == null) {

 			continuousItemProvider = new ContinuousItemProvider(this);

 		}

 

@@ -178,7 +178,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Discrete} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected DiscreteItemProvider discreteItemProvider;

@@ -186,12 +186,12 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Discrete}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createDiscreteAdapter() {

-		if(discreteItemProvider == null) {

+		if (discreteItemProvider == null) {

 			discreteItemProvider = new DiscreteItemProvider(this);

 		}

 

@@ -201,7 +201,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.ControlOperator} instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ControlOperatorItemProvider controlOperatorItemProvider;

@@ -209,12 +209,12 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.ControlOperator}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createControlOperatorAdapter() {

-		if(controlOperatorItemProvider == null) {

+		if (controlOperatorItemProvider == null) {

 			controlOperatorItemProvider = new ControlOperatorItemProvider(this);

 		}

 

@@ -224,7 +224,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.NoBuffer} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected NoBufferItemProvider noBufferItemProvider;

@@ -232,12 +232,12 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.NoBuffer}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createNoBufferAdapter() {

-		if(noBufferItemProvider == null) {

+		if (noBufferItemProvider == null) {

 			noBufferItemProvider = new NoBufferItemProvider(this);

 		}

 

@@ -247,7 +247,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Overwrite} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected OverwriteItemProvider overwriteItemProvider;

@@ -255,12 +255,12 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Overwrite}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createOverwriteAdapter() {

-		if(overwriteItemProvider == null) {

+		if (overwriteItemProvider == null) {

 			overwriteItemProvider = new OverwriteItemProvider(this);

 		}

 

@@ -270,9 +270,10 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This returns the root adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public ComposeableAdapterFactory getRootAdapterFactory() {

 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

 	}

@@ -280,16 +281,17 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This sets the composed adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

 		this.parentAdapterFactory = parentAdapterFactory;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -300,7 +302,7 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -310,14 +312,14 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

-		if(isFactoryForType(type)) {

+		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -328,9 +330,10 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This adds a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void addListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.addListener(notifyChangedListener);

 	}

@@ -338,9 +341,10 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This removes a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void removeListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.removeListener(notifyChangedListener);

 	}

@@ -348,13 +352,14 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void fireNotifyChanged(Notification notification) {

 		changeNotifier.fireNotifyChanged(notification);

 

-		if(parentAdapterFactory != null) {

+		if (parentAdapterFactory != null) {

 			parentAdapterFactory.fireNotifyChanged(notification);

 		}

 	}

@@ -362,26 +367,35 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	/**

 	 * This disposes all of the item providers created by this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void dispose() {

-		if(optionalItemProvider != null)

+		if (optionalItemProvider != null) {

 			optionalItemProvider.dispose();

-		if(rateItemProvider != null)

+		}

+		if (rateItemProvider != null) {

 			rateItemProvider.dispose();

-		if(probabilityItemProvider != null)

+		}

+		if (probabilityItemProvider != null) {

 			probabilityItemProvider.dispose();

-		if(continuousItemProvider != null)

+		}

+		if (continuousItemProvider != null) {

 			continuousItemProvider.dispose();

-		if(discreteItemProvider != null)

+		}

+		if (discreteItemProvider != null) {

 			discreteItemProvider.dispose();

-		if(controlOperatorItemProvider != null)

+		}

+		if (controlOperatorItemProvider != null) {

 			controlOperatorItemProvider.dispose();

-		if(noBufferItemProvider != null)

+		}

+		if (noBufferItemProvider != null) {

 			noBufferItemProvider.dispose();

-		if(overwriteItemProvider != null)

+		}

+		if (overwriteItemProvider != null) {

 			overwriteItemProvider.dispose();

+		}

 	}

 

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java
index 13f03794bcf..cd3115ca6da 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -31,7 +31,7 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Continuous} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ContinuousItemProvider extends RateItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -42,7 +42,7 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ContinuousItemProvider(AdapterFactory adapterFactory) {

@@ -53,12 +53,12 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 		}

@@ -69,7 +69,7 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
 	 * This returns Continuous.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -81,7 +81,7 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -94,7 +94,7 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +108,7 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -119,17 +119,17 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
 	/**

 	 * Compose the image with specific visibility logo

 	 * Copied from UML implementation

-	 * 

+	 *

 	 * @param object

 	 * @param composedImage

 	 * @return {@link ComposedImage}

 	 */

 	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement)object;

+		NamedElement namedElement = (NamedElement) object;

 

-		if(namedElement.isSetVisibility()) {

+		if (namedElement.isSetVisibility()) {

 			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-				+ namedElement.getVisibility().getName()));

+					+ namedElement.getVisibility().getName()));

 		}

 

 		return composedImage;

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java
index 5677c4c4e52..06fd7263967 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.ControlOperator} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ControlOperatorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ControlOperatorItemProvider extends ItemProviderAdapter implements
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ControlOperatorItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ControlOperatorItemProvider extends ItemProviderAdapter implements
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_OperationPropertyDescriptor(object);

@@ -73,29 +73,31 @@ public class ControlOperatorItemProvider extends ItemProviderAdapter implements
 	 * This adds a property descriptor for the Base Operation feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_OperationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Operation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Operation_feature", "_UI_ControlOperator_type"), ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_OPERATION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Operation_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Operation_feature", "_UI_ControlOperator_type"), ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_OPERATION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Base Behavior feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_BehaviorPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Behavior_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Behavior_feature", "_UI_ControlOperator_type"), ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_BEHAVIOR, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Behavior_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Behavior_feature", "_UI_ControlOperator_type"), ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_BEHAVIOR, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns ControlOperator.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -107,7 +109,7 @@ public class ControlOperatorItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -120,7 +122,7 @@ public class ControlOperatorItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +136,7 @@ public class ControlOperatorItemProvider extends ItemProviderAdapter implements
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +148,7 @@ public class ControlOperatorItemProvider extends ItemProviderAdapter implements
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java
index 3583ec0d2d0..5ed2b23957f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -31,7 +31,7 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Discrete} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class DiscreteItemProvider extends RateItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -42,7 +42,7 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public DiscreteItemProvider(AdapterFactory adapterFactory) {

@@ -53,12 +53,12 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 		}

@@ -69,7 +69,7 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
 	 * This returns Discrete.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -81,7 +81,7 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -94,7 +94,7 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +108,7 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -119,17 +119,17 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
 	/**

 	 * Compose the image with specific visibility logo

 	 * Copied from UML implementation

-	 * 

+	 *

 	 * @param object

 	 * @param composedImage

 	 * @return {@link ComposedImage}

 	 */

 	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement)object;

+		NamedElement namedElement = (NamedElement) object;

 

-		if(namedElement.isSetVisibility()) {

+		if (namedElement.isSetVisibility()) {

 			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-				+ namedElement.getVisibility().getName()));

+					+ namedElement.getVisibility().getName()));

 		}

 

 		return composedImage;

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java
index acebbe285a4..8091743c678 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.NoBuffer} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class NoBufferItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class NoBufferItemProvider extends ItemProviderAdapter implements IEditin
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NoBufferItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class NoBufferItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_ObjectNodePropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class NoBufferItemProvider extends ItemProviderAdapter implements IEditin
 	 * This adds a property descriptor for the Base Object Node feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ObjectNodePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NoBuffer_base_ObjectNode_feature"), getString("_UI_PropertyDescriptor_description", "_UI_NoBuffer_base_ObjectNode_feature", "_UI_NoBuffer_type"), ActivitiesPackage.Literals.NO_BUFFER__BASE_OBJECT_NODE, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NoBuffer_base_ObjectNode_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_NoBuffer_base_ObjectNode_feature", "_UI_NoBuffer_type"), ActivitiesPackage.Literals.NO_BUFFER__BASE_OBJECT_NODE, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns NoBuffer.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class NoBufferItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class NoBufferItemProvider extends ItemProviderAdapter implements IEditin
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class NoBufferItemProvider extends ItemProviderAdapter implements IEditin
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class NoBufferItemProvider extends ItemProviderAdapter implements IEditin
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java
index 3ff3b9879e5..fa4e3e3f782 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Optional} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class OptionalItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class OptionalItemProvider extends ItemProviderAdapter implements IEditin
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public OptionalItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class OptionalItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_ParameterPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class OptionalItemProvider extends ItemProviderAdapter implements IEditin
 	 * This adds a property descriptor for the Base Parameter feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ParameterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Optional_base_Parameter_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Optional_base_Parameter_feature", "_UI_Optional_type"), ActivitiesPackage.Literals.OPTIONAL__BASE_PARAMETER, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Optional_base_Parameter_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Optional_base_Parameter_feature", "_UI_Optional_type"), ActivitiesPackage.Literals.OPTIONAL__BASE_PARAMETER, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Optional.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class OptionalItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class OptionalItemProvider extends ItemProviderAdapter implements IEditin
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class OptionalItemProvider extends ItemProviderAdapter implements IEditin
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class OptionalItemProvider extends ItemProviderAdapter implements IEditin
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java
index 79c1a9405d5..3bd66bc3550 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Overwrite} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class OverwriteItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class OverwriteItemProvider extends ItemProviderAdapter implements IEditi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public OverwriteItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class OverwriteItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_ObjectNodePropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class OverwriteItemProvider extends ItemProviderAdapter implements IEditi
 	 * This adds a property descriptor for the Base Object Node feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ObjectNodePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Overwrite_base_ObjectNode_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Overwrite_base_ObjectNode_feature", "_UI_Overwrite_type"), ActivitiesPackage.Literals.OVERWRITE__BASE_OBJECT_NODE, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Overwrite_base_ObjectNode_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Overwrite_base_ObjectNode_feature", "_UI_Overwrite_type"), ActivitiesPackage.Literals.OVERWRITE__BASE_OBJECT_NODE, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Overwrite.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class OverwriteItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class OverwriteItemProvider extends ItemProviderAdapter implements IEditi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class OverwriteItemProvider extends ItemProviderAdapter implements IEditi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class OverwriteItemProvider extends ItemProviderAdapter implements IEditi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java
index 47b34729c17..e517e16336b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Probability} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ProbabilityItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ProbabilityItemProvider extends ItemProviderAdapter implements IEdi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ProbabilityItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ProbabilityItemProvider extends ItemProviderAdapter implements IEdi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_ActivityEdgePropertyDescriptor(object);

@@ -74,40 +74,43 @@ public class ProbabilityItemProvider extends ItemProviderAdapter implements IEdi
 	 * This adds a property descriptor for the Base Activity Edge feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ActivityEdgePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ActivityEdge_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ActivityEdge_feature", "_UI_Probability_type"), ActivitiesPackage.Literals.PROBABILITY__BASE_ACTIVITY_EDGE, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ActivityEdge_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ActivityEdge_feature", "_UI_Probability_type"), ActivitiesPackage.Literals.PROBABILITY__BASE_ACTIVITY_EDGE, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Base Parameter Set feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ParameterSetPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ParameterSet_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ParameterSet_feature", "_UI_Probability_type"), ActivitiesPackage.Literals.PROBABILITY__BASE_PARAMETER_SET, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ParameterSet_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ParameterSet_feature", "_UI_Probability_type"), ActivitiesPackage.Literals.PROBABILITY__BASE_PARAMETER_SET, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Probability feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addProbabilityPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_probability_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Probability_probability_feature", "_UI_Probability_type"), ActivitiesPackage.Literals.PROBABILITY__PROBABILITY, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_probability_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Probability_probability_feature", "_UI_Probability_type"), ActivitiesPackage.Literals.PROBABILITY__PROBABILITY, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Probability.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -119,7 +122,7 @@ public class ProbabilityItemProvider extends ItemProviderAdapter implements IEdi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -132,7 +135,7 @@ public class ProbabilityItemProvider extends ItemProviderAdapter implements IEdi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +149,7 @@ public class ProbabilityItemProvider extends ItemProviderAdapter implements IEdi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -158,7 +161,7 @@ public class ProbabilityItemProvider extends ItemProviderAdapter implements IEdi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java
index 7d6f1c4d89c..10b751d536e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Rate} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class RateItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class RateItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RateItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class RateItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_ParameterPropertyDescriptor(object);

@@ -74,40 +74,43 @@ public class RateItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This adds a property descriptor for the Base Parameter feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ParameterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_Parameter_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_Parameter_feature", "_UI_Rate_type"), ActivitiesPackage.Literals.RATE__BASE_PARAMETER, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_Parameter_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_Parameter_feature", "_UI_Rate_type"), ActivitiesPackage.Literals.RATE__BASE_PARAMETER, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Base Activity Edge feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ActivityEdgePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_ActivityEdge_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_ActivityEdge_feature", "_UI_Rate_type"), ActivitiesPackage.Literals.RATE__BASE_ACTIVITY_EDGE, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_ActivityEdge_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_ActivityEdge_feature", "_UI_Rate_type"), ActivitiesPackage.Literals.RATE__BASE_ACTIVITY_EDGE, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Rate feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addRatePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_rate_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rate_rate_feature", "_UI_Rate_type"), ActivitiesPackage.Literals.RATE__RATE, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_rate_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Rate_rate_feature", "_UI_Rate_type"), ActivitiesPackage.Literals.RATE__RATE, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Rate.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -119,7 +122,7 @@ public class RateItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -132,7 +135,7 @@ public class RateItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +149,7 @@ public class RateItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -158,7 +161,7 @@ public class RateItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java
index c6bf06b7b23..ca01293abed 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class AllocateActivityPartitionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class AllocateActivityPartitionItemProvider extends ItemProviderAdapter i
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocateActivityPartitionItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class AllocateActivityPartitionItemProvider extends ItemProviderAdapter i
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_ActivityPartitionPropertyDescriptor(object);

@@ -72,18 +72,20 @@ public class AllocateActivityPartitionItemProvider extends ItemProviderAdapter i
 	 * This adds a property descriptor for the Base Activity Partition feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ActivityPartitionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AllocateActivityPartition_base_ActivityPartition_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AllocateActivityPartition_base_ActivityPartition_feature", "_UI_AllocateActivityPartition_type"), AllocationsPackage.Literals.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AllocateActivityPartition_base_ActivityPartition_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_AllocateActivityPartition_base_ActivityPartition_feature", "_UI_AllocateActivityPartition_type"), AllocationsPackage.Literals.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION, true,

+				false, true, null, null, null));

 	}

 

 	/**

 	 * This returns AllocateActivityPartition.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +97,7 @@ public class AllocateActivityPartitionItemProvider extends ItemProviderAdapter i
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +110,7 @@ public class AllocateActivityPartitionItemProvider extends ItemProviderAdapter i
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +124,7 @@ public class AllocateActivityPartitionItemProvider extends ItemProviderAdapter i
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +136,7 @@ public class AllocateActivityPartitionItemProvider extends ItemProviderAdapter i
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java
index 26814c0fb8a..05b5251d069 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocate} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class AllocateItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class AllocateItemProvider extends ItemProviderAdapter implements IEditin
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocateItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class AllocateItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_AbstractionPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class AllocateItemProvider extends ItemProviderAdapter implements IEditin
 	 * This adds a property descriptor for the Base Abstraction feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocate_base_Abstraction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Allocate_base_Abstraction_feature", "_UI_Allocate_type"), AllocationsPackage.Literals.ALLOCATE__BASE_ABSTRACTION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocate_base_Abstraction_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Allocate_base_Abstraction_feature", "_UI_Allocate_type"), AllocationsPackage.Literals.ALLOCATE__BASE_ABSTRACTION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Allocate.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class AllocateItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class AllocateItemProvider extends ItemProviderAdapter implements IEditin
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class AllocateItemProvider extends ItemProviderAdapter implements IEditin
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class AllocateItemProvider extends ItemProviderAdapter implements IEditin
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java
index 4e7f2a79bd9..9c13a9a0a01 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocated} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class AllocatedItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class AllocatedItemProvider extends ItemProviderAdapter implements IEditi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocatedItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class AllocatedItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_NamedElementPropertyDescriptor(object);

@@ -74,40 +74,43 @@ public class AllocatedItemProvider extends ItemProviderAdapter implements IEditi
 	 * This adds a property descriptor for the Base Named Element feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_NamedElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_base_NamedElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Allocated_base_NamedElement_feature", "_UI_Allocated_type"), AllocationsPackage.Literals.ALLOCATED__BASE_NAMED_ELEMENT, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_base_NamedElement_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Allocated_base_NamedElement_feature", "_UI_Allocated_type"), AllocationsPackage.Literals.ALLOCATED__BASE_NAMED_ELEMENT, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Allocated From feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addAllocatedFromPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_allocatedFrom_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Allocated_allocatedFrom_feature", "_UI_Allocated_type"), AllocationsPackage.Literals.ALLOCATED__ALLOCATED_FROM, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_allocatedFrom_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Allocated_allocatedFrom_feature", "_UI_Allocated_type"), AllocationsPackage.Literals.ALLOCATED__ALLOCATED_FROM, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Allocated To feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addAllocatedToPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_allocatedTo_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Allocated_allocatedTo_feature", "_UI_Allocated_type"), AllocationsPackage.Literals.ALLOCATED__ALLOCATED_TO, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_allocatedTo_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Allocated_allocatedTo_feature", "_UI_Allocated_type"), AllocationsPackage.Literals.ALLOCATED__ALLOCATED_TO, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This returns Allocated.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -119,7 +122,7 @@ public class AllocatedItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -132,7 +135,7 @@ public class AllocatedItemProvider extends ItemProviderAdapter implements IEditi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +149,7 @@ public class AllocatedItemProvider extends ItemProviderAdapter implements IEditi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -158,7 +161,7 @@ public class AllocatedItemProvider extends ItemProviderAdapter implements IEditi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocationsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocationsItemProviderAdapterFactory.java
index 0a26b1d2cdf..219ec62e900 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocationsItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocationsItemProviderAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,7 +38,7 @@ import org.eclipse.papyrus.sysml.allocations.util.AllocationsAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc --> <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +46,7 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -54,7 +54,7 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -63,7 +63,7 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -71,7 +71,7 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocationsItemProviderAdapterFactory() {

@@ -85,7 +85,7 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.allocations.Allocate} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected AllocateItemProvider allocateItemProvider;

@@ -93,12 +93,12 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocate}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createAllocateAdapter() {

-		if(allocateItemProvider == null) {

+		if (allocateItemProvider == null) {

 			allocateItemProvider = new AllocateItemProvider(this);

 		}

 

@@ -108,7 +108,7 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.allocations.Allocated} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected AllocatedItemProvider allocatedItemProvider;

@@ -116,12 +116,12 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocated}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createAllocatedAdapter() {

-		if(allocatedItemProvider == null) {

+		if (allocatedItemProvider == null) {

 			allocatedItemProvider = new AllocatedItemProvider(this);

 		}

 

@@ -131,7 +131,7 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected AllocateActivityPartitionItemProvider allocateActivityPartitionItemProvider;

@@ -139,12 +139,12 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition}.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createAllocateActivityPartitionAdapter() {

-		if(allocateActivityPartitionItemProvider == null) {

+		if (allocateActivityPartitionItemProvider == null) {

 			allocateActivityPartitionItemProvider = new AllocateActivityPartitionItemProvider(this);

 		}

 

@@ -154,9 +154,10 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This returns the root adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public ComposeableAdapterFactory getRootAdapterFactory() {

 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

 	}

@@ -164,16 +165,17 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This sets the composed adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

 		this.parentAdapterFactory = parentAdapterFactory;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -184,7 +186,7 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -194,14 +196,14 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

-		if(isFactoryForType(type)) {

+		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -212,9 +214,10 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This adds a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void addListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.addListener(notifyChangedListener);

 	}

@@ -222,9 +225,10 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This removes a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void removeListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.removeListener(notifyChangedListener);

 	}

@@ -232,13 +236,14 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void fireNotifyChanged(Notification notification) {

 		changeNotifier.fireNotifyChanged(notification);

 

-		if(parentAdapterFactory != null) {

+		if (parentAdapterFactory != null) {

 			parentAdapterFactory.fireNotifyChanged(notification);

 		}

 	}

@@ -246,16 +251,20 @@ public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFac
 	/**

 	 * This disposes all of the item providers created by this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void dispose() {

-		if(allocateItemProvider != null)

+		if (allocateItemProvider != null) {

 			allocateItemProvider.dispose();

-		if(allocatedItemProvider != null)

+		}

+		if (allocatedItemProvider != null) {

 			allocatedItemProvider.dispose();

-		if(allocateActivityPartitionItemProvider != null)

+		}

+		if (allocateActivityPartitionItemProvider != null) {

 			allocateActivityPartitionItemProvider.dispose();

+		}

 	}

 

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java
index 333fd5e6fdd..67c0aa9e2e9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.BindingConnector} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class BindingConnectorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class BindingConnectorItemProvider extends ItemProviderAdapter implements
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BindingConnectorItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class BindingConnectorItemProvider extends ItemProviderAdapter implements
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_ConnectorPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class BindingConnectorItemProvider extends ItemProviderAdapter implements
 	 * This adds a property descriptor for the Base Connector feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ConnectorPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_BindingConnector_base_Connector_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BindingConnector_base_Connector_feature", "_UI_BindingConnector_type"), BlocksPackage.Literals.BINDING_CONNECTOR__BASE_CONNECTOR, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_BindingConnector_base_Connector_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_BindingConnector_base_Connector_feature", "_UI_BindingConnector_type"), BlocksPackage.Literals.BINDING_CONNECTOR__BASE_CONNECTOR, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns BindingConnector.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class BindingConnectorItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class BindingConnectorItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class BindingConnectorItemProvider extends ItemProviderAdapter implements
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class BindingConnectorItemProvider extends ItemProviderAdapter implements
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java
index 2242f646b52..7b38a8d8e4d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.Block} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class BlockItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -47,7 +47,7 @@ public class BlockItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BlockItemProvider(AdapterFactory adapterFactory) {

@@ -58,12 +58,12 @@ public class BlockItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addIsEncapsulatedPropertyDescriptor(object);

@@ -76,29 +76,31 @@ public class BlockItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * This adds a property descriptor for the Is Encapsulated feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addIsEncapsulatedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Block_isEncapsulated_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Block_isEncapsulated_feature", "_UI_Block_type"), BlocksPackage.Literals.BLOCK__IS_ENCAPSULATED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Block_isEncapsulated_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Block_isEncapsulated_feature", "_UI_Block_type"), BlocksPackage.Literals.BLOCK__IS_ENCAPSULATED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Base Class feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ClassPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Block_base_Class_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Block_base_Class_feature", "_UI_Block_type"), BlocksPackage.Literals.BLOCK__BASE_CLASS, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Block_base_Class_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Block_base_Class_feature", "_UI_Block_type"), BlocksPackage.Literals.BLOCK__BASE_CLASS, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Block.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -110,12 +112,12 @@ public class BlockItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		Block block = (Block)object;

+		Block block = (Block) object;

 		return getString("_UI_Block_type") + " " + block.isEncapsulated();

 	}

 

@@ -124,14 +126,14 @@ public class BlockItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

 

-		switch(notification.getFeatureID(Block.class)) {

+		switch (notification.getFeatureID(Block.class)) {

 		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 			return;

@@ -144,7 +146,7 @@ public class BlockItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -156,7 +158,7 @@ public class BlockItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlocksItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlocksItemProviderAdapterFactory.java
index 6bb58ed00c1..4cd2fd80a30 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlocksItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlocksItemProviderAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,7 +38,7 @@ import org.eclipse.papyrus.sysml.blocks.util.BlocksAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc --> <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +46,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -54,7 +54,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -63,7 +63,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -71,7 +71,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BlocksItemProviderAdapterFactory() {

@@ -85,7 +85,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.Block} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected BlockItemProvider blockItemProvider;

@@ -94,12 +94,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.Block}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createBlockAdapter() {

-		if(blockItemProvider == null) {

+		if (blockItemProvider == null) {

 			blockItemProvider = new BlockItemProvider(this);

 		}

 

@@ -109,7 +109,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.DistributedProperty} instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected DistributedPropertyItemProvider distributedPropertyItemProvider;

@@ -117,12 +117,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.DistributedProperty}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createDistributedPropertyAdapter() {

-		if(distributedPropertyItemProvider == null) {

+		if (distributedPropertyItemProvider == null) {

 			distributedPropertyItemProvider = new DistributedPropertyItemProvider(this);

 		}

 

@@ -132,7 +132,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.Dimension} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected DimensionItemProvider dimensionItemProvider;

@@ -141,12 +141,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.Dimension}.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createDimensionAdapter() {

-		if(dimensionItemProvider == null) {

+		if (dimensionItemProvider == null) {

 			dimensionItemProvider = new DimensionItemProvider(this);

 		}

 

@@ -156,7 +156,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.Unit} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected UnitItemProvider unitItemProvider;

@@ -165,12 +165,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.Unit}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createUnitAdapter() {

-		if(unitItemProvider == null) {

+		if (unitItemProvider == null) {

 			unitItemProvider = new UnitItemProvider(this);

 		}

 

@@ -180,7 +180,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.ValueType} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ValueTypeItemProvider valueTypeItemProvider;

@@ -189,12 +189,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.ValueType}.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createValueTypeAdapter() {

-		if(valueTypeItemProvider == null) {

+		if (valueTypeItemProvider == null) {

 			valueTypeItemProvider = new ValueTypeItemProvider(this);

 		}

 

@@ -204,7 +204,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd} instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected NestedConnectorEndItemProvider nestedConnectorEndItemProvider;

@@ -212,12 +212,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createNestedConnectorEndAdapter() {

-		if(nestedConnectorEndItemProvider == null) {

+		if (nestedConnectorEndItemProvider == null) {

 			nestedConnectorEndItemProvider = new NestedConnectorEndItemProvider(this);

 		}

 

@@ -227,7 +227,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty} instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ParticipantPropertyItemProvider participantPropertyItemProvider;

@@ -235,12 +235,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createParticipantPropertyAdapter() {

-		if(participantPropertyItemProvider == null) {

+		if (participantPropertyItemProvider == null) {

 			participantPropertyItemProvider = new ParticipantPropertyItemProvider(this);

 		}

 

@@ -250,7 +250,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty} instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ConnectorPropertyItemProvider connectorPropertyItemProvider;

@@ -258,12 +258,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createConnectorPropertyAdapter() {

-		if(connectorPropertyItemProvider == null) {

+		if (connectorPropertyItemProvider == null) {

 			connectorPropertyItemProvider = new ConnectorPropertyItemProvider(this);

 		}

 

@@ -273,7 +273,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.BindingConnector} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected BindingConnectorItemProvider bindingConnectorItemProvider;

@@ -281,12 +281,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.BindingConnector}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createBindingConnectorAdapter() {

-		if(bindingConnectorItemProvider == null) {

+		if (bindingConnectorItemProvider == null) {

 			bindingConnectorItemProvider = new BindingConnectorItemProvider(this);

 		}

 

@@ -296,7 +296,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType} instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected PropertySpecificTypeItemProvider propertySpecificTypeItemProvider;

@@ -304,12 +304,12 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createPropertySpecificTypeAdapter() {

-		if(propertySpecificTypeItemProvider == null) {

+		if (propertySpecificTypeItemProvider == null) {

 			propertySpecificTypeItemProvider = new PropertySpecificTypeItemProvider(this);

 		}

 

@@ -319,9 +319,10 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This returns the root adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public ComposeableAdapterFactory getRootAdapterFactory() {

 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

 	}

@@ -329,16 +330,17 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This sets the composed adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

 		this.parentAdapterFactory = parentAdapterFactory;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -349,7 +351,7 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -359,14 +361,14 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

-		if(isFactoryForType(type)) {

+		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -377,9 +379,10 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This adds a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void addListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.addListener(notifyChangedListener);

 	}

@@ -387,9 +390,10 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This removes a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void removeListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.removeListener(notifyChangedListener);

 	}

@@ -397,13 +401,14 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void fireNotifyChanged(Notification notification) {

 		changeNotifier.fireNotifyChanged(notification);

 

-		if(parentAdapterFactory != null) {

+		if (parentAdapterFactory != null) {

 			parentAdapterFactory.fireNotifyChanged(notification);

 		}

 	}

@@ -411,30 +416,41 @@ public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory imple
 	/**

 	 * This disposes all of the item providers created by this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void dispose() {

-		if(blockItemProvider != null)

+		if (blockItemProvider != null) {

 			blockItemProvider.dispose();

-		if(distributedPropertyItemProvider != null)

+		}

+		if (distributedPropertyItemProvider != null) {

 			distributedPropertyItemProvider.dispose();

-		if(dimensionItemProvider != null)

+		}

+		if (dimensionItemProvider != null) {

 			dimensionItemProvider.dispose();

-		if(unitItemProvider != null)

+		}

+		if (unitItemProvider != null) {

 			unitItemProvider.dispose();

-		if(valueTypeItemProvider != null)

+		}

+		if (valueTypeItemProvider != null) {

 			valueTypeItemProvider.dispose();

-		if(nestedConnectorEndItemProvider != null)

+		}

+		if (nestedConnectorEndItemProvider != null) {

 			nestedConnectorEndItemProvider.dispose();

-		if(participantPropertyItemProvider != null)

+		}

+		if (participantPropertyItemProvider != null) {

 			participantPropertyItemProvider.dispose();

-		if(connectorPropertyItemProvider != null)

+		}

+		if (connectorPropertyItemProvider != null) {

 			connectorPropertyItemProvider.dispose();

-		if(bindingConnectorItemProvider != null)

+		}

+		if (bindingConnectorItemProvider != null) {

 			bindingConnectorItemProvider.dispose();

-		if(propertySpecificTypeItemProvider != null)

+		}

+		if (propertySpecificTypeItemProvider != null) {

 			propertySpecificTypeItemProvider.dispose();

+		}

 	}

 

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java
index ccdc699e7e5..23952ecbf39 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ConnectorPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ConnectorPropertyItemProvider extends ItemProviderAdapter implement
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConnectorPropertyItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ConnectorPropertyItemProvider extends ItemProviderAdapter implement
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_PropertyPropertyDescriptor(object);

@@ -73,29 +73,31 @@ public class ConnectorPropertyItemProvider extends ItemProviderAdapter implement
 	 * This adds a property descriptor for the Base Property feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConnectorProperty_base_Property_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ConnectorProperty_base_Property_feature", "_UI_ConnectorProperty_type"), BlocksPackage.Literals.CONNECTOR_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConnectorProperty_base_Property_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ConnectorProperty_base_Property_feature", "_UI_ConnectorProperty_type"), BlocksPackage.Literals.CONNECTOR_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Connector feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addConnectorPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConnectorProperty_connector_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ConnectorProperty_connector_feature", "_UI_ConnectorProperty_type"), BlocksPackage.Literals.CONNECTOR_PROPERTY__CONNECTOR, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConnectorProperty_connector_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ConnectorProperty_connector_feature", "_UI_ConnectorProperty_type"), BlocksPackage.Literals.CONNECTOR_PROPERTY__CONNECTOR, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns ConnectorProperty.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -107,7 +109,7 @@ public class ConnectorPropertyItemProvider extends ItemProviderAdapter implement
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -120,7 +122,7 @@ public class ConnectorPropertyItemProvider extends ItemProviderAdapter implement
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +136,7 @@ public class ConnectorPropertyItemProvider extends ItemProviderAdapter implement
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +148,7 @@ public class ConnectorPropertyItemProvider extends ItemProviderAdapter implement
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java
index 9f80c7400f0..3cedf5a5649 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.Dimension} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class DimensionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public DimensionItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_InstanceSpecificationPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 * This adds a property descriptor for the Base Instance Specification feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_InstanceSpecificationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_base_InstanceSpecification_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Dimension_base_InstanceSpecification_feature", "_UI_Dimension_type"), BlocksPackage.Literals.DIMENSION__BASE_INSTANCE_SPECIFICATION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_base_InstanceSpecification_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Dimension_base_InstanceSpecification_feature", "_UI_Dimension_type"), BlocksPackage.Literals.DIMENSION__BASE_INSTANCE_SPECIFICATION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Dimension.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java
index fcecfbefae3..5f884e2d19e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.DistributedProperty} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class DistributedPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class DistributedPropertyItemProvider extends ItemProviderAdapter impleme
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public DistributedPropertyItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class DistributedPropertyItemProvider extends ItemProviderAdapter impleme
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_PropertyPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class DistributedPropertyItemProvider extends ItemProviderAdapter impleme
 	 * This adds a property descriptor for the Base Property feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DistributedProperty_base_Property_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DistributedProperty_base_Property_feature", "_UI_DistributedProperty_type"), BlocksPackage.Literals.DISTRIBUTED_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DistributedProperty_base_Property_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_DistributedProperty_base_Property_feature", "_UI_DistributedProperty_type"), BlocksPackage.Literals.DISTRIBUTED_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns DistributedProperty.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class DistributedPropertyItemProvider extends ItemProviderAdapter impleme
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class DistributedPropertyItemProvider extends ItemProviderAdapter impleme
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class DistributedPropertyItemProvider extends ItemProviderAdapter impleme
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class DistributedPropertyItemProvider extends ItemProviderAdapter impleme
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java
index 9e4ab972fd2..42d2a99ae98 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class NestedConnectorEndItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class NestedConnectorEndItemProvider extends ItemProviderAdapter implemen
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NestedConnectorEndItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class NestedConnectorEndItemProvider extends ItemProviderAdapter implemen
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addPropertyPathPropertyDescriptor(object);

@@ -73,29 +73,31 @@ public class NestedConnectorEndItemProvider extends ItemProviderAdapter implemen
 	 * This adds a property descriptor for the Property Path feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addPropertyPathPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NestedConnectorEnd_propertyPath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_NestedConnectorEnd_propertyPath_feature", "_UI_NestedConnectorEnd_type"), BlocksPackage.Literals.NESTED_CONNECTOR_END__PROPERTY_PATH, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NestedConnectorEnd_propertyPath_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_NestedConnectorEnd_propertyPath_feature", "_UI_NestedConnectorEnd_type"), BlocksPackage.Literals.NESTED_CONNECTOR_END__PROPERTY_PATH, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Base Connector End feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ConnectorEndPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NestedConnectorEnd_base_ConnectorEnd_feature"), getString("_UI_PropertyDescriptor_description", "_UI_NestedConnectorEnd_base_ConnectorEnd_feature", "_UI_NestedConnectorEnd_type"), BlocksPackage.Literals.NESTED_CONNECTOR_END__BASE_CONNECTOR_END, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NestedConnectorEnd_base_ConnectorEnd_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_NestedConnectorEnd_base_ConnectorEnd_feature", "_UI_NestedConnectorEnd_type"), BlocksPackage.Literals.NESTED_CONNECTOR_END__BASE_CONNECTOR_END, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns NestedConnectorEnd.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -107,7 +109,7 @@ public class NestedConnectorEndItemProvider extends ItemProviderAdapter implemen
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -120,7 +122,7 @@ public class NestedConnectorEndItemProvider extends ItemProviderAdapter implemen
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +136,7 @@ public class NestedConnectorEndItemProvider extends ItemProviderAdapter implemen
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +148,7 @@ public class NestedConnectorEndItemProvider extends ItemProviderAdapter implemen
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java
index 7191dae8c76..79f726e7a06 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ParticipantPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ParticipantPropertyItemProvider extends ItemProviderAdapter impleme
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ParticipantPropertyItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ParticipantPropertyItemProvider extends ItemProviderAdapter impleme
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_PropertyPropertyDescriptor(object);

@@ -73,29 +73,31 @@ public class ParticipantPropertyItemProvider extends ItemProviderAdapter impleme
 	 * This adds a property descriptor for the Base Property feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ParticipantProperty_base_Property_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ParticipantProperty_base_Property_feature", "_UI_ParticipantProperty_type"), BlocksPackage.Literals.PARTICIPANT_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ParticipantProperty_base_Property_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ParticipantProperty_base_Property_feature", "_UI_ParticipantProperty_type"), BlocksPackage.Literals.PARTICIPANT_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the End feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addEndPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ParticipantProperty_end_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ParticipantProperty_end_feature", "_UI_ParticipantProperty_type"), BlocksPackage.Literals.PARTICIPANT_PROPERTY__END, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ParticipantProperty_end_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ParticipantProperty_end_feature", "_UI_ParticipantProperty_type"), BlocksPackage.Literals.PARTICIPANT_PROPERTY__END, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns ParticipantProperty.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -107,7 +109,7 @@ public class ParticipantPropertyItemProvider extends ItemProviderAdapter impleme
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -120,7 +122,7 @@ public class ParticipantPropertyItemProvider extends ItemProviderAdapter impleme
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +136,7 @@ public class ParticipantPropertyItemProvider extends ItemProviderAdapter impleme
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +148,7 @@ public class ParticipantPropertyItemProvider extends ItemProviderAdapter impleme
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java
index a4e9a60bc59..186585aafb9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class PropertySpecificTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class PropertySpecificTypeItemProvider extends ItemProviderAdapter implem
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PropertySpecificTypeItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class PropertySpecificTypeItemProvider extends ItemProviderAdapter implem
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_ClassifierPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class PropertySpecificTypeItemProvider extends ItemProviderAdapter implem
 	 * This adds a property descriptor for the Base Classifier feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ClassifierPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PropertySpecificType_base_Classifier_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PropertySpecificType_base_Classifier_feature", "_UI_PropertySpecificType_type"), BlocksPackage.Literals.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PropertySpecificType_base_Classifier_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_PropertySpecificType_base_Classifier_feature", "_UI_PropertySpecificType_type"), BlocksPackage.Literals.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns PropertySpecificType.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class PropertySpecificTypeItemProvider extends ItemProviderAdapter implem
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class PropertySpecificTypeItemProvider extends ItemProviderAdapter implem
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class PropertySpecificTypeItemProvider extends ItemProviderAdapter implem
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class PropertySpecificTypeItemProvider extends ItemProviderAdapter implem
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java
index 0bdc36aa759..4332d625496 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.Unit} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UnitItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class UnitItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UnitItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class UnitItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_InstanceSpecificationPropertyDescriptor(object);

@@ -73,29 +73,31 @@ public class UnitItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This adds a property descriptor for the Base Instance Specification feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_InstanceSpecificationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Unit_base_InstanceSpecification_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Unit_base_InstanceSpecification_feature", "_UI_Unit_type"), BlocksPackage.Literals.UNIT__BASE_INSTANCE_SPECIFICATION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Unit_base_InstanceSpecification_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Unit_base_InstanceSpecification_feature", "_UI_Unit_type"), BlocksPackage.Literals.UNIT__BASE_INSTANCE_SPECIFICATION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Dimension feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addDimensionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Unit_dimension_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Unit_dimension_feature", "_UI_Unit_type"), BlocksPackage.Literals.UNIT__DIMENSION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Unit_dimension_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Unit_dimension_feature", "_UI_Unit_type"), BlocksPackage.Literals.UNIT__DIMENSION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Unit.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -107,7 +109,7 @@ public class UnitItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -120,7 +122,7 @@ public class UnitItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +136,7 @@ public class UnitItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +148,7 @@ public class UnitItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java
index d9540d67568..561523711bc 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.ValueType} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ValueTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ValueTypeItemProvider extends ItemProviderAdapter implements IEditi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ValueTypeItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ValueTypeItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_DataTypePropertyDescriptor(object);

@@ -74,40 +74,43 @@ public class ValueTypeItemProvider extends ItemProviderAdapter implements IEditi
 	 * This adds a property descriptor for the Base Data Type feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_DataTypePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_base_DataType_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ValueType_base_DataType_feature", "_UI_ValueType_type"), BlocksPackage.Literals.VALUE_TYPE__BASE_DATA_TYPE, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_base_DataType_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ValueType_base_DataType_feature", "_UI_ValueType_type"), BlocksPackage.Literals.VALUE_TYPE__BASE_DATA_TYPE, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Unit feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addUnitPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_unit_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ValueType_unit_feature", "_UI_ValueType_type"), BlocksPackage.Literals.VALUE_TYPE__UNIT, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_unit_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ValueType_unit_feature", "_UI_ValueType_type"), BlocksPackage.Literals.VALUE_TYPE__UNIT, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Dimension feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addDimensionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_dimension_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ValueType_dimension_feature", "_UI_ValueType_type"), BlocksPackage.Literals.VALUE_TYPE__DIMENSION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_dimension_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ValueType_dimension_feature", "_UI_ValueType_type"), BlocksPackage.Literals.VALUE_TYPE__DIMENSION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns ValueType.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -119,7 +122,7 @@ public class ValueTypeItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -132,7 +135,7 @@ public class ValueTypeItemProvider extends ItemProviderAdapter implements IEditi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +149,7 @@ public class ValueTypeItemProvider extends ItemProviderAdapter implements IEditi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -158,7 +161,7 @@ public class ValueTypeItemProvider extends ItemProviderAdapter implements IEditi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java
index bdf902581ec..a7e3c9dbeb7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -35,7 +35,7 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ConstraintBlockItemProvider extends BlockItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -46,7 +46,7 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintBlockItemProvider(AdapterFactory adapterFactory) {

@@ -57,12 +57,12 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 		}

@@ -73,7 +73,7 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
 	 * This returns ConstraintBlock.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -85,12 +85,12 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		ConstraintBlock constraintBlock = (ConstraintBlock)object;

+		ConstraintBlock constraintBlock = (ConstraintBlock) object;

 		return getString("_UI_ConstraintBlock_type") + " " + constraintBlock.isEncapsulated();

 	}

 

@@ -99,7 +99,7 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -113,7 +113,7 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -125,7 +125,7 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -136,17 +136,17 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
 	/**

 	 * Compose the image with specific visibility logo

 	 * Copied from UML implementation

-	 * 

+	 *

 	 * @param object

 	 * @param composedImage

 	 * @return {@link ComposedImage}

 	 */

 	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement)object;

+		NamedElement namedElement = (NamedElement) object;

 

-		if(namedElement.isSetVisibility()) {

+		if (namedElement.isSetVisibility()) {

 			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-				+ namedElement.getVisibility().getName()));

+					+ namedElement.getVisibility().getName()));

 		}

 

 		return composedImage;

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java
index 368c31804e2..e7365d364e3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ConstraintPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ConstraintPropertyItemProvider extends ItemProviderAdapter implemen
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintPropertyItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ConstraintPropertyItemProvider extends ItemProviderAdapter implemen
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_PropertyPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class ConstraintPropertyItemProvider extends ItemProviderAdapter implemen
 	 * This adds a property descriptor for the Base Property feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConstraintProperty_base_Property_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ConstraintProperty_base_Property_feature", "_UI_ConstraintProperty_type"), ConstraintsPackage.Literals.CONSTRAINT_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConstraintProperty_base_Property_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ConstraintProperty_base_Property_feature", "_UI_ConstraintProperty_type"), ConstraintsPackage.Literals.CONSTRAINT_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns ConstraintProperty.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class ConstraintPropertyItemProvider extends ItemProviderAdapter implemen
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class ConstraintPropertyItemProvider extends ItemProviderAdapter implemen
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class ConstraintPropertyItemProvider extends ItemProviderAdapter implemen
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class ConstraintPropertyItemProvider extends ItemProviderAdapter implemen
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintsItemProviderAdapterFactory.java
index 70ca5094a67..48c60d59f7e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintsItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintsItemProviderAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,7 +38,7 @@ import org.eclipse.papyrus.sysml.constraints.util.ConstraintsAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc --> <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +46,7 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -54,7 +54,7 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -63,7 +63,7 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -71,7 +71,7 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintsItemProviderAdapterFactory() {

@@ -85,7 +85,7 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock} instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ConstraintBlockItemProvider constraintBlockItemProvider;

@@ -93,12 +93,12 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createConstraintBlockAdapter() {

-		if(constraintBlockItemProvider == null) {

+		if (constraintBlockItemProvider == null) {

 			constraintBlockItemProvider = new ConstraintBlockItemProvider(this);

 		}

 

@@ -108,7 +108,7 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ConstraintPropertyItemProvider constraintPropertyItemProvider;

@@ -116,12 +116,12 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createConstraintPropertyAdapter() {

-		if(constraintPropertyItemProvider == null) {

+		if (constraintPropertyItemProvider == null) {

 			constraintPropertyItemProvider = new ConstraintPropertyItemProvider(this);

 		}

 

@@ -131,9 +131,10 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This returns the root adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public ComposeableAdapterFactory getRootAdapterFactory() {

 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

 	}

@@ -141,16 +142,17 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This sets the composed adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

 		this.parentAdapterFactory = parentAdapterFactory;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -161,7 +163,7 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -171,14 +173,14 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

-		if(isFactoryForType(type)) {

+		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -189,9 +191,10 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This adds a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void addListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.addListener(notifyChangedListener);

 	}

@@ -199,9 +202,10 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This removes a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void removeListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.removeListener(notifyChangedListener);

 	}

@@ -209,13 +213,14 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void fireNotifyChanged(Notification notification) {

 		changeNotifier.fireNotifyChanged(notification);

 

-		if(parentAdapterFactory != null) {

+		if (parentAdapterFactory != null) {

 			parentAdapterFactory.fireNotifyChanged(notification);

 		}

 	}

@@ -223,14 +228,17 @@ public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFac
 	/**

 	 * This disposes all of the item providers created by this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void dispose() {

-		if(constraintBlockItemProvider != null)

+		if (constraintBlockItemProvider != null) {

 			constraintBlockItemProvider.dispose();

-		if(constraintPropertyItemProvider != null)

+		}

+		if (constraintPropertyItemProvider != null) {

 			constraintPropertyItemProvider.dispose();

+		}

 	}

 

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java
index e50f8c62016..93b6344dcbb 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Conform} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ConformItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ConformItemProvider extends ItemProviderAdapter implements IEditing
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConformItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ConformItemProvider extends ItemProviderAdapter implements IEditing
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_DependencyPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class ConformItemProvider extends ItemProviderAdapter implements IEditing
 	 * This adds a property descriptor for the Base Dependency feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_DependencyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Conform_base_Dependency_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Conform_base_Dependency_feature", "_UI_Conform_type"), ModelelementsPackage.Literals.CONFORM__BASE_DEPENDENCY, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Conform_base_Dependency_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Conform_base_Dependency_feature", "_UI_Conform_type"), ModelelementsPackage.Literals.CONFORM__BASE_DEPENDENCY, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Conform.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class ConformItemProvider extends ItemProviderAdapter implements IEditing
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class ConformItemProvider extends ItemProviderAdapter implements IEditing
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class ConformItemProvider extends ItemProviderAdapter implements IEditing
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class ConformItemProvider extends ItemProviderAdapter implements IEditing
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ModelelementsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ModelelementsItemProviderAdapterFactory.java
index 4d2d4237bc5..aaa38f56990 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ModelelementsItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ModelelementsItemProviderAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,7 +38,7 @@ import org.eclipse.papyrus.sysml.modelelements.util.ModelelementsAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc --> <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +46,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -54,7 +54,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -63,7 +63,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -71,7 +71,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ModelelementsItemProviderAdapterFactory() {

@@ -85,7 +85,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.Conform} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ConformItemProvider conformItemProvider;

@@ -93,12 +93,12 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Conform}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createConformAdapter() {

-		if(conformItemProvider == null) {

+		if (conformItemProvider == null) {

 			conformItemProvider = new ConformItemProvider(this);

 		}

 

@@ -108,7 +108,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.View} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ViewItemProvider viewItemProvider;

@@ -117,12 +117,12 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.View}.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createViewAdapter() {

-		if(viewItemProvider == null) {

+		if (viewItemProvider == null) {

 			viewItemProvider = new ViewItemProvider(this);

 		}

 

@@ -132,7 +132,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.ViewPoint} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ViewPointItemProvider viewPointItemProvider;

@@ -140,12 +140,12 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.ViewPoint}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createViewPointAdapter() {

-		if(viewPointItemProvider == null) {

+		if (viewPointItemProvider == null) {

 			viewPointItemProvider = new ViewPointItemProvider(this);

 		}

 

@@ -155,7 +155,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.Rationale} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RationaleItemProvider rationaleItemProvider;

@@ -163,12 +163,12 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Rationale}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createRationaleAdapter() {

-		if(rationaleItemProvider == null) {

+		if (rationaleItemProvider == null) {

 			rationaleItemProvider = new RationaleItemProvider(this);

 		}

 

@@ -178,7 +178,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.Problem} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ProblemItemProvider problemItemProvider;

@@ -186,12 +186,12 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Problem}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createProblemAdapter() {

-		if(problemItemProvider == null) {

+		if (problemItemProvider == null) {

 			problemItemProvider = new ProblemItemProvider(this);

 		}

 

@@ -201,9 +201,10 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This returns the root adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public ComposeableAdapterFactory getRootAdapterFactory() {

 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

 	}

@@ -211,16 +212,17 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This sets the composed adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

 		this.parentAdapterFactory = parentAdapterFactory;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -231,7 +233,7 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -241,14 +243,14 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

-		if(isFactoryForType(type)) {

+		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -259,9 +261,10 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This adds a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void addListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.addListener(notifyChangedListener);

 	}

@@ -269,9 +272,10 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This removes a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void removeListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.removeListener(notifyChangedListener);

 	}

@@ -279,13 +283,14 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void fireNotifyChanged(Notification notification) {

 		changeNotifier.fireNotifyChanged(notification);

 

-		if(parentAdapterFactory != null) {

+		if (parentAdapterFactory != null) {

 			parentAdapterFactory.fireNotifyChanged(notification);

 		}

 	}

@@ -293,20 +298,26 @@ public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapte
 	/**

 	 * This disposes all of the item providers created by this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void dispose() {

-		if(conformItemProvider != null)

+		if (conformItemProvider != null) {

 			conformItemProvider.dispose();

-		if(viewItemProvider != null)

+		}

+		if (viewItemProvider != null) {

 			viewItemProvider.dispose();

-		if(viewPointItemProvider != null)

+		}

+		if (viewPointItemProvider != null) {

 			viewPointItemProvider.dispose();

-		if(rationaleItemProvider != null)

+		}

+		if (rationaleItemProvider != null) {

 			rationaleItemProvider.dispose();

-		if(problemItemProvider != null)

+		}

+		if (problemItemProvider != null) {

 			problemItemProvider.dispose();

+		}

 	}

 

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java
index ee1e1a0aca5..4f42c3b7540 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Problem} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ProblemItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ProblemItemProvider extends ItemProviderAdapter implements IEditing
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ProblemItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ProblemItemProvider extends ItemProviderAdapter implements IEditing
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_CommentPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class ProblemItemProvider extends ItemProviderAdapter implements IEditing
 	 * This adds a property descriptor for the Base Comment feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_CommentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Problem_base_Comment_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Problem_base_Comment_feature", "_UI_Problem_type"), ModelelementsPackage.Literals.PROBLEM__BASE_COMMENT, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Problem_base_Comment_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Problem_base_Comment_feature", "_UI_Problem_type"), ModelelementsPackage.Literals.PROBLEM__BASE_COMMENT, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Problem.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class ProblemItemProvider extends ItemProviderAdapter implements IEditing
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class ProblemItemProvider extends ItemProviderAdapter implements IEditing
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class ProblemItemProvider extends ItemProviderAdapter implements IEditing
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class ProblemItemProvider extends ItemProviderAdapter implements IEditing
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java
index 0f65aac5e6b..8dc3abe0691 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Rationale} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class RationaleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class RationaleItemProvider extends ItemProviderAdapter implements IEditi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RationaleItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class RationaleItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_CommentPropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class RationaleItemProvider extends ItemProviderAdapter implements IEditi
 	 * This adds a property descriptor for the Base Comment feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_CommentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rationale_base_Comment_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rationale_base_Comment_feature", "_UI_Rationale_type"), ModelelementsPackage.Literals.RATIONALE__BASE_COMMENT, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rationale_base_Comment_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Rationale_base_Comment_feature", "_UI_Rationale_type"), ModelelementsPackage.Literals.RATIONALE__BASE_COMMENT, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Rationale.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class RationaleItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class RationaleItemProvider extends ItemProviderAdapter implements IEditi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class RationaleItemProvider extends ItemProviderAdapter implements IEditi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class RationaleItemProvider extends ItemProviderAdapter implements IEditi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java
index 6ebd9be3e43..21d17f5c479 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.View} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ViewItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ViewItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ViewItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ViewItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addViewPointPropertyDescriptor(object);

@@ -73,29 +73,31 @@ public class ViewItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This adds a property descriptor for the View Point feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addViewPointPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_View_viewPoint_feature"), getString("_UI_PropertyDescriptor_description", "_UI_View_viewPoint_feature", "_UI_View_type"), ModelelementsPackage.Literals.VIEW__VIEW_POINT, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_View_viewPoint_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_View_viewPoint_feature", "_UI_View_type"), ModelelementsPackage.Literals.VIEW__VIEW_POINT, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Base Package feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_PackagePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_View_base_Package_feature"), getString("_UI_PropertyDescriptor_description", "_UI_View_base_Package_feature", "_UI_View_type"), ModelelementsPackage.Literals.VIEW__BASE_PACKAGE, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_View_base_Package_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_View_base_Package_feature", "_UI_View_type"), ModelelementsPackage.Literals.VIEW__BASE_PACKAGE, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns View.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -107,7 +109,7 @@ public class ViewItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -120,7 +122,7 @@ public class ViewItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +136,7 @@ public class ViewItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +148,7 @@ public class ViewItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java
index 4ebb217a6db..272540d3090 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.ViewPoint} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ViewPointItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -47,7 +47,7 @@ public class ViewPointItemProvider extends ItemProviderAdapter implements IEditi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ViewPointItemProvider(AdapterFactory adapterFactory) {

@@ -58,12 +58,12 @@ public class ViewPointItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_ClassPropertyDescriptor(object);

@@ -80,73 +80,79 @@ public class ViewPointItemProvider extends ItemProviderAdapter implements IEditi
 	 * This adds a property descriptor for the Base Class feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ClassPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_base_Class_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_base_Class_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__BASE_CLASS, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_base_Class_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_base_Class_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__BASE_CLASS, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Stake Holders feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addStakeHoldersPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_stakeHolders_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_stakeHolders_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__STAKE_HOLDERS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_stakeHolders_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_stakeHolders_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__STAKE_HOLDERS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Purpose feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addPurposePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_purpose_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_purpose_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__PURPOSE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_purpose_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_purpose_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__PURPOSE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Concerns feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addConcernsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_concerns_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_concerns_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__CONCERNS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_concerns_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_concerns_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__CONCERNS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Languages feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addLanguagesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_languages_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_languages_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__LANGUAGES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_languages_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_languages_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__LANGUAGES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Methods feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addMethodsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_methods_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_methods_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__METHODS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_methods_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_methods_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__METHODS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This returns ViewPoint.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -158,12 +164,12 @@ public class ViewPointItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((ViewPoint)object).getPurpose();

+		String label = ((ViewPoint) object).getPurpose();

 		return label == null || label.length() == 0 ? getString("_UI_ViewPoint_type") : getString("_UI_ViewPoint_type") + " " + label;

 	}

 

@@ -172,14 +178,14 @@ public class ViewPointItemProvider extends ItemProviderAdapter implements IEditi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

 

-		switch(notification.getFeatureID(ViewPoint.class)) {

+		switch (notification.getFeatureID(ViewPoint.class)) {

 		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

 		case ModelelementsPackage.VIEW_POINT__PURPOSE:

 		case ModelelementsPackage.VIEW_POINT__CONCERNS:

@@ -196,7 +202,7 @@ public class ViewPointItemProvider extends ItemProviderAdapter implements IEditi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -208,7 +214,7 @@ public class ViewPointItemProvider extends ItemProviderAdapter implements IEditi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java
index 6f78b614518..a7d24ef0072 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowPort} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class FlowPortItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -47,7 +47,7 @@ public class FlowPortItemProvider extends ItemProviderAdapter implements IEditin
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public FlowPortItemProvider(AdapterFactory adapterFactory) {

@@ -58,12 +58,12 @@ public class FlowPortItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_PortPropertyDescriptor(object);

@@ -78,51 +78,55 @@ public class FlowPortItemProvider extends ItemProviderAdapter implements IEditin
 	 * This adds a property descriptor for the Base Port feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_PortPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_base_Port_feature"), getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_base_Port_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__BASE_PORT, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_base_Port_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_base_Port_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__BASE_PORT, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Is Atomic feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addIsAtomicPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_isAtomic_feature"), getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_isAtomic_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__IS_ATOMIC, false, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_isAtomic_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_isAtomic_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__IS_ATOMIC, false, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Is Conjugated feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addIsConjugatedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_isConjugated_feature"), getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_isConjugated_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__IS_CONJUGATED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_isConjugated_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_isConjugated_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__IS_CONJUGATED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Direction feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addDirectionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_direction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_direction_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__DIRECTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_direction_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_direction_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__DIRECTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This returns FlowPort.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,12 +138,12 @@ public class FlowPortItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		FlowPort flowPort = (FlowPort)object;

+		FlowPort flowPort = (FlowPort) object;

 		return getString("_UI_FlowPort_type") + " " + flowPort.isAtomic();

 	}

 

@@ -148,14 +152,14 @@ public class FlowPortItemProvider extends ItemProviderAdapter implements IEditin
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

 

-		switch(notification.getFeatureID(FlowPort.class)) {

+		switch (notification.getFeatureID(FlowPort.class)) {

 		case PortandflowsPackage.FLOW_PORT__IS_ATOMIC:

 		case PortandflowsPackage.FLOW_PORT__IS_CONJUGATED:

 		case PortandflowsPackage.FLOW_PORT__DIRECTION:

@@ -170,7 +174,7 @@ public class FlowPortItemProvider extends ItemProviderAdapter implements IEditin
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -182,7 +186,7 @@ public class FlowPortItemProvider extends ItemProviderAdapter implements IEditin
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java
index 58c5cb056c2..db8cd891a95 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -37,7 +37,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowProperty} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class FlowPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -48,7 +48,7 @@ public class FlowPropertyItemProvider extends ItemProviderAdapter implements IEd
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public FlowPropertyItemProvider(AdapterFactory adapterFactory) {

@@ -59,12 +59,12 @@ public class FlowPropertyItemProvider extends ItemProviderAdapter implements IEd
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_PropertyPropertyDescriptor(object);

@@ -77,29 +77,31 @@ public class FlowPropertyItemProvider extends ItemProviderAdapter implements IEd
 	 * This adds a property descriptor for the Base Property feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowProperty_base_Property_feature"), getString("_UI_PropertyDescriptor_description", "_UI_FlowProperty_base_Property_feature", "_UI_FlowProperty_type"), PortandflowsPackage.Literals.FLOW_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowProperty_base_Property_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_FlowProperty_base_Property_feature", "_UI_FlowProperty_type"), PortandflowsPackage.Literals.FLOW_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Direction feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addDirectionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowProperty_direction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_FlowProperty_direction_feature", "_UI_FlowProperty_type"), PortandflowsPackage.Literals.FLOW_PROPERTY__DIRECTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowProperty_direction_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_FlowProperty_direction_feature", "_UI_FlowProperty_type"), PortandflowsPackage.Literals.FLOW_PROPERTY__DIRECTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This returns FlowProperty.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -111,12 +113,12 @@ public class FlowPropertyItemProvider extends ItemProviderAdapter implements IEd
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		FlowDirection labelValue = ((FlowProperty)object).getDirection();

+		FlowDirection labelValue = ((FlowProperty) object).getDirection();

 		String label = labelValue == null ? null : labelValue.toString();

 		return label == null || label.length() == 0 ? getString("_UI_FlowProperty_type") : getString("_UI_FlowProperty_type") + " " + label;

 	}

@@ -126,14 +128,14 @@ public class FlowPropertyItemProvider extends ItemProviderAdapter implements IEd
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

 

-		switch(notification.getFeatureID(FlowProperty.class)) {

+		switch (notification.getFeatureID(FlowProperty.class)) {

 		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 			return;

@@ -146,7 +148,7 @@ public class FlowPropertyItemProvider extends ItemProviderAdapter implements IEd
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -158,7 +160,7 @@ public class FlowPropertyItemProvider extends ItemProviderAdapter implements IEd
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java
index e385f9a3336..a5994fdf843 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class FlowSpecificationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class FlowSpecificationItemProvider extends ItemProviderAdapter implement
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public FlowSpecificationItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class FlowSpecificationItemProvider extends ItemProviderAdapter implement
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_InterfacePropertyDescriptor(object);

@@ -72,18 +72,19 @@ public class FlowSpecificationItemProvider extends ItemProviderAdapter implement
 	 * This adds a property descriptor for the Base Interface feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_InterfacePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowSpecification_base_Interface_feature"), getString("_UI_PropertyDescriptor_description", "_UI_FlowSpecification_base_Interface_feature", "_UI_FlowSpecification_type"), PortandflowsPackage.Literals.FLOW_SPECIFICATION__BASE_INTERFACE, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowSpecification_base_Interface_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_FlowSpecification_base_Interface_feature", "_UI_FlowSpecification_type"), PortandflowsPackage.Literals.FLOW_SPECIFICATION__BASE_INTERFACE, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns FlowSpecification.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +96,7 @@ public class FlowSpecificationItemProvider extends ItemProviderAdapter implement
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +109,7 @@ public class FlowSpecificationItemProvider extends ItemProviderAdapter implement
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,7 +123,7 @@ public class FlowSpecificationItemProvider extends ItemProviderAdapter implement
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +135,7 @@ public class FlowSpecificationItemProvider extends ItemProviderAdapter implement
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java
index d772819f22a..67b9a82e765 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.ItemFlow} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ItemFlowItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class ItemFlowItemProvider extends ItemProviderAdapter implements IEditin
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ItemFlowItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class ItemFlowItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_InformationFlowPropertyDescriptor(object);

@@ -73,29 +73,31 @@ public class ItemFlowItemProvider extends ItemProviderAdapter implements IEditin
 	 * This adds a property descriptor for the Base Information Flow feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_InformationFlowPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ItemFlow_base_InformationFlow_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ItemFlow_base_InformationFlow_feature", "_UI_ItemFlow_type"), PortandflowsPackage.Literals.ITEM_FLOW__BASE_INFORMATION_FLOW, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ItemFlow_base_InformationFlow_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ItemFlow_base_InformationFlow_feature", "_UI_ItemFlow_type"), PortandflowsPackage.Literals.ITEM_FLOW__BASE_INFORMATION_FLOW, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Item Property feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addItemPropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ItemFlow_itemProperty_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ItemFlow_itemProperty_feature", "_UI_ItemFlow_type"), PortandflowsPackage.Literals.ITEM_FLOW__ITEM_PROPERTY, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ItemFlow_itemProperty_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_ItemFlow_itemProperty_feature", "_UI_ItemFlow_type"), PortandflowsPackage.Literals.ITEM_FLOW__ITEM_PROPERTY, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns ItemFlow.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -107,7 +109,7 @@ public class ItemFlowItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -120,7 +122,7 @@ public class ItemFlowItemProvider extends ItemProviderAdapter implements IEditin
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +136,7 @@ public class ItemFlowItemProvider extends ItemProviderAdapter implements IEditin
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +148,7 @@ public class ItemFlowItemProvider extends ItemProviderAdapter implements IEditin
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/PortandflowsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/PortandflowsItemProviderAdapterFactory.java
index f35874f6e3b..bc944ac97ee 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/PortandflowsItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/PortandflowsItemProviderAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,7 +38,7 @@ import org.eclipse.papyrus.sysml.portandflows.util.PortandflowsAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc --> <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +46,7 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -54,7 +54,7 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -63,7 +63,7 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -71,7 +71,7 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PortandflowsItemProviderAdapterFactory() {

@@ -85,7 +85,7 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.portandflows.FlowPort} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected FlowPortItemProvider flowPortItemProvider;

@@ -93,12 +93,12 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowPort}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createFlowPortAdapter() {

-		if(flowPortItemProvider == null) {

+		if (flowPortItemProvider == null) {

 			flowPortItemProvider = new FlowPortItemProvider(this);

 		}

 

@@ -108,7 +108,7 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.portandflows.FlowProperty} instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected FlowPropertyItemProvider flowPropertyItemProvider;

@@ -116,12 +116,12 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowProperty}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createFlowPropertyAdapter() {

-		if(flowPropertyItemProvider == null) {

+		if (flowPropertyItemProvider == null) {

 			flowPropertyItemProvider = new FlowPropertyItemProvider(this);

 		}

 

@@ -131,7 +131,7 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected FlowSpecificationItemProvider flowSpecificationItemProvider;

@@ -139,12 +139,12 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createFlowSpecificationAdapter() {

-		if(flowSpecificationItemProvider == null) {

+		if (flowSpecificationItemProvider == null) {

 			flowSpecificationItemProvider = new FlowSpecificationItemProvider(this);

 		}

 

@@ -154,7 +154,7 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.portandflows.ItemFlow} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ItemFlowItemProvider itemFlowItemProvider;

@@ -162,12 +162,12 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.portandflows.ItemFlow}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createItemFlowAdapter() {

-		if(itemFlowItemProvider == null) {

+		if (itemFlowItemProvider == null) {

 			itemFlowItemProvider = new ItemFlowItemProvider(this);

 		}

 

@@ -177,9 +177,10 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This returns the root adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public ComposeableAdapterFactory getRootAdapterFactory() {

 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

 	}

@@ -187,16 +188,17 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This sets the composed adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

 		this.parentAdapterFactory = parentAdapterFactory;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -207,7 +209,7 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -217,14 +219,14 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

-		if(isFactoryForType(type)) {

+		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -235,9 +237,10 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This adds a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void addListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.addListener(notifyChangedListener);

 	}

@@ -245,9 +248,10 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This removes a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void removeListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.removeListener(notifyChangedListener);

 	}

@@ -255,13 +259,14 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void fireNotifyChanged(Notification notification) {

 		changeNotifier.fireNotifyChanged(notification);

 

-		if(parentAdapterFactory != null) {

+		if (parentAdapterFactory != null) {

 			parentAdapterFactory.fireNotifyChanged(notification);

 		}

 	}

@@ -269,18 +274,23 @@ public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterF
 	/**

 	 * This disposes all of the item providers created by this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void dispose() {

-		if(flowPortItemProvider != null)

+		if (flowPortItemProvider != null) {

 			flowPortItemProvider.dispose();

-		if(flowPropertyItemProvider != null)

+		}

+		if (flowPropertyItemProvider != null) {

 			flowPropertyItemProvider.dispose();

-		if(flowSpecificationItemProvider != null)

+		}

+		if (flowSpecificationItemProvider != null) {

 			flowSpecificationItemProvider.dispose();

-		if(itemFlowItemProvider != null)

+		}

+		if (itemFlowItemProvider != null) {

 			itemFlowItemProvider.dispose();

+		}

 	}

 

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java
index 11c4c006b40..d98d025649c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -22,7 +22,7 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
  * This is the central singleton for the SysML edit plugin.

  * <!-- begin-user-doc

  * --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public final class SysmlEditPlugin extends EMFPlugin {

@@ -30,7 +30,7 @@ public final class SysmlEditPlugin extends EMFPlugin {
 	/**

 	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static final SysmlEditPlugin INSTANCE = new SysmlEditPlugin();

@@ -38,7 +38,7 @@ public final class SysmlEditPlugin extends EMFPlugin {
 	/**

 	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static Implementation plugin;

@@ -46,18 +46,18 @@ public final class SysmlEditPlugin extends EMFPlugin {
 	/**

 	 * Create the instance.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public SysmlEditPlugin() {

-		super(new ResourceLocator[]{ EcoreEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, });

+		super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, });

 	}

 

 	/**

 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the singleton instance.

 	 * @generated

 	 */

@@ -70,7 +70,7 @@ public final class SysmlEditPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the singleton instance.

 	 * @generated

 	 */

@@ -81,7 +81,7 @@ public final class SysmlEditPlugin extends EMFPlugin {
 	/**

 	 * The actual implementation of the Eclipse <b>Plugin</b>. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static class Implementation extends EclipsePlugin {

@@ -89,7 +89,7 @@ public final class SysmlEditPlugin extends EMFPlugin {
 		/**

 		 * Creates an instance.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		public Implementation() {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
index 27da54c60a5..a7d7846267b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 Atos.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -58,19 +58,19 @@ import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
 /**

  * Get a registry of all SysML Adapter Factory classified by the UML class their

  * correspond.

- * 

+ *

  * Example:

- * 

+ *

  * <Class.class> ->[ModelelementsItemProviderAdapterFactory,

  * BlocksAdapterItemProviderFactory, RequirementsAdapterItemProviderFactory]

- * 

+ *

  * @generated

  */

 public class SysmlRegistryAdapterFactoryRegistry {

 

 	/**

 	 * Keep track of the item provider of type ModelelementsItemProviderAdapterFactory

-	 * 

+	 *

 	 * @generated

 	 */

 

@@ -78,7 +78,7 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Keep track of the item provider of type BlocksItemProviderAdapterFactory

-	 * 

+	 *

 	 * @generated

 	 */

 

@@ -86,7 +86,7 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Keep track of the item provider of type PortandflowsItemProviderAdapterFactory

-	 * 

+	 *

 	 * @generated

 	 */

 

@@ -94,7 +94,7 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Keep track of the item provider of type ConstraintsItemProviderAdapterFactory

-	 * 

+	 *

 	 * @generated

 	 */

 

@@ -102,7 +102,7 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Keep track of the item provider of type ActivitiesItemProviderAdapterFactory

-	 * 

+	 *

 	 * @generated

 	 */

 

@@ -110,7 +110,7 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Keep track of the item provider of type AllocationsItemProviderAdapterFactory

-	 * 

+	 *

 	 * @generated

 	 */

 

@@ -118,7 +118,7 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Keep track of the item provider of type RequirementsItemProviderAdapterFactory

-	 * 

+	 *

 	 * @generated

 	 */

 

@@ -126,28 +126,28 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Registry for all SysML AdapterFactory

-	 * 

+	 *

 	 * @generated

 	 */

 	private List<AdapterFactory> adapterFactoryRegistry = new ArrayList<AdapterFactory>(7);

 

 	/**

 	 * Registry of all {@link AdapterFactory} classified by corresponding UML element

-	 * 

+	 *

 	 * @generated

 	 */

 	private HashMap<EClass, ArrayList<AdapterFactory>> adapterFactoryRegistryMap = new HashMap<EClass, ArrayList<AdapterFactory>>();

 

 	/**

 	 * Default adapterFactory

-	 * 

+	 *

 	 * @generated

 	 */

 	private UMLItemProviderAdapterFactory defaultAdapterFactory = new UMLItemProviderAdapterFactory();

 

 	/**

 	 * Constructor + initialize

-	 * 

+	 *

 	 * @generated

 	 */

 	private SysmlRegistryAdapterFactoryRegistry() {

@@ -308,7 +308,7 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Singleton holder

-	 * 

+	 *

 	 * @generated

 	 */

 	private static class SingletonHolder {

@@ -328,27 +328,27 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Get the default AdapterFactory

-	 * 

+	 *

 	 * @return List<AdapterFactory> return the default adapter factory (UML)

 	 * @generated

 	 */

 	public AdapterFactory getDefaultAdapterFactory() {

-		return (AdapterFactory)defaultAdapterFactory;

+		return defaultAdapterFactory;

 	}

 

 	/**

 	 * Get the list of all AdapterFactory for this type

-	 * 

+	 *

 	 * @param Object

-	 *        element

+	 *            element

 	 * @return List<AdapterFactory> List of all the adapter factories which can handle the object element

 	 * @generated

 	 */

 	public List<AdapterFactory> getAdapterFactoriesForType(Object element) {

-		if(element instanceof EObject) {

-			EObject eObject = (EObject)element;

+		if (element instanceof EObject) {

+			EObject eObject = (EObject) element;

 			ArrayList<AdapterFactory> result = adapterFactoryRegistryMap.get(eObject.eClass());

-			if(result != null) {

+			if (result != null) {

 				return result;

 			} else {

 				return Collections.singletonList(getDefaultAdapterFactory());

@@ -360,22 +360,22 @@ public class SysmlRegistryAdapterFactoryRegistry {
 

 	/**

 	 * Set the the root AdapterFactory for all registered adapter factory

-	 * 

+	 *

 	 * @param AdapterFactory

-	 *        The adapter factory which will be the root

+	 *            The adapter factory which will be the root

 	 * @generated

 	 */

 	public void setRootAdapterFactory(IRootAdapterFactory adapter) {

-		for(AdapterFactory adap : adapterFactoryRegistry) {

-			if(adap instanceof IComposableAdapterFactory) {

-				((IComposableAdapterFactory)adap).setRootAdapterFactory(adapter);

+		for (AdapterFactory adap : adapterFactoryRegistry) {

+			if (adap instanceof IComposableAdapterFactory) {

+				((IComposableAdapterFactory) adap).setRootAdapterFactory(adapter);

 			}

 		}

 	}

 

 	/**

 	 * Get a map of all UML ItemProvider needed

-	 * 

+	 *

 	 * @generated

 	 */

 	public HashMap<EClass, ItemProviderAdapter> getUMLItemProviderClassifedByUMLElement(AdapterFactory rootAdapterFactory) {

@@ -428,5 +428,5 @@ public class SysmlRegistryAdapterFactoryRegistry {
 		return result;

 	}

 

-} //org.eclipse.papyrus.sysml.registry;

+} // org.eclipse.papyrus.sysml.registry;

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java
index 0bad9899dcd..0f14cfe615a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Copy} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class CopyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -47,7 +47,7 @@ public class CopyItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public CopyItemProvider(AdapterFactory adapterFactory) {

@@ -58,12 +58,12 @@ public class CopyItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_AbstractionPropertyDescriptor(object);

@@ -75,18 +75,19 @@ public class CopyItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This adds a property descriptor for the Base Abstraction feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Copy.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -98,7 +99,7 @@ public class CopyItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -111,7 +112,7 @@ public class CopyItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -125,7 +126,7 @@ public class CopyItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -137,7 +138,7 @@ public class CopyItemProvider extends ItemProviderAdapter implements IEditingDom
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -148,17 +149,17 @@ public class CopyItemProvider extends ItemProviderAdapter implements IEditingDom
 	/**

 	 * Compose the image with specific visibility logo

 	 * Copied from UML implementation

-	 * 

+	 *

 	 * @param object

 	 * @param composedImage

 	 * @return {@link ComposedImage}

 	 */

 	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement)object;

+		NamedElement namedElement = (NamedElement) object;

 

-		if(namedElement.isSetVisibility()) {

+		if (namedElement.isSetVisibility()) {

 			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-				+ namedElement.getVisibility().getName()));

+					+ namedElement.getVisibility().getName()));

 		}

 

 		return composedImage;

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java
index c69000e85ff..64602bbc1bc 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.DeriveReqt} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -47,7 +47,7 @@ public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEdit
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public DeriveReqtItemProvider(AdapterFactory adapterFactory) {

@@ -58,12 +58,12 @@ public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEdit
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_AbstractionPropertyDescriptor(object);

@@ -75,18 +75,19 @@ public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEdit
 	 * This adds a property descriptor for the Base Abstraction feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns DeriveReqt.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -98,7 +99,7 @@ public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEdit
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -111,7 +112,7 @@ public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEdit
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -125,7 +126,7 @@ public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEdit
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -137,7 +138,7 @@ public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEdit
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -148,17 +149,17 @@ public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEdit
 	/**

 	 * Compose the image with specific visibility logo

 	 * Copied from UML implementation

-	 * 

+	 *

 	 * @param object

 	 * @param composedImage

 	 * @return {@link ComposedImage}

 	 */

 	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement)object;

+		NamedElement namedElement = (NamedElement) object;

 

-		if(namedElement.isSetVisibility()) {

+		if (namedElement.isSetVisibility()) {

 			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-				+ namedElement.getVisibility().getName()));

+					+ namedElement.getVisibility().getName()));

 		}

 

 		return composedImage;

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java
index 6eb77fd9f35..95b2d1c0d59 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Requirement} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class RequirementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -47,7 +47,7 @@ public class RequirementItemProvider extends ItemProviderAdapter implements IEdi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementItemProvider(AdapterFactory adapterFactory) {

@@ -58,12 +58,12 @@ public class RequirementItemProvider extends ItemProviderAdapter implements IEdi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addTextPropertyDescriptor(object);

@@ -84,117 +84,127 @@ public class RequirementItemProvider extends ItemProviderAdapter implements IEdi
 	 * This adds a property descriptor for the Text feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addTextPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_text_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_text_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_text_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_text_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Id feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addIdPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_id_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_id_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_id_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_id_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Derived feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addDerivedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_derived_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_derived_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__DERIVED, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_derived_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_derived_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__DERIVED, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Derived From feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addDerivedFromPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_derivedFrom_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_derivedFrom_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__DERIVED_FROM, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_derivedFrom_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_derivedFrom_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__DERIVED_FROM, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Satisfied By feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addSatisfiedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_satisfiedBy_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_satisfiedBy_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__SATISFIED_BY, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_satisfiedBy_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_satisfiedBy_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__SATISFIED_BY, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Refined By feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addRefinedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_refinedBy_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_refinedBy_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__REFINED_BY, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_refinedBy_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_refinedBy_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__REFINED_BY, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Traced To feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addTracedToPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_tracedTo_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_tracedTo_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__TRACED_TO, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_tracedTo_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_tracedTo_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__TRACED_TO, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Verified By feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addVerifiedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_verifiedBy_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_verifiedBy_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__VERIFIED_BY, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_verifiedBy_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_verifiedBy_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__VERIFIED_BY, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Master feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addMasterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_master_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_master_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__MASTER, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_master_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_master_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__MASTER, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Base Class feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_ClassPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_base_Class_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Requirement_base_Class_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__BASE_CLASS, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_base_Class_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_base_Class_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__BASE_CLASS, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Requirement.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -206,12 +216,12 @@ public class RequirementItemProvider extends ItemProviderAdapter implements IEdi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((Requirement)object).getId();

+		String label = ((Requirement) object).getId();

 		return label == null || label.length() == 0 ? getString("_UI_Requirement_type") : getString("_UI_Requirement_type") + " " + label;

 	}

 

@@ -220,14 +230,14 @@ public class RequirementItemProvider extends ItemProviderAdapter implements IEdi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

 

-		switch(notification.getFeatureID(Requirement.class)) {

+		switch (notification.getFeatureID(Requirement.class)) {

 		case RequirementsPackage.REQUIREMENT__TEXT:

 		case RequirementsPackage.REQUIREMENT__ID:

 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

@@ -241,7 +251,7 @@ public class RequirementItemProvider extends ItemProviderAdapter implements IEdi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -253,7 +263,7 @@ public class RequirementItemProvider extends ItemProviderAdapter implements IEdi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java
index 81600df1724..f8d54eb47d3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class RequirementRelatedItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class RequirementRelatedItemProvider extends ItemProviderAdapter implemen
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementRelatedItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class RequirementRelatedItemProvider extends ItemProviderAdapter implemen
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_NamedElementPropertyDescriptor(object);

@@ -76,62 +76,67 @@ public class RequirementRelatedItemProvider extends ItemProviderAdapter implemen
 	 * This adds a property descriptor for the Base Named Element feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_NamedElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_base_NamedElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_base_NamedElement_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_base_NamedElement_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_base_NamedElement_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Traced From feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addTracedFromPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_tracedFrom_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_tracedFrom_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__TRACED_FROM, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_tracedFrom_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_tracedFrom_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__TRACED_FROM, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Satisfies feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addSatisfiesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_satisfies_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_satisfies_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__SATISFIES, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_satisfies_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_satisfies_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__SATISFIES, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Refines feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addRefinesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_refines_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_refines_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__REFINES, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_refines_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_refines_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__REFINES, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Verifies feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addVerifiesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_verifies_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_verifies_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__VERIFIES, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_verifies_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_verifies_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__VERIFIES, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This returns RequirementRelated.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -143,7 +148,7 @@ public class RequirementRelatedItemProvider extends ItemProviderAdapter implemen
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -156,7 +161,7 @@ public class RequirementRelatedItemProvider extends ItemProviderAdapter implemen
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -170,7 +175,7 @@ public class RequirementRelatedItemProvider extends ItemProviderAdapter implemen
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -182,7 +187,7 @@ public class RequirementRelatedItemProvider extends ItemProviderAdapter implemen
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementsItemProviderAdapterFactory.java
index 6fcdebb0788..f2f89d0479f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementsItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementsItemProviderAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,7 +38,7 @@ import org.eclipse.papyrus.sysml.requirements.util.RequirementsAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc --> <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +46,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -54,7 +54,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -63,7 +63,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -71,7 +71,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementsItemProviderAdapterFactory() {

@@ -85,7 +85,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.DeriveReqt} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected DeriveReqtItemProvider deriveReqtItemProvider;

@@ -93,12 +93,12 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.DeriveReqt}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createDeriveReqtAdapter() {

-		if(deriveReqtItemProvider == null) {

+		if (deriveReqtItemProvider == null) {

 			deriveReqtItemProvider = new DeriveReqtItemProvider(this);

 		}

 

@@ -108,7 +108,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.Verify} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected VerifyItemProvider verifyItemProvider;

@@ -116,12 +116,12 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.Verify}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createVerifyAdapter() {

-		if(verifyItemProvider == null) {

+		if (verifyItemProvider == null) {

 			verifyItemProvider = new VerifyItemProvider(this);

 		}

 

@@ -131,7 +131,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.Copy} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected CopyItemProvider copyItemProvider;

@@ -140,12 +140,12 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.Copy}.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createCopyAdapter() {

-		if(copyItemProvider == null) {

+		if (copyItemProvider == null) {

 			copyItemProvider = new CopyItemProvider(this);

 		}

 

@@ -155,7 +155,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.Satisfy} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected SatisfyItemProvider satisfyItemProvider;

@@ -163,12 +163,12 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.Satisfy}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createSatisfyAdapter() {

-		if(satisfyItemProvider == null) {

+		if (satisfyItemProvider == null) {

 			satisfyItemProvider = new SatisfyItemProvider(this);

 		}

 

@@ -178,7 +178,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.TestCase} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected TestCaseItemProvider testCaseItemProvider;

@@ -186,12 +186,12 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.TestCase}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createTestCaseAdapter() {

-		if(testCaseItemProvider == null) {

+		if (testCaseItemProvider == null) {

 			testCaseItemProvider = new TestCaseItemProvider(this);

 		}

 

@@ -201,7 +201,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.Requirement} instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RequirementItemProvider requirementItemProvider;

@@ -209,12 +209,12 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.Requirement}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createRequirementAdapter() {

-		if(requirementItemProvider == null) {

+		if (requirementItemProvider == null) {

 			requirementItemProvider = new RequirementItemProvider(this);

 		}

 

@@ -224,7 +224,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated} instances. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RequirementRelatedItemProvider requirementRelatedItemProvider;

@@ -232,12 +232,12 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated}. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Adapter createRequirementRelatedAdapter() {

-		if(requirementRelatedItemProvider == null) {

+		if (requirementRelatedItemProvider == null) {

 			requirementRelatedItemProvider = new RequirementRelatedItemProvider(this);

 		}

 

@@ -247,9 +247,10 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This returns the root adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public ComposeableAdapterFactory getRootAdapterFactory() {

 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

 	}

@@ -257,16 +258,17 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This sets the composed adapter factory that contains this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

 		this.parentAdapterFactory = parentAdapterFactory;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -277,7 +279,7 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -287,14 +289,14 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

-		if(isFactoryForType(type)) {

+		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -305,9 +307,10 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This adds a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void addListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.addListener(notifyChangedListener);

 	}

@@ -315,9 +318,10 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This removes a listener.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void removeListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.removeListener(notifyChangedListener);

 	}

@@ -325,13 +329,14 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void fireNotifyChanged(Notification notification) {

 		changeNotifier.fireNotifyChanged(notification);

 

-		if(parentAdapterFactory != null) {

+		if (parentAdapterFactory != null) {

 			parentAdapterFactory.fireNotifyChanged(notification);

 		}

 	}

@@ -339,24 +344,32 @@ public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterF
 	/**

 	 * This disposes all of the item providers created by this factory. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void dispose() {

-		if(deriveReqtItemProvider != null)

+		if (deriveReqtItemProvider != null) {

 			deriveReqtItemProvider.dispose();

-		if(verifyItemProvider != null)

+		}

+		if (verifyItemProvider != null) {

 			verifyItemProvider.dispose();

-		if(copyItemProvider != null)

+		}

+		if (copyItemProvider != null) {

 			copyItemProvider.dispose();

-		if(satisfyItemProvider != null)

+		}

+		if (satisfyItemProvider != null) {

 			satisfyItemProvider.dispose();

-		if(testCaseItemProvider != null)

+		}

+		if (testCaseItemProvider != null) {

 			testCaseItemProvider.dispose();

-		if(requirementItemProvider != null)

+		}

+		if (requirementItemProvider != null) {

 			requirementItemProvider.dispose();

-		if(requirementRelatedItemProvider != null)

+		}

+		if (requirementRelatedItemProvider != null) {

 			requirementRelatedItemProvider.dispose();

+		}

 	}

 

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java
index 4d0f712c0bf..e3ea202a05b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Satisfy} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class SatisfyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -47,7 +47,7 @@ public class SatisfyItemProvider extends ItemProviderAdapter implements IEditing
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public SatisfyItemProvider(AdapterFactory adapterFactory) {

@@ -58,12 +58,12 @@ public class SatisfyItemProvider extends ItemProviderAdapter implements IEditing
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_AbstractionPropertyDescriptor(object);

@@ -75,18 +75,19 @@ public class SatisfyItemProvider extends ItemProviderAdapter implements IEditing
 	 * This adds a property descriptor for the Base Abstraction feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Satisfy.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -98,7 +99,7 @@ public class SatisfyItemProvider extends ItemProviderAdapter implements IEditing
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -111,7 +112,7 @@ public class SatisfyItemProvider extends ItemProviderAdapter implements IEditing
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -125,7 +126,7 @@ public class SatisfyItemProvider extends ItemProviderAdapter implements IEditing
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -137,7 +138,7 @@ public class SatisfyItemProvider extends ItemProviderAdapter implements IEditing
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -148,17 +149,17 @@ public class SatisfyItemProvider extends ItemProviderAdapter implements IEditing
 	/**

 	 * Compose the image with specific visibility logo

 	 * Copied from UML implementation

-	 * 

+	 *

 	 * @param object

 	 * @param composedImage

 	 * @return {@link ComposedImage}

 	 */

 	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement)object;

+		NamedElement namedElement = (NamedElement) object;

 

-		if(namedElement.isSetVisibility()) {

+		if (namedElement.isSetVisibility()) {

 			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-				+ namedElement.getVisibility().getName()));

+					+ namedElement.getVisibility().getName()));

 		}

 

 		return composedImage;

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java
index 1d293a8c6b7..975ffb34529 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.TestCase} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class TestCaseItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -44,7 +44,7 @@ public class TestCaseItemProvider extends ItemProviderAdapter implements IEditin
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public TestCaseItemProvider(AdapterFactory adapterFactory) {

@@ -55,12 +55,12 @@ public class TestCaseItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_BehaviorPropertyDescriptor(object);

@@ -74,40 +74,43 @@ public class TestCaseItemProvider extends ItemProviderAdapter implements IEditin
 	 * This adds a property descriptor for the Base Behavior feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_BehaviorPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Behavior_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Behavior_feature", "_UI_TestCase_type"), RequirementsPackage.Literals.TEST_CASE__BASE_BEHAVIOR, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Behavior_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Behavior_feature", "_UI_TestCase_type"), RequirementsPackage.Literals.TEST_CASE__BASE_BEHAVIOR, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Base Operation feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_OperationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Operation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Operation_feature", "_UI_TestCase_type"), RequirementsPackage.Literals.TEST_CASE__BASE_OPERATION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Operation_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Operation_feature", "_UI_TestCase_type"), RequirementsPackage.Literals.TEST_CASE__BASE_OPERATION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Verifies feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addVerifiesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_verifies_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestCase_verifies_feature", "_UI_TestCase_type"), RequirementsPackage.Literals.TEST_CASE__VERIFIES, false, false, false, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_verifies_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_TestCase_verifies_feature", "_UI_TestCase_type"), RequirementsPackage.Literals.TEST_CASE__VERIFIES, false, false, false, null, null, null));

 	}

 

 	/**

 	 * This returns TestCase.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -119,7 +122,7 @@ public class TestCaseItemProvider extends ItemProviderAdapter implements IEditin
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -132,7 +135,7 @@ public class TestCaseItemProvider extends ItemProviderAdapter implements IEditin
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -146,7 +149,7 @@ public class TestCaseItemProvider extends ItemProviderAdapter implements IEditin
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -158,7 +161,7 @@ public class TestCaseItemProvider extends ItemProviderAdapter implements IEditin
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java
index c49b3a15d2f..c5b6aca0a2c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Verify} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class VerifyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

@@ -47,7 +47,7 @@ public class VerifyItemProvider extends ItemProviderAdapter implements IEditingD
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public VerifyItemProvider(AdapterFactory adapterFactory) {

@@ -58,12 +58,12 @@ public class VerifyItemProvider extends ItemProviderAdapter implements IEditingD
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if(itemPropertyDescriptors == null) {

+		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

 			addBase_AbstractionPropertyDescriptor(object);

@@ -75,18 +75,19 @@ public class VerifyItemProvider extends ItemProviderAdapter implements IEditingD
 	 * This adds a property descriptor for the Base Abstraction feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),

+				getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

 	}

 

 	/**

 	 * This returns Verify.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -98,7 +99,7 @@ public class VerifyItemProvider extends ItemProviderAdapter implements IEditingD
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -111,7 +112,7 @@ public class VerifyItemProvider extends ItemProviderAdapter implements IEditingD
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -125,7 +126,7 @@ public class VerifyItemProvider extends ItemProviderAdapter implements IEditingD
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -137,7 +138,7 @@ public class VerifyItemProvider extends ItemProviderAdapter implements IEditingD
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -148,17 +149,17 @@ public class VerifyItemProvider extends ItemProviderAdapter implements IEditingD
 	/**

 	 * Compose the image with specific visibility logo

 	 * Copied from UML implementation

-	 * 

+	 *

 	 * @param object

 	 * @param composedImage

 	 * @return {@link ComposedImage}

 	 */

 	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement)object;

+		NamedElement namedElement = (NamedElement) object;

 

-		if(namedElement.isSetVisibility()) {

+		if (namedElement.isSetVisibility()) {

 			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-				+ namedElement.getVisibility().getName()));

+					+ namedElement.getVisibility().getName()));

 		}

 

 		return composedImage;

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java
index f47faff562a..0ebf92372d5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,117 +21,117 @@ public class SysMLElementTypes extends AbstractElementTypeEnumerator {
 	public static final String SYSML_NATURE = "SysML_Nature";
 
 	/** IElementType for SysML ActorPartProperty */
-	public static final IHintedType ACTOR_PART_PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ActorPartProperty"); //$NON-NLS-1$
+	public static final IHintedType ACTOR_PART_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ActorPartProperty"); //$NON-NLS-1$
 
 	/** IElementType for SysML Allocate */
-	public static final IHintedType ALLOCATE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Allocate"); //$NON-NLS-1$
+	public static final IHintedType ALLOCATE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Allocate"); //$NON-NLS-1$
 
 	/** IElementType for SysML Association (Association with SysML nature) */
-	public static final IHintedType ASSOCIATION = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Association"); //$NON-NLS-1$
+	public static final IHintedType ASSOCIATION = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Association"); //$NON-NLS-1$
 
 	/** IElementType for SysML Association with "aggregation = composite" (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_COMPOSITE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.AssociationComposite"); //$NON-NLS-1$
+	public static final IHintedType ASSOCIATION_COMPOSITE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationComposite"); //$NON-NLS-1$
 
 	/** IElementType for SysML Association with "aggregation = composite" and navigable in one-way (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_COMPOSITE_DIRECTED = (IHintedType)getElementType("org.eclipse.papyrus.sysml.AssociationCompositeDirected"); //$NON-NLS-1$
+	public static final IHintedType ASSOCIATION_COMPOSITE_DIRECTED = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationCompositeDirected"); //$NON-NLS-1$
 
 	/** IElementType for SysML Association with "aggregation = none" (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_NONE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.AssociationNone"); //$NON-NLS-1$
+	public static final IHintedType ASSOCIATION_NONE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationNone"); //$NON-NLS-1$
 
 	/** IElementType for SysML Association with "aggregation = none" and navigable in one-way (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_NONE_DIRECTED = (IHintedType)getElementType("org.eclipse.papyrus.sysml.AssociationNoneDirected"); //$NON-NLS-1$
+	public static final IHintedType ASSOCIATION_NONE_DIRECTED = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationNoneDirected"); //$NON-NLS-1$
 
 	/** IElementType for SysML Association with "aggregation = shared" (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_SHARED = (IHintedType)getElementType("org.eclipse.papyrus.sysml.AssociationShared"); //$NON-NLS-1$
+	public static final IHintedType ASSOCIATION_SHARED = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationShared"); //$NON-NLS-1$
 
 	/** IElementType for SysML Association with "aggregation = shared" and navigable in one-way (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_SHARED_DIRECTED = (IHintedType)getElementType("org.eclipse.papyrus.sysml.AssociationSharedDirected"); //$NON-NLS-1$
-	
+	public static final IHintedType ASSOCIATION_SHARED_DIRECTED = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationSharedDirected"); //$NON-NLS-1$
+
 	/** IElementType for SysML Block */
-	public static final IHintedType BLOCK = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Block"); //$NON-NLS-1$
-	
+	public static final IHintedType BLOCK = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Block"); //$NON-NLS-1$
+
 	/** IElementType for SysML Conform */
-	public static final IHintedType CONFORM = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Conform"); //$NON-NLS-1$
-	
+	public static final IHintedType CONFORM = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Conform"); //$NON-NLS-1$
+
 	/** IElementType for SysML ConstraintBlock */
-	public static final IHintedType CONSTRAINT_BLOCK = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ConstraintBlock"); //$NON-NLS-1$
-	
+	public static final IHintedType CONSTRAINT_BLOCK = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ConstraintBlock"); //$NON-NLS-1$
+
 	/** IElementType for SysML ConstraintProperty */
-	public static final IHintedType CONSTRAINT_PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ConstraintProperty"); //$NON-NLS-1$
-	
+	public static final IHintedType CONSTRAINT_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ConstraintProperty"); //$NON-NLS-1$
+
 	/** IElementType for SysML Copy */
-	public static final IHintedType COPY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Copy"); //$NON-NLS-1$
-	
+	public static final IHintedType COPY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Copy"); //$NON-NLS-1$
+
 	/** IElementType for SysML DeriveReqt */
-	public static final IHintedType DERIVE_REQT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.DeriveReqt"); //$NON-NLS-1$
-	
+	public static final IHintedType DERIVE_REQT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.DeriveReqt"); //$NON-NLS-1$
+
 	/** IElementType for SysML Dimension */
-	public static final IHintedType DIMENSION = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Dimension"); //$NON-NLS-1$
-	
+	public static final IHintedType DIMENSION = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Dimension"); //$NON-NLS-1$
+
 	/** IElementType for SysML FlowPort */
-	public static final IHintedType FLOW_PORT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort"); //$NON-NLS-1$
-	
+	public static final IHintedType FLOW_PORT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort"); //$NON-NLS-1$
+
 	/** IElementType for SysML FlowPort_InOut */
-	public static final IHintedType FLOW_PORT_IN_OUT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort_InOut"); //$NON-NLS-1$
-	
+	public static final IHintedType FLOW_PORT_IN_OUT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort_InOut"); //$NON-NLS-1$
+
 	/** IElementType for SysML FlowPort_In */
-	public static final IHintedType FLOW_PORT_IN = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort_In"); //$NON-NLS-1$
-	
+	public static final IHintedType FLOW_PORT_IN = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort_In"); //$NON-NLS-1$
+
 	/** IElementType for SysML FlowPort_Out */
-	public static final IHintedType FLOW_PORT_OUT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort_Out"); //$NON-NLS-1$
+	public static final IHintedType FLOW_PORT_OUT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort_Out"); //$NON-NLS-1$
 
 	/** IElementType for SysML FlowPort_NA */
-	public static final IHintedType FLOW_PORT_NA = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort_NA"); //$NON-NLS-1$
-	
+	public static final IHintedType FLOW_PORT_NA = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort_NA"); //$NON-NLS-1$
+
 	/** IElementType for SysML FlowProperty */
-	public static final IHintedType FLOW_PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowProperty"); //$NON-NLS-1$
-	
+	public static final IHintedType FLOW_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowProperty"); //$NON-NLS-1$
+
 	/** IElementType for SysML FlowSpecification */
-	public static final IHintedType FLOW_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowSpecification"); //$NON-NLS-1$
-	
+	public static final IHintedType FLOW_SPECIFICATION = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowSpecification"); //$NON-NLS-1$
+
 	/** IElementType for SysML ItemFlow */
-	public static final IHintedType ITEM_FLOW = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ItemFlow"); //$NON-NLS-1$
-	
+	public static final IHintedType ITEM_FLOW = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ItemFlow"); //$NON-NLS-1$
+
 	/** IElementType for SysML Part (Property) */
-	public static final IHintedType PART_PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.PartProperty"); //$NON-NLS-1$
-	
+	public static final IHintedType PART_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.PartProperty"); //$NON-NLS-1$
+
 	/** IElementType for SysML Problem */
-	public static final IHintedType PROBLEM = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Problem"); //$NON-NLS-1$
-	
+	public static final IHintedType PROBLEM = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Problem"); //$NON-NLS-1$
+
 	/** IElementType for SysML Rationale */
-	public static final IHintedType RATIONALE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Rationale"); //$NON-NLS-1$
-	
+	public static final IHintedType RATIONALE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Rationale"); //$NON-NLS-1$
+
 	/** IElementType for SysML Reference (Property) */
-	public static final IHintedType REFERENCE_PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ReferenceProperty"); //$NON-NLS-1$
-	
+	public static final IHintedType REFERENCE_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ReferenceProperty"); //$NON-NLS-1$
+
 	/** IElementType for SysML Requirement */
-	public static final IHintedType REQUIREMENT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Requirement"); //$NON-NLS-1$
-	
+	public static final IHintedType REQUIREMENT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Requirement"); //$NON-NLS-1$
+
 	/** IElementType for SysML Satisfy */
-	public static final IHintedType SATISFY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Satisfy"); //$NON-NLS-1$
-	
+	public static final IHintedType SATISFY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Satisfy"); //$NON-NLS-1$
+
 	/** IElementType for SysML Unit */
-	public static final IHintedType UNIT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Unit"); //$NON-NLS-1$
-	
+	public static final IHintedType UNIT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Unit"); //$NON-NLS-1$
+
 	/** IElementType for SysML Value (Property) */
-	public static final IHintedType VALUE_PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ValueProperty"); //$NON-NLS-1$
-	
+	public static final IHintedType VALUE_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ValueProperty"); //$NON-NLS-1$
+
 	/** IElementType for SysML ValueType */
-	public static final IHintedType VALUE_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ValueType"); //$NON-NLS-1$
-	
+	public static final IHintedType VALUE_TYPE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ValueType"); //$NON-NLS-1$
+
 	/** IElementType for SysML ValueType_Enumeration */
-	public static final IHintedType VALUE_TYPE_ENUMERATION = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ValueType_Enumeration"); //$NON-NLS-1$
-	
+	public static final IHintedType VALUE_TYPE_ENUMERATION = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ValueType_Enumeration"); //$NON-NLS-1$
+
 	/** IElementType for SysML ValueType_PrimitiveType */
-	public static final IHintedType VALUE_TYPE_PRIMITIVE_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ValueType_PrimitiveType"); //$NON-NLS-1$
-	
+	public static final IHintedType VALUE_TYPE_PRIMITIVE_TYPE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ValueType_PrimitiveType"); //$NON-NLS-1$
+
 	/** IElementType for SysML Verify */
-	public static final IHintedType VERIFY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Verify"); //$NON-NLS-1$
-	
+	public static final IHintedType VERIFY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Verify"); //$NON-NLS-1$
+
 	/** IElementType for SysML View */
-	public static final IHintedType VIEW = (IHintedType)getElementType("org.eclipse.papyrus.sysml.View"); //$NON-NLS-1$
-	
+	public static final IHintedType VIEW = (IHintedType) getElementType("org.eclipse.papyrus.sysml.View"); //$NON-NLS-1$
+
 	/** IElementType for SysML ViewPoint */
-	public static final IHintedType VIEW_POINT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ViewPoint"); //$NON-NLS-1$
-	
+	public static final IHintedType VIEW_POINT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ViewPoint"); //$NON-NLS-1$
+
 }
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/filter/SysmlCommandFilter.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/filter/SysmlCommandFilter.java
index 0c3871d26a3..7fcaa6ee3d9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/filter/SysmlCommandFilter.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/filter/SysmlCommandFilter.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,9 +24,9 @@ import org.eclipse.papyrus.uml.service.types.filter.ICommandFilter;
 
 /**
  * Filter for available Sysml commands. Moved from oep.sysml.modelexplorer
- * 
+ *
  * @author JC236769
- * 
+ *
  */
 public class SysmlCommandFilter implements ICommandFilter {
 
@@ -36,13 +36,13 @@ public class SysmlCommandFilter implements ICommandFilter {
 	public static final SysmlCommandFilter INSTANCE = new SysmlCommandFilter();
 
 	private SysmlCommandFilter() {
-		//to prevent instantiation
+		// to prevent instantiation
 	}
 
 	private List<IElementType> visibleCommands;
 
 	public List<IElementType> getVisibleCommands() {
-		if(visibleCommands == null) {
+		if (visibleCommands == null) {
 			List<IElementType> localVisibleCommands = new ArrayList<IElementType>();
 
 			localVisibleCommands = new ArrayList<IElementType>();
@@ -86,7 +86,7 @@ public class SysmlCommandFilter implements ICommandFilter {
 			localVisibleCommands.add(SysMLElementTypes.VIEW);
 			localVisibleCommands.add(SysMLElementTypes.VIEW_POINT);
 
-			// UMLElementTypes.PROPERTY is required by ConstraintBlock Parameter 
+			// UMLElementTypes.PROPERTY is required by ConstraintBlock Parameter
 			localVisibleCommands.add(UMLElementTypes.PROPERTY);
 
 			this.visibleCommands = Collections.unmodifiableList(localVisibleCommands);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/Activator.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/Activator.java
index c8358dc9801..da0e7aff563 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/Activator.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,7 +33,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/** Default constructor */
 	public Activator() {
-		
+
 	}
 
 	/*
@@ -41,6 +41,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -52,6 +53,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
@@ -59,7 +61,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getDefault() {
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/command/SetNestedPathCommand.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/command/SetNestedPathCommand.java
index 1d2a87c1dba..b909f77573b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/command/SetNestedPathCommand.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/command/SetNestedPathCommand.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -60,20 +60,25 @@ public class SetNestedPathCommand extends EditElementCommand {
 	public final static int NESTED_TARGET = 2;
 
 	/**
-	 * Indicates whether or not the source of the target of the {@link Connector} is nested. 
+	 * Indicates whether or not the source of the target of the {@link Connector} is nested.
 	 * One of {@link #NESTED_SOURCE} or {@link #NESTED_TARGET}.
 	 */
 	private final int nestedEndDirection;
 
 	/**
-	 * 
+	 *
 	 * Constructor.
 	 *
-	 * @param label the command label.
-	 * @param elementToEdit the element to edit.
-	 * @param request the request this command contribute to ({@link CreateRelationshipRequest} or {@link ReorientRelationshipRequest})
-	 * @param nestedPath the property path to set (in {@link NestedConnectorEnd#getPropertyPath()} ).
-	 * @param nestedEndDirection the direction ({@link #NESTED_SOURCE} or {@link #NESTED_TARGET}) of the {@link ConnectorEnd} to modify.
+	 * @param label
+	 *            the command label.
+	 * @param elementToEdit
+	 *            the element to edit.
+	 * @param request
+	 *            the request this command contribute to ({@link CreateRelationshipRequest} or {@link ReorientRelationshipRequest})
+	 * @param nestedPath
+	 *            the property path to set (in {@link NestedConnectorEnd#getPropertyPath()} ).
+	 * @param nestedEndDirection
+	 *            the direction ({@link #NESTED_SOURCE} or {@link #NESTED_TARGET}) of the {@link ConnectorEnd} to modify.
 	 */
 	public SetNestedPathCommand(String label, EObject elementToEdit, IEditCommandRequest request, List<Property> nestedPath, int nestedEndDirection) {
 		super(label, elementToEdit, request);
@@ -84,59 +89,62 @@ public class SetNestedPathCommand extends EditElementCommand {
 	/**
 	 * Test whether the command can be executed or not.
 	 */
+	@Override
 	public boolean canExecute() {
 
 		// Verify the kind of request
-		if(! (getRequest() instanceof CreateRelationshipRequest) 
-			&& ! (getRequest() instanceof ReorientRelationshipRequest)) {
-			
+		if (!(getRequest() instanceof CreateRelationshipRequest)
+				&& !(getRequest() instanceof ReorientRelationshipRequest)) {
+
 			return false;
 		}
 
 		// Verify (basic) that the related Connector well-formed.
 		// In case of Connector creation, the connector is most probably not created yet
 		if ((getConnector() != null)
-			&& (getConnector().getEnds().size() != 2)) {
-			
+				&& (getConnector().getEnds().size() != 2)) {
+
 			return false; // binary connector expected.
 		}
-		
+
 		return true;
 	}
 
+	@Override
 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if(!canExecute()) {
+		if (!canExecute()) {
 			throw new ExecutionException("Unexecutable command."); //$NON-NLS-1$
 		}
 
 		ConnectorEnd modifiedEnd = getModifiedConnectorEnd();
 		NestedConnectorEnd nestedConnectorEnd = UMLUtil.getStereotypeApplication(modifiedEnd, NestedConnectorEnd.class);
 
-		if(nestedPath.isEmpty()) {
+		if (nestedPath.isEmpty()) {
 			// Remove stereotype if applied
-			if(nestedConnectorEnd != null) {
+			if (nestedConnectorEnd != null) {
 				EcoreUtil.delete(nestedConnectorEnd, true);
 			}
 
 		} else {
 			// Add stereotype if not applied and set new path if different from existing
-			if(nestedConnectorEnd == null) {
+			if (nestedConnectorEnd == null) {
 				// apply stereotype
-				nestedConnectorEnd = (NestedConnectorEnd)StereotypeApplicationHelper.INSTANCE.applyStereotype(modifiedEnd, BlocksPackage.eINSTANCE.getNestedConnectorEnd());
+				nestedConnectorEnd = (NestedConnectorEnd) StereotypeApplicationHelper.INSTANCE.applyStereotype(modifiedEnd, BlocksPackage.eINSTANCE.getNestedConnectorEnd());
 			}
 
 			// Set path
-			if(!nestedConnectorEnd.getPropertyPath().equals(nestedPath)) {
+			if (!nestedConnectorEnd.getPropertyPath().equals(nestedPath)) {
 				nestedConnectorEnd.getPropertyPath().clear();
 				nestedConnectorEnd.getPropertyPath().addAll(nestedPath);
 			}
 		}
-		
+
 		return CommandResult.newOKCommandResult(getConnector());
 	}
 
 	/**
 	 * Get the {@link ConnectorEnd} currently modified by the command.
+	 * 
 	 * @return the modified {@link ConnectorEnd}.
 	 */
 	private ConnectorEnd getModifiedConnectorEnd() {
@@ -145,16 +153,17 @@ public class SetNestedPathCommand extends EditElementCommand {
 
 	/**
 	 * Get the {@link Connector} currently under creation or re-orient that hold {@link ConnectorEnd} to update.
+	 * 
 	 * @return the related {@link Connector}.
 	 */
 	private Connector getConnector() {
 		Connector connector = null;
-		if(getRequest() instanceof CreateRelationshipRequest) {
-			connector = (Connector)((CreateRelationshipRequest)getRequest()).getNewElement();
+		if (getRequest() instanceof CreateRelationshipRequest) {
+			connector = (Connector) ((CreateRelationshipRequest) getRequest()).getNewElement();
 		}
 
-		if(getRequest() instanceof ReorientRelationshipRequest) {
-			connector = (Connector)((ReorientRelationshipRequest)getRequest()).getRelationship();
+		if (getRequest() instanceof ReorientRelationshipRequest) {
+			connector = (Connector) ((ReorientRelationshipRequest) getRequest()).getRelationship();
 		}
 		return connector;
 	}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateCommandHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateCommandHandler.java
index e3d23cd7930..c6f4b83145a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateCommandHandler.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateCommandHandler.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,15 +16,16 @@ import org.eclipse.papyrus.uml.service.types.filter.ICommandFilter;
 import org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler;
 
 /**
- * 
+ *
  * Abstract handler for every creation command for Sysml elements
  * used in the ModelExplorer contextual ("Create new child") menu
- * 
+ *
  */
 public abstract class AbstractSysmlCreateCommandHandler extends AbstractCreateCommandHandler {
 
 	private static final ICommandFilter filter = SysmlCommandFilter.INSTANCE;
 
+	@Override
 	public ICommandFilter getCommandFilter() {
 		return filter;
 	}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AbstractPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AbstractPropertyEditHelperAdvice.java
index f341bbb284b..c6034515965 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AbstractPropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AbstractPropertyEditHelperAdvice.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.eclipse.papyrus.sysml.service.types.helper;
 
@@ -31,7 +31,7 @@ import org.eclipse.uml2.uml.Property;
  * Abstract edit helper advice for SysML specific Properties: part and reference
  */
 public abstract class AbstractPropertyEditHelperAdvice extends AbstractEditHelperAdvice {
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -39,54 +39,56 @@ public abstract class AbstractPropertyEditHelperAdvice extends AbstractEditHelpe
 	protected ICommand getBeforeDuplicateCommand(DuplicateElementsRequest request) {
 		Object targetContainer = request.getParameter("Target_Owner");
 		// additional element should be a set of elements that will be duplicated. If this is null, the request will be ignored.
-		if(!(targetContainer instanceof EObject)) {
+		if (!(targetContainer instanceof EObject)) {
 			return super.getBeforeDuplicateCommand(request);
 		}
 		Property propertyToBeDuplicated = getDuplicatedProperty(request);
-		if(propertyToBeDuplicated == null) {
+		if (propertyToBeDuplicated == null) {
 			return super.getBeforeDuplicateCommand(request);
 		}
 
-		Property newPart = (Property)request.getAllDuplicatedElementsMap().get(propertyToBeDuplicated);
-		if(newPart == null) {
+		Property newPart = (Property) request.getAllDuplicatedElementsMap().get(propertyToBeDuplicated);
+		if (newPart == null) {
 			Activator.log.debug("Trying to create a command for a new sysml property which has not been created yet");
 			return super.getBeforeDuplicateCommand(request);
 		}
 
 		// check association has not be duplicated yet
 		Association originalAssociation = propertyToBeDuplicated.getAssociation();
-		Association newAssociation = (Association)request.getAllDuplicatedElementsMap().get(originalAssociation);
-		if(newAssociation != null && newAssociation.equals(newPart.getAssociation())) {
+		Association newAssociation = (Association) request.getAllDuplicatedElementsMap().get(originalAssociation);
+		if (newAssociation != null && newAssociation.equals(newPart.getAssociation())) {
 			return super.getBeforeDuplicateCommand(request);
 		}
 
 		TransactionalEditingDomain editingDomain = getEditingDomain(propertyToBeDuplicated);
-		if(editingDomain == null) {
+		if (editingDomain == null) {
 			return super.getBeforeDuplicateCommand(request);
 		}
 
-		Package targetPackage = getTargetContainer((EObject)targetContainer, propertyToBeDuplicated, newPart, request.getAllDuplicatedElementsMap());
+		Package targetPackage = getTargetContainer((EObject) targetContainer, propertyToBeDuplicated, newPart, request.getAllDuplicatedElementsMap());
 		return new DuplicatePapyrusAssociationCommand(editingDomain, "Duplicate Association", originalAssociation, request.getAllDuplicatedElementsMap(), targetPackage);
 	}
 
 	/**
 	 * Returns the duplicate Part or Reference.
-	 * @param request the duplicate request for which we try to find the property
+	 * 
+	 * @param request
+	 *            the duplicate request for which we try to find the property
 	 * @return the found Property
 	 */
 	protected abstract Property getDuplicatedProperty(DuplicateElementsRequest request);
 
 	/**
 	 * Computes the target container for the new association
-	 * 
+	 *
 	 * @param targetContainer
-	 *        the target container of the association creation request
+	 *            the target container of the association creation request
 	 * @param partToBeDuplicated
-	 *        the part which was duplicated
+	 *            the part which was duplicated
 	 * @param newPart
-	 *        the new part linked to the association
+	 *            the new part linked to the association
 	 * @param allDuplicatedElementsMap
-	 *        the map of all duplicated elements
+	 *            the map of all duplicated elements
 	 * @return the target {@link Package} for the new association or <code>null</code> if no package was found
 	 */
 	protected Package getTargetContainer(EObject targetContainer, Property partToBeDuplicated, Property newPart, Map allDuplicatedElementsMap) {
@@ -97,23 +99,23 @@ public abstract class AbstractPropertyEditHelperAdvice extends AbstractEditHelpe
 		// 4. look for the nearest package of the target container
 
 		Package result = newPart.getNearestPackage();
-		if(result != null) {
+		if (result != null) {
 			return result;
 		}
 
 		Package originalPackage = partToBeDuplicated.getNearestPackage();
 		// look for its equivalent in the list of duplicated objects
 		Object o = allDuplicatedElementsMap.get(originalPackage);
-		if(o instanceof Package) {
-			return (Package)o;
+		if (o instanceof Package) {
+			return (Package) o;
 		}
 
-		if(targetContainer instanceof Package) {
-			return ((Package)targetContainer);
+		if (targetContainer instanceof Package) {
+			return ((Package) targetContainer);
 		}
 
-		if(targetContainer instanceof Element) {
-			return ((Element)targetContainer).getNearestPackage();
+		if (targetContainer instanceof Element) {
+			return ((Element) targetContainer).getNearestPackage();
 		}
 
 		return null;
@@ -121,14 +123,14 @@ public abstract class AbstractPropertyEditHelperAdvice extends AbstractEditHelpe
 
 	/**
 	 * Get the editing domain from an {@link EObject}
-	 * 
+	 *
 	 * @param eObject
 	 * @return
 	 */
 	protected TransactionalEditingDomain getEditingDomain(EObject eObject) {
 		EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(eObject);
-		if(editingDomain instanceof TransactionalEditingDomain) {
-			return (TransactionalEditingDomain)editingDomain;
+		if (editingDomain instanceof TransactionalEditingDomain) {
+			return (TransactionalEditingDomain) editingDomain;
 		}
 		return null;
 	}
@@ -150,17 +152,17 @@ public abstract class AbstractPropertyEditHelperAdvice extends AbstractEditHelpe
 		 * list of EObjects. Also sets the list of affected files to be the files,
 		 * where the targetContainer is stored. Target container specifies the
 		 * eObject into which the duplicated eObjects will be added.
-		 * 
+		 *
 		 * @param editingDomain
-		 *        the editing domain through which model changes are made
+		 *            the editing domain through which model changes are made
 		 * @param label
-		 *        The label for the new command.
+		 *            The label for the new command.
 		 * @param originalAssociation
-		 *        <code>Association</code> to be duplicated.
+		 *            <code>Association</code> to be duplicated.
 		 * @param allDuplicatedObjectsMap
-		 *        An empty map to be populated with the duplicated objects.
+		 *            An empty map to be populated with the duplicated objects.
 		 * @param targetContainer
-		 *        target package
+		 *            target package
 		 */
 		public DuplicatePapyrusAssociationCommand(TransactionalEditingDomain editingDomain, String label, Association originalAssociation, Map allDuplicatedObjectsMap, Package targetContainer) {
 			super(editingDomain, label, Collections.singletonList(originalAssociation), allDuplicatedObjectsMap, targetContainer);
@@ -182,12 +184,12 @@ public abstract class AbstractPropertyEditHelperAdvice extends AbstractEditHelpe
 			copier.copy(associationToDuplicate);
 			copier.copyReferences();
 
-			Association newAssociation = (Association)copier.get(associationToDuplicate);
-			if(newAssociation == null) {
+			Association newAssociation = (Association) copier.get(associationToDuplicate);
+			if (newAssociation == null) {
 				return CommandResult.newErrorCommandResult("Impossible to find the copied association");
 			}
 
-			// note: can be executed only if targetcontainer is instanceof package, this means that there is no need to tests for null targetContainer 
+			// note: can be executed only if targetcontainer is instanceof package, this means that there is no need to tests for null targetContainer
 			newAssociation.setPackage(targetContainer);
 			String associationName = NamedElementHelper.getDefaultNameWithIncrementFromBase("Association", targetContainer.eContents()); //$NON-NLS-1$
 			newAssociation.setName(associationName);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ActorPartPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ActorPartPropertyEditHelperAdvice.java
index 2d84151b780..9aa9604a62b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ActorPartPropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ActorPartPropertyEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -36,9 +36,9 @@ public class ActorPartPropertyEditHelperAdvice extends AbstractEditHelperAdvice
 
 	/**
 	 * Check if the creation context is a {@link Block}.
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 * 
+	 *
 	 * @param request
 	 * @return true if the request is approved
 	 */
@@ -46,17 +46,17 @@ public class ActorPartPropertyEditHelperAdvice extends AbstractEditHelperAdvice
 	public boolean approveRequest(IEditCommandRequest request) {
 		boolean isApproved = super.approveRequest(request);
 
-		if((request != null) && (request instanceof GetEditContextRequest)) {
+		if ((request != null) && (request instanceof GetEditContextRequest)) {
 
 			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest)request;
+			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
 
 			// Test if the edit context is a Block
-			if(editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element)editContextRequest.getEditContext();
+			if (editContextRequest.getEditContext() instanceof Element) {
+				Element contextElement = (Element) editContextRequest.getEditContext();
 
 				IElementMatcher matcher = new BlockMatcher();
-				if(!matcher.matches(contextElement)) {
+				if (!matcher.matches(contextElement)) {
 					isApproved = false;
 				}
 			}
@@ -71,9 +71,10 @@ public class ActorPartPropertyEditHelperAdvice extends AbstractEditHelperAdvice
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property element = (Property)request.getElementToConfigure();
-				if(element != null) {
+				Property element = (Property) request.getElementToConfigure();
+				if (element != null) {
 
 					// Set default name
 					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase("actorPart", element.eContainer().eContents()); //$NON-NLS-1$
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java
index 53f5309c793..32da3bb44dd 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,9 +38,10 @@ public class AllocateEditHelperAdvice extends AbstractStereotypedElementEditHelp
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, AllocationsPackage.eINSTANCE.getAllocate());
 
 					// Set default name
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java
index e7ea9c782dd..a6008b5b1b8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -51,9 +51,9 @@ public class BlockEditHelperAdvice extends AbstractStereotypedElementEditHelperA
 
 	/**
 	 * Check if the creation context is allowed.
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 * 
+	 *
 	 * @param request
 	 * @return true if the request is approved
 	 */
@@ -61,26 +61,26 @@ public class BlockEditHelperAdvice extends AbstractStereotypedElementEditHelperA
 	public boolean approveRequest(IEditCommandRequest request) {
 		boolean isApproved = super.approveRequest(request);
 
-		if((request != null) && (request instanceof GetEditContextRequest)) {
+		if ((request != null) && (request instanceof GetEditContextRequest)) {
 
 			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest)request;
+			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
 
 			// Test context type
-			if(editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element)editContextRequest.getEditContext();
+			if (editContextRequest.getEditContext() instanceof Element) {
+				Element contextElement = (Element) editContextRequest.getEditContext();
 
 				IElementMatcher matcher;
 
 				// Cannot create a nested Block in FlowSpecification
 				matcher = new FlowSpecificationMatcher();
-				if(matcher.matches(contextElement)) {
+				if (matcher.matches(contextElement)) {
 					isApproved = false;
 				}
 
 				// Cannot create a nested Block in Requirement
 				matcher = new RequirementMatcher();
-				if(matcher.matches(contextElement)) {
+				if (matcher.matches(contextElement)) {
 					isApproved = false;
 				}
 			}
@@ -95,9 +95,10 @@ public class BlockEditHelperAdvice extends AbstractStereotypedElementEditHelperA
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, BlocksPackage.eINSTANCE.getBlock());
 
 					// Set default name
@@ -109,13 +110,13 @@ public class BlockEditHelperAdvice extends AbstractStereotypedElementEditHelperA
 			}
 		};
 	}
-	
+
 	@Override
 	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {
 		// test if the creation is for a SysML association
 
 		IElementType type = request.getElementType();
-		if(hasSuperType(type, SysMLElementTypes.ASSOCIATION)) {
+		if (hasSuperType(type, SysMLElementTypes.ASSOCIATION)) {
 			// test source and target...
 			EObject source = request.getSource();
 			// The source of an association cannot be read-only.
@@ -126,20 +127,20 @@ public class BlockEditHelperAdvice extends AbstractStereotypedElementEditHelperA
 
 		return super.getBeforeCreateRelationshipCommand(request);
 	}
-	
+
 	protected boolean hasSuperType(IElementType elementType, IElementType typeToTest) {
-		if(elementType == null || typeToTest == null) {
+		if (elementType == null || typeToTest == null) {
 			return false;
 		}
 
-		if(elementType.equals(typeToTest)) {
+		if (elementType.equals(typeToTest)) {
 			return true;
 		}
 
 		List<IElementType> superTypes = Arrays.asList(elementType.getAllSuperTypes());
-			if(superTypes.contains(typeToTest)) {
-				return true;
-			}
+		if (superTypes.contains(typeToTest)) {
+			return true;
+		}
 
 		return false;
 	}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java
index 7d80d788b16..40d5847d74a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,9 +38,10 @@ public class ConformEditHelperAdvice extends AbstractStereotypedElementEditHelpe
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getConform());
 
 					// Set default name
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java
index 1ce81ce68c6..784ac347e8d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,7 +38,7 @@ public class ConstraintBlockEditHelperAdvice extends AbstractStereotypedElementE
 
 	/**
 	 * Restriction on ConstraintBlock owned Structural and Behavioral features.
-	 * 
+	 *
 	 * {@inheritDoc}
 	 */
 	@Override
@@ -46,8 +46,8 @@ public class ConstraintBlockEditHelperAdvice extends AbstractStereotypedElementE
 
 		IElementType elementToCreate = request.getElementType();
 
-		if(UMLElementTypes.STRUCTURAL_FEATURE.getEClass().isSuperTypeOf(elementToCreate.getEClass())) {
-			if(elementToCreate != SysMLElementTypes.CONSTRAINT_PROPERTY && elementToCreate != UMLElementTypes.PROPERTY) {
+		if (UMLElementTypes.STRUCTURAL_FEATURE.getEClass().isSuperTypeOf(elementToCreate.getEClass())) {
+			if (elementToCreate != SysMLElementTypes.CONSTRAINT_PROPERTY && elementToCreate != UMLElementTypes.PROPERTY) {
 				return null;
 			}
 		}
@@ -57,7 +57,7 @@ public class ConstraintBlockEditHelperAdvice extends AbstractStereotypedElementE
 
 	/**
 	 * Complete creation process by applying the expected stereotype
-	 * 
+	 *
 	 * {@inheritDoc}
 	 */
 	@Override
@@ -65,9 +65,10 @@ public class ConstraintBlockEditHelperAdvice extends AbstractStereotypedElementE
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ConstraintsPackage.eINSTANCE.getConstraintBlock());
 
 					// Set default name
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockPropertyEditHelperAdvice.java
index 242195f840b..5e58bd9c58d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockPropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockPropertyEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,7 +30,7 @@ public class ConstraintBlockPropertyEditHelperAdvice extends AbstractEditHelperA
 
 	/**
 	 * Every {@link Property} created in the context of a {@link ConstraintBlock} is Composite.
-	 * 
+	 *
 	 * {@inheritDoc}
 	 */
 	@Override
@@ -38,12 +38,13 @@ public class ConstraintBlockPropertyEditHelperAdvice extends AbstractEditHelperA
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property element = (Property)request.getElementToConfigure();
-				if(element != null) {
-					
+				Property element = (Property) request.getElementToConfigure();
+				if (element != null) {
+
 					Element owner = element.getOwner();
-					if (((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(owner)) {
+					if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(owner)) {
 						element.setAggregation(AggregationKind.COMPOSITE_LITERAL);
 					}
 				}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintParameterEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintParameterEditHelperAdvice.java
index 1916681d448..54fc3b1d89a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintParameterEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintParameterEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -73,6 +73,7 @@ public class ConstraintParameterEditHelperAdvice extends AbstractEditHelperAdvic
 					if (type != null && type instanceof Class && UMLUtil.getStereotypeApplication(type, ConstraintBlock.class) != null) {
 						return new ConfigureElementCommand(request) {
 
+							@Override
 							protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 								NamedElement element = (NamedElement) request.getElementToConfigure();
 								if (element != null) {
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java
index 34c51d36859..a8d5909b2a4 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -53,9 +53,10 @@ public class ConstraintPropertyEditHelperAdvice extends AbstractStereotypedEleme
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ConstraintsPackage.eINSTANCE.getConstraintProperty());
 
 					// Set default name
@@ -64,7 +65,7 @@ public class ConstraintPropertyEditHelperAdvice extends AbstractStereotypedEleme
 					element.setName(initializedName);
 					// SysML constraint : self.ownedAttribute->forAll(p | p.type.oclIsKindOf(ConstraintBlock) implies p.aggregation = #composite)
 					if (element instanceof Property) {
-						((Property)element).setAggregation(AggregationKind.COMPOSITE_LITERAL);
+						((Property) element).setAggregation(AggregationKind.COMPOSITE_LITERAL);
 					}
 				}
 				return CommandResult.newOKCommandResult(element);
@@ -79,15 +80,15 @@ public class ConstraintPropertyEditHelperAdvice extends AbstractStereotypedEleme
 	protected ICommand getBeforeSetCommand(SetRequest request) {
 
 		// Only allow ConstraintBlock or null as new type
-		if(UMLPackage.eINSTANCE.getTypedElement_Type().equals(request.getFeature())) {
-			if(request.getValue() != null) {
+		if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(request.getFeature())) {
+			if (request.getValue() != null) {
 
-				if(!(request.getValue() instanceof Element)) {
+				if (!(request.getValue() instanceof Element)) {
 					return UnexecutableCommand.INSTANCE;
 				}
 
-				ConstraintBlock constraint = UMLUtil.getStereotypeApplication((Element)request.getValue(), ConstraintBlock.class);
-				if(constraint == null) {
+				ConstraintBlock constraint = UMLUtil.getStereotypeApplication((Element) request.getValue(), ConstraintBlock.class);
+				if (constraint == null) {
 					return UnexecutableCommand.INSTANCE;
 				}
 			}
@@ -107,11 +108,11 @@ public class ConstraintPropertyEditHelperAdvice extends AbstractStereotypedEleme
 
 			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property sourcePart = (Property)request.getElementToConfigure();
-				if((sourcePart != null) && (sourcePart.eContainer() != null)) {
+				Property sourcePart = (Property) request.getElementToConfigure();
+				if ((sourcePart != null) && (sourcePart.eContainer() != null)) {
 
 					sourcePart.setAggregation(AggregationKind.COMPOSITE_LITERAL);
-					
+
 					// Create association between element owner and element type
 					Type sourceType = resolveTypeContainer(sourcePart);
 					Package associationContainer = sourceType.getNearestPackage();
@@ -143,7 +144,7 @@ public class ConstraintPropertyEditHelperAdvice extends AbstractStereotypedEleme
 					eContainer = ((Property) eContainer).getType();
 				}
 				if (eContainer instanceof Type) {
-					return (Type)eContainer;
+					return (Type) eContainer;
 				}
 				return null;
 			}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java
index d3d717aee98..04c26310b9b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,9 +38,10 @@ public class CopyEditHelperAdvice extends AbstractStereotypedElementEditHelperAd
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getCopy());
 
 					// Set default name
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java
index 207c5c55e92..71874152bf7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,9 +40,10 @@ public class DeriveReqtEditHelperAdvice extends AbstractStereotypedElementEditHe
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getDeriveReqt());
 
 					// Set default name
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java
index 0ebc9defc52..45e730f1f94 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,9 +39,10 @@ public class DimensionEditHelperAdvice extends AbstractStereotypedElementEditHel
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, BlocksPackage.eINSTANCE.getDimension());
 
 					// Set default name
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java
index 551a9500ca4..8decfb9c53d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -50,9 +50,9 @@ public class FlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelp
 
 	/**
 	 * Check if the creation context is a Block.
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 * 
+	 *
 	 * @param request
 	 * @return true if the request is approved
 	 */
@@ -60,17 +60,17 @@ public class FlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelp
 	public boolean approveRequest(IEditCommandRequest request) {
 		boolean isApproved = super.approveRequest(request);
 
-		if((request != null) && (request instanceof GetEditContextRequest)) {
+		if ((request != null) && (request instanceof GetEditContextRequest)) {
 
 			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest)request;
+			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
 
 			// Test if the edit context is a Block
-			if(editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element)editContextRequest.getEditContext();
+			if (editContextRequest.getEditContext() instanceof Element) {
+				Element contextElement = (Element) editContextRequest.getEditContext();
 
 				IElementMatcher matcher = new BlockMatcher();
-				if(!matcher.matches(contextElement)) {
+				if (!matcher.matches(contextElement)) {
 					isApproved = false;
 				}
 			}
@@ -85,10 +85,11 @@ public class FlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelp
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 
-				Port port = (Port)request.getElementToConfigure();
-				if(port != null) {
+				Port port = (Port) request.getElementToConfigure();
+				if (port != null) {
 
 					// Apply FlowPort stereotype
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(port, PortandflowsPackage.eINSTANCE.getFlowPort());
@@ -111,15 +112,15 @@ public class FlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelp
 	protected ICommand getBeforeSetCommand(SetRequest request) {
 
 		// Only allow null, Block, Signal, DataType or ValueType as the new type
-		if(UMLPackage.eINSTANCE.getTypedElement_Type().equals(request.getFeature())) {
-			if(request.getValue() != null) {
+		if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(request.getFeature())) {
+			if (request.getValue() != null) {
 
-				if(!(request.getValue() instanceof Element)) {
+				if (!(request.getValue() instanceof Element)) {
 					return UnexecutableCommand.INSTANCE; // Should not happen
 				}
 
-				Element value = (Element)request.getValue();
-				if((value instanceof DataType) || (value instanceof Signal)) {
+				Element value = (Element) request.getValue();
+				if ((value instanceof DataType) || (value instanceof Signal)) {
 					return null; // accept these types
 				}
 
@@ -127,7 +128,7 @@ public class FlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelp
 				Block block = UMLUtil.getStereotypeApplication(value, Block.class);
 				FlowSpecification flowspecification = UMLUtil.getStereotypeApplication(value, FlowSpecification.class);
 
-				if((block != null) || (valueType != null) || (flowspecification != null)) {
+				if ((block != null) || (valueType != null) || (flowspecification != null)) {
 					return null; // accept these types
 				}
 
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java
index 2e9654be3a4..6450c43b05f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -41,11 +41,12 @@ public class FlowPortInEditHelperAdvice extends AbstractStereotypedElementEditHe
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 
-				Port port = (Port)request.getElementToConfigure();
+				Port port = (Port) request.getElementToConfigure();
 				FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);
-				if(flowPort != null) {
+				if (flowPort != null) {
 					flowPort.setDirection(FlowDirection.IN);
 				}
 
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java
index 0f093669ba8..78bc0dd262c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -41,11 +41,12 @@ public class FlowPortInOutEditHelperAdvice extends AbstractStereotypedElementEdi
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 
-				Port port = (Port)request.getElementToConfigure();
+				Port port = (Port) request.getElementToConfigure();
 				FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);
-				if(flowPort != null) {
+				if (flowPort != null) {
 					flowPort.setDirection(FlowDirection.INOUT);
 				}
 
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java
index fe18de89d98..72db9e0b489 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,12 +40,13 @@ public class FlowPortNAEditHelperAdvice extends AbstractStereotypedElementEditHe
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 
-				Port port = (Port)request.getElementToConfigure();
-				
+				Port port = (Port) request.getElementToConfigure();
+
 				// Ensure the type is a FlowSpecification
-				if((port != null) && (port.getType() != null)) {
+				if ((port != null) && (port.getType() != null)) {
 					if (UMLUtil.getStereotypeApplication(port.getType(), FlowSpecification.class) != null) {
 						return CommandResult.newOKCommandResult(port);
 					}
@@ -55,5 +56,5 @@ public class FlowPortNAEditHelperAdvice extends AbstractStereotypedElementEditHe
 			}
 		};
 	}
-	
+
 }
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java
index cccf6d78d25..8efd45f3903 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -41,11 +41,12 @@ public class FlowPortOutEditHelperAdvice extends AbstractStereotypedElementEditH
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 
-				Port port = (Port)request.getElementToConfigure();
+				Port port = (Port) request.getElementToConfigure();
 				FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);
-				if(flowPort != null) {
+				if (flowPort != null) {
 					flowPort.setDirection(FlowDirection.OUT);
 				}
 
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java
index c7bfe313c81..8b3b54faafd 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -50,9 +50,9 @@ public class FlowPropertyEditHelperAdvice extends AbstractStereotypedElementEdit
 
 	/**
 	 * Check if the creation context is a FlowSpecification.
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 * 
+	 *
 	 * @param request
 	 * @return true if the request is approved
 	 */
@@ -60,18 +60,18 @@ public class FlowPropertyEditHelperAdvice extends AbstractStereotypedElementEdit
 	public boolean approveRequest(IEditCommandRequest request) {
 		boolean isApproved = super.approveRequest(request);
 
-		if((request != null) && (request instanceof GetEditContextRequest)) {
+		if ((request != null) && (request instanceof GetEditContextRequest)) {
 
 			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest)request;
+			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
 
 			// Test if the edit context is a FlowSpecification
-			if(editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element)editContextRequest.getEditContext();
+			if (editContextRequest.getEditContext() instanceof Element) {
+				Element contextElement = (Element) editContextRequest.getEditContext();
 
 				IElementMatcher matcher = new FlowSpecificationMatcher();
 				IElementMatcher blockMatcher = new BlockMatcher();
-				if(!matcher.matches(contextElement) && !blockMatcher.matches(contextElement)) {
+				if (!matcher.matches(contextElement) && !blockMatcher.matches(contextElement)) {
 					isApproved = false;
 				}
 			}
@@ -86,9 +86,10 @@ public class FlowPropertyEditHelperAdvice extends AbstractStereotypedElementEdit
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, PortandflowsPackage.eINSTANCE.getFlowProperty());
 
 					// Set default name
@@ -108,22 +109,22 @@ public class FlowPropertyEditHelperAdvice extends AbstractStereotypedElementEdit
 	protected ICommand getBeforeSetCommand(SetRequest request) {
 
 		// Only allow null, FlowSpecification, Block, Signal, DataType or ValueType as new type.
-		if(UMLPackage.eINSTANCE.getTypedElement_Type().equals(request.getFeature())) {
-			if(request.getValue() != null) {
+		if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(request.getFeature())) {
+			if (request.getValue() != null) {
 
-				if(!(request.getValue() instanceof Element)) {
+				if (!(request.getValue() instanceof Element)) {
 					return UnexecutableCommand.INSTANCE; // Should not happen
 				}
 
-				Element value = (Element)request.getValue();
-				if((value instanceof DataType) || (value instanceof Signal)) {
+				Element value = (Element) request.getValue();
+				if ((value instanceof DataType) || (value instanceof Signal)) {
 					return null; // accept these types
 				}
 
 				ValueType valueType = UMLUtil.getStereotypeApplication(value, ValueType.class);
 				Block block = UMLUtil.getStereotypeApplication(value, Block.class);
 
-				if((block != null) || (valueType != null)) {
+				if ((block != null) || (valueType != null)) {
 					return null; // accept these types
 				}
 
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java
index 995a215c69e..155146bb616 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -58,16 +58,16 @@ public class FlowSpecificationEditHelperAdvice extends AbstractStereotypedElemen
 		IElementType elementToCreate = request.getElementType();
 
 		// [1] Flow specifications cannot own operations or receptions (they can only own FlowProperties).
-		if(elementToCreate == UMLElementTypes.OPERATION) {
+		if (elementToCreate == UMLElementTypes.OPERATION) {
 			return UnexecutableCommand.INSTANCE;
 		}
-		if(elementToCreate == UMLElementTypes.RECEPTION) {
+		if (elementToCreate == UMLElementTypes.RECEPTION) {
 			return UnexecutableCommand.INSTANCE;
 		}
 
 		// [2] Every “ownedAttribute” of a FlowSpecification must be a FlowProperty.
-		if(UMLElementTypes.PROPERTY.getEClass().isSuperTypeOf(elementToCreate.getEClass())) {
-			if((elementToCreate != SysMLElementTypes.FLOW_PROPERTY) && !(Arrays.asList(elementToCreate.getAllSuperTypes()).contains(SysMLElementTypes.FLOW_PROPERTY))) {
+		if (UMLElementTypes.PROPERTY.getEClass().isSuperTypeOf(elementToCreate.getEClass())) {
+			if ((elementToCreate != SysMLElementTypes.FLOW_PROPERTY) && !(Arrays.asList(elementToCreate.getAllSuperTypes()).contains(SysMLElementTypes.FLOW_PROPERTY))) {
 				return UnexecutableCommand.INSTANCE;
 			}
 		}
@@ -77,9 +77,9 @@ public class FlowSpecificationEditHelperAdvice extends AbstractStereotypedElemen
 
 	/**
 	 * Check if the creation context is allowed.
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 * 
+	 *
 	 * @param request
 	 * @return true if the request is approved
 	 */
@@ -87,26 +87,26 @@ public class FlowSpecificationEditHelperAdvice extends AbstractStereotypedElemen
 	public boolean approveRequest(IEditCommandRequest request) {
 		boolean isApproved = super.approveRequest(request);
 
-		if((request != null) && (request instanceof GetEditContextRequest)) {
+		if ((request != null) && (request instanceof GetEditContextRequest)) {
 
 			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest)request;
+			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
 
 			// Test context type
-			if(editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element)editContextRequest.getEditContext();
+			if (editContextRequest.getEditContext() instanceof Element) {
+				Element contextElement = (Element) editContextRequest.getEditContext();
 
 				IElementMatcher matcher;
 
 				// Cannot create a nested FlowSpecification in FlowSpecification
 				matcher = new FlowSpecificationMatcher();
-				if(matcher.matches(contextElement)) {
+				if (matcher.matches(contextElement)) {
 					isApproved = false;
 				}
 
 				// Cannot create a nested FlowSpecification in Requirement
 				matcher = new RequirementMatcher();
-				if(matcher.matches(contextElement)) {
+				if (matcher.matches(contextElement)) {
 					isApproved = false;
 				}
 			}
@@ -121,9 +121,10 @@ public class FlowSpecificationEditHelperAdvice extends AbstractStereotypedElemen
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, PortandflowsPackage.eINSTANCE.getFlowSpecification());
 
 					// Set default name
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java
index 6a40252176b..f4ebfdf4168 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,9 +38,10 @@ public class ItemFlowEditHelperAdvice extends AbstractStereotypedElementEditHelp
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement)request.getElementToConfigure();
-				if(element != null) {
+				NamedElement element = (NamedElement) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, PortandflowsPackage.eINSTANCE.getItemFlow());
 
 					// Set default name
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
index 473a9534cd7..eb1b474d965 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
@@ -1,14 +1,14 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * 
+ *
  * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
@@ -46,9 +46,9 @@ public class PartPropertyEditHelperAdvice extends AbstractPropertyEditHelperAdvi
 
 	/**
 	 * Check if the creation context is a {@link Block}.
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 * 
+	 *
 	 * @param request
 	 * @return true if the request is approved
 	 */
@@ -56,17 +56,17 @@ public class PartPropertyEditHelperAdvice extends AbstractPropertyEditHelperAdvi
 	public boolean approveRequest(IEditCommandRequest request) {
 		boolean isApproved = super.approveRequest(request);
 
-		if((request != null) && (request instanceof GetEditContextRequest)) {
+		if ((request != null) && (request instanceof GetEditContextRequest)) {
 
 			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest)request;
+			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
 
 			// Test if the edit context is a Block
-			if(editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element)editContextRequest.getEditContext();
+			if (editContextRequest.getEditContext() instanceof Element) {
+				Element contextElement = (Element) editContextRequest.getEditContext();
 
 				IElementMatcher matcher = new BlockMatcher();
-				if(!matcher.matches(contextElement)) {
+				if (!matcher.matches(contextElement)) {
 					isApproved = false;
 				}
 			}
@@ -83,8 +83,8 @@ public class PartPropertyEditHelperAdvice extends AbstractPropertyEditHelperAdvi
 
 			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property element = (Property)request.getElementToConfigure();
-				if(element != null) {
+				Property element = (Property) request.getElementToConfigure();
+				if (element != null) {
 
 					// Set default name
 					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase("part", element.eContainer().eContents()); //$NON-NLS-1$
@@ -108,12 +108,12 @@ public class PartPropertyEditHelperAdvice extends AbstractPropertyEditHelperAdvi
 
 			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property sourcePart = (Property)request.getElementToConfigure();
-				if((sourcePart != null) && (sourcePart.getType() != null)) {
+				Property sourcePart = (Property) request.getElementToConfigure();
+				if ((sourcePart != null) && (sourcePart.getType() != null)) {
 
 					// Create association between element owner and element type
 					Type sourceType = sourcePart.getClass_();
-					//Type targetType = sourcePart.getType();
+					// Type targetType = sourcePart.getType();
 					Package associationContainer = sourceType.getNearestPackage();
 
 					// Create targetProperty
@@ -138,24 +138,25 @@ public class PartPropertyEditHelperAdvice extends AbstractPropertyEditHelperAdvi
 			}
 		};
 	}
-	
+
 	/**
 	 * Returns the Part to be duplicated
-	 * 
+	 *
 	 * @return the Part to be duplicated or <code>null</code> if this is not a part
 	 */
+	@Override
 	protected Property getDuplicatedProperty(DuplicateElementsRequest request) {
 		List<Object> elementsToBeDuplicated = request.getElementsToBeDuplicated();
-		if(elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {
+		if (elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {
 			return null;
 		}
 		Object firstElement = elementsToBeDuplicated.get(0); // there should be only one element here
-		if(!(firstElement instanceof Property)) {
+		if (!(firstElement instanceof Property)) {
 			return null;
 		}
 		PartPropertyMatcher matcher = new PartPropertyMatcher();
-		return matcher.matches((Property)firstElement) ? (Property)firstElement : null;
+		return matcher.matches((Property) firstElement) ? (Property) firstElement : null;
 	}
 
-	
+
 }
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java
index e823543e635..f926187349f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,9 +37,10 @@ public class ProblemEditHelperAdvice extends AbstractStereotypedElementEditHelpe
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Element element = (Element)request.getElementToConfigure();
-				if(element != null) {
+				Element element = (Element) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getProblem());
 				}
 				return CommandResult.newOKCommandResult(element);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java
index d499887bb29..b616439bead 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,9 +37,10 @@ public class RationaleEditHelperAdvice extends AbstractStereotypedElementEditHel
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Element element = (Element)request.getElementToConfigure();
-				if(element != null) {
+				Element element = (Element) request.getElementToConfigure();
+				if (element != null) {
 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getRationale());
 				}
 				return CommandResult.newOKCommandResult(element);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
index d6507b5e382..70bf740d259 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
@@ -1,14 +1,14 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * 
+ *
  * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
@@ -46,9 +46,9 @@ public class ReferencePropertyEditHelperAdvice extends AbstractPropertyEditHelpe
 
 	/**
 	 * Check if the creation context is a {@link Block}.
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 * 
+	 *
 	 * @param request
 	 * @return true if the request is approved
 	 */
@@ -56,17 +56,17 @@ public class ReferencePropertyEditHelperAdvice extends AbstractPropertyEditHelpe
 	public boolean approveRequest(IEditCommandRequest request) {
 		boolean isApproved = super.approveRequest(request);
 
-		if((request != null) && (request instanceof GetEditContextRequest)) {
+		if ((request != null) && (request instanceof GetEditContextRequest)) {
 
 			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest)request;
+			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
 
 			// Test if the edit context is a Block
-			if(editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element)editContextRequest.getEditContext();
+			if (editContextRequest.getEditContext() instanceof Element) {
+				Element contextElement = (Element) editContextRequest.getEditContext();
 
 				IElementMatcher matcher = new BlockMatcher();
-				if(!matcher.matches(contextElement)) {
+				if (!matcher.matches(contextElement)) {
 					isApproved = false;
 				}
 			}
@@ -81,9 +81,10 @@ public class ReferencePropertyEditHelperAdvice extends AbstractPropertyEditHelpe
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property element = (Property)request.getElementToConfigure();
-				if(element != null) {
+				Property element = (Property) request.getElementToConfigure();
+				if (element != null) {
 
 					// Set default name
 					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase("reference", element.eContainer().eContents());
@@ -105,13 +106,14 @@ public class ReferencePropertyEditHelperAdvice extends AbstractPropertyEditHelpe
 
 		return new ConfigureElementCommand(request) {
 
+			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property sourcePart = (Property)request.getElementToConfigure();
-				if((sourcePart != null) && (sourcePart.getType() != null)) {
+				Property sourcePart = (Property) request.getElementToConfigure();
+				if ((sourcePart != null) && (sourcePart.getType() != null)) {
 
 					// Create association between element owner and element type
 					Type sourceType = sourcePart.getClass_();
-					//Type targetType = sourcePart.getType();
+					// Type targetType = sourcePart.getType();
 					Package associationContainer = sourceType.getNearestPackage();
 
 					// Create targetProperty
@@ -143,14 +145,14 @@ public class ReferencePropertyEditHelperAdvice extends AbstractPropertyEditHelpe
 	@Override
 	protected Property getDuplicatedProperty(DuplicateElementsRequest request) {
 		List<Object> elementsToBeDuplicated = request.getElementsToBeDuplicated();
-		if(elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {
+		if (elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {
 			return null;
 		}
 		Object firstElement = elementsToBeDuplicated.get(0); // there should be only one element here
-		if(!(firstElement instanceof Property)) {
+		if (!(firstElement instanceof Property)) {
 			return null;
 		}
 		ReferencePropertyMatcher matcher = new ReferencePropertyMatcher();
-		return matcher.matches((Property)firstElement) ? (Property)firstElement : null;
+		return matcher.matches((Property) firstElement) ? (Property) firstElement : null;
 	}
 }
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java
index 8f3a88c2a08..27d9ce83dfa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -41,9 +41,9 @@ public class RequirementEditHelperAdvice extends AbstractStereotypedElementEditH
 

 	/**

 	 * Check if the creation context is allowed.

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 * 

+	 *

 	 * @param request

 	 * @return true if the request is approved

 	 */

@@ -51,20 +51,20 @@ public class RequirementEditHelperAdvice extends AbstractStereotypedElementEditH
 	public boolean approveRequest(IEditCommandRequest request) {

 		boolean isApproved = super.approveRequest(request);

 

-		if((request != null) && (request instanceof GetEditContextRequest)) {

+		if ((request != null) && (request instanceof GetEditContextRequest)) {

 

 			// Retrieve the edit context from request

-			GetEditContextRequest editContextRequest = (GetEditContextRequest)request;

+			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;

 

 			// Test context type

-			if(editContextRequest.getEditContext() instanceof Element) {

-				Element contextElement = (Element)editContextRequest.getEditContext();

+			if (editContextRequest.getEditContext() instanceof Element) {

+				Element contextElement = (Element) editContextRequest.getEditContext();

 

 				IElementMatcher matcher;

 

 				// Cannot create a nested requirement in FlowSpecification

 				matcher = new FlowSpecificationMatcher();

-				if(matcher.matches(contextElement)) {

+				if (matcher.matches(contextElement)) {

 					isApproved = false;

 				}

 			}

@@ -79,9 +79,10 @@ public class RequirementEditHelperAdvice extends AbstractStereotypedElementEditH
 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement)request.getElementToConfigure();

-				if(element != null) {

+				NamedElement element = (NamedElement) request.getElementToConfigure();

+				if (element != null) {

 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getRequirement());

 

 					// Set default name

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java
index 455e60ef1ff..ff0ffb82ed6 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -41,9 +41,10 @@ public class SatisfyEditHelperAdvice extends AbstractStereotypedElementEditHelpe
 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement)request.getElementToConfigure();

-				if(element != null) {

+				NamedElement element = (NamedElement) request.getElementToConfigure();

+				if (element != null) {

 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getSatisfy());

 

 					// Set default name

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java
index 313f9fd9186..0042fa06b2d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,9 +38,10 @@ public class UnitEditHelperAdvice extends AbstractStereotypedElementEditHelperAd
 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement)request.getElementToConfigure();

-				if(element != null) {

+				NamedElement element = (NamedElement) request.getElementToConfigure();

+				if (element != null) {

 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, BlocksPackage.eINSTANCE.getUnit());

 

 					// Set default name

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java
index 1906a6431f7..257af7fdc6c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,9 +36,9 @@ public class ValuePropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Check if the creation context is a {@link Block}.

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 * 

+	 *

 	 * @param request

 	 * @return true if the request is approved

 	 */

@@ -46,17 +46,17 @@ public class ValuePropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 	public boolean approveRequest(IEditCommandRequest request) {

 		boolean isApproved = super.approveRequest(request);

 

-		if((request != null) && (request instanceof GetEditContextRequest)) {

+		if ((request != null) && (request instanceof GetEditContextRequest)) {

 

 			// Retrieve the edit context from request

-			GetEditContextRequest editContextRequest = (GetEditContextRequest)request;

+			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;

 

 			// Test if the edit context is a Block

-			if(editContextRequest.getEditContext() instanceof Element) {

-				Element contextElement = (Element)editContextRequest.getEditContext();

+			if (editContextRequest.getEditContext() instanceof Element) {

+				Element contextElement = (Element) editContextRequest.getEditContext();

 

 				IElementMatcher matcher = new BlockMatcher();

-				if(!matcher.matches(contextElement)) {

+				if (!matcher.matches(contextElement)) {

 					isApproved = false;

 				}

 			}

@@ -71,9 +71,10 @@ public class ValuePropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				Property element = (Property)request.getElementToConfigure();

-				if(element != null) {

+				Property element = (Property) request.getElementToConfigure();

+				if (element != null) {

 

 					// Set default name

 					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase("value", element.eContainer().eContents());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java
index 9debed1f5d6..2105d0ded29 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,9 +38,10 @@ public class ValueTypeEditHelperAdvice extends AbstractStereotypedElementEditHel
 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement)request.getElementToConfigure();

-				if(element != null) {

+				NamedElement element = (NamedElement) request.getElementToConfigure();

+				if (element != null) {

 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, BlocksPackage.eINSTANCE.getValueType());

 

 					// Set default name

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java
index 8cb2f15efdf..ea146ac64d8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -41,9 +41,10 @@ public class VerifyEditHelperAdvice extends AbstractStereotypedElementEditHelper
 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement)request.getElementToConfigure();

-				if(element != null) {

+				NamedElement element = (NamedElement) request.getElementToConfigure();

+				if (element != null) {

 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getVerify());

 

 					// Set default name

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java
index d9ce3818013..1bfeb9fa5bf 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -39,9 +39,10 @@ public class ViewEditHelperAdvice extends AbstractStereotypedElementEditHelperAd
 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement)request.getElementToConfigure();

-				if(element != null) {

+				NamedElement element = (NamedElement) request.getElementToConfigure();

+				if (element != null) {

 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getView());

 

 					// Set default name

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java
index bd83a71bdf2..19bf9f213fa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -38,9 +38,10 @@ public class ViewPointEditHelperAdvice extends AbstractStereotypedElementEditHel
 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement)request.getElementToConfigure();

-				if(element != null) {

+				NamedElement element = (NamedElement) request.getElementToConfigure();

+				if (element != null) {

 					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getViewPoint());

 

 					// Set default name

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ActorEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ActorEditHelperAdvice.java
index 219363b33e4..8e8733a3543 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ActorEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ActorEditHelperAdvice.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2012 CEA LIST.

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -32,18 +32,18 @@ public class ActorEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * In case of {@link Association} creation, it should not be possible to have an {@link Actor} as source.

 	 */

 	@Override

 	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {

 		IElementType type = request.getElementType();

-		if(SysMLElementTypes.ASSOCIATION.equals(type)) {

+		if (SysMLElementTypes.ASSOCIATION.equals(type)) {

 			return UnexecutableCommand.INSTANCE;

 		}

-		if(type != null) {

+		if (type != null) {

 			List<IElementType> superTypes = Arrays.asList(type.getAllSuperTypes());

-			if(superTypes.contains(SysMLElementTypes.ASSOCIATION)) {

+			if (superTypes.contains(SysMLElementTypes.ASSOCIATION)) {

 				return UnexecutableCommand.INSTANCE;

 			}

 

@@ -52,16 +52,16 @@ public class ActorEditHelperAdvice extends AbstractEditHelperAdvice {
 	}

 

 	protected boolean hasSuperType(IElementType elementType, IElementType typeToTest) {

-		if(elementType == null || typeToTest == null) {

+		if (elementType == null || typeToTest == null) {

 			return false;

 		}

 

-		if(elementType.equals(typeToTest)) {

+		if (elementType.equals(typeToTest)) {

 			return true;

 		}

 

 		List<IElementType> superTypes = Arrays.asList(elementType.getAllSuperTypes());

-		if(superTypes.contains(typeToTest)) {

+		if (superTypes.contains(typeToTest)) {

 			return true;

 		}

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java
index 6fb4e8e68c3..919a6aae8cd 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -15,7 +15,7 @@ import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

 

-/** 

+/**

  * Edit helper advice for {@link Association} with "aggregation = composition" (used for creation purpose only).

  */

 public class AssociationCompositeDirectedEditHelperAdvice extends AssociationCompositeEditHelperAdvice {

@@ -24,11 +24,11 @@ public class AssociationCompositeDirectedEditHelperAdvice extends AssociationCom
 	 * <pre>

 	 * {@inheritDoc}

 	 * 

-	 * The currently created {@link Association} is Composite (manage by super class), and directed 

+	 * The currently created {@link Association} is Composite (manage by super class), and directed

 	 * (meaning navigable in one direction only) which in SysML means the target end is owned by the association itself.

 	 * 

-	 * Moreover this end name should not be set in that case, this latter rule is not followed here for now. 

-	 * 

+	 * Moreover this end name should not be set in that case, this latter rule is not followed here for now.

+	 *

 	 * </pre>

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java
index ae723f7dd76..fe0e7c96833 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -14,8 +14,8 @@ import org.eclipse.uml2.uml.Association;
 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Property;

 

-/** 

- * Edit helper advice for {@link Association} with "aggregation = composition" and navigable in one way (used for creation purpose only). 

+/**

+ * Edit helper advice for {@link Association} with "aggregation = composition" and navigable in one way (used for creation purpose only).

  */

 public class AssociationCompositeEditHelperAdvice extends AssociationNoneEditHelperAdvice {

 

@@ -24,7 +24,7 @@ public class AssociationCompositeEditHelperAdvice extends AssociationNoneEditHel
 	 * {@inheritDoc}

 	 * 

 	 * The currently created {@link Association} is Composite (manage by super class):

-	 * 		it source {@link Property} aggregation is set to Composite kind. 

+	 * 		it source {@link Property} aggregation is set to Composite kind.

 	 * 

 	 * The currently created {@link Association} is bidirectional (navigable in both directions):

 	 * 		it source and target {@link Property} are owned by the {@link Classifier} (target and source end types),

@@ -32,7 +32,7 @@ public class AssociationCompositeEditHelperAdvice extends AssociationNoneEditHel
 	 * </pre>

 	 */

 	@Override

-	protected void configureSourceProperty(Property sourceProperty) {	

+	protected void configureSourceProperty(Property sourceProperty) {

 		sourceProperty.setIsComposite(true);

 	}

 }
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java
index 1e37c5367db..23526ad4c1c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -40,6 +40,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

@@ -60,18 +61,18 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 	 * {@inheritDoc}

 	 * 

 	 * avoid creation of association on another association

-	 * 

+	 *

 	 * </pre>

 	 */

 	@Override

 	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {

 		IElementType type = request.getElementType();

-		if(SysMLElementTypes.ASSOCIATION.equals(type)) {

+		if (SysMLElementTypes.ASSOCIATION.equals(type)) {

 			return UnexecutableCommand.INSTANCE;

 		}

-		if(type != null) {

+		if (type != null) {

 			List<IElementType> superTypes = Arrays.asList(type.getAllSuperTypes());

-			if(superTypes.contains(SysMLElementTypes.ASSOCIATION)) {

+			if (superTypes.contains(SysMLElementTypes.ASSOCIATION)) {

 				return UnexecutableCommand.INSTANCE;

 			}

 

@@ -85,24 +86,24 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 	 * {@inheritDoc}

 	 * 

 	 * Add a command to destroy {@link Association} when only 1 end remains.

-	 * 

+	 *

 	 * </pre>

 	 */

 	@Override

 	protected ICommand getBeforeDestroyReferenceCommand(DestroyReferenceRequest request) {

 		ICommand gmfCommand = super.getBeforeDestroyReferenceCommand(request);

 

-		Association association = (Association)request.getContainer();

-		if((request.getContainingFeature() == UMLPackage.eINSTANCE.getAssociation_MemberEnd()) && (association.getMemberEnds().contains(request.getReferencedObject()))) {

+		Association association = (Association) request.getContainer();

+		if ((request.getContainingFeature() == UMLPackage.eINSTANCE.getAssociation_MemberEnd()) && (association.getMemberEnds().contains(request.getReferencedObject()))) {

 			Set<Property> ends = new HashSet<Property>();

 			ends.addAll(association.getMemberEnds());

 			ends.remove(request.getReferencedObject());

 

-			if(ends.size() <= 2) {

+			if (ends.size() <= 2) {

 

 				DestroyElementRequest destroyRequest = new DestroyElementRequest(association, false);

 				IElementEditService provider = ElementEditServiceUtils.getCommandProvider(association);

-				if(provider != null) {

+				if (provider != null) {

 					ICommand destroyCommand = provider.getEditCommand(destroyRequest);

 					gmfCommand = CompositeCommand.compose(gmfCommand, destroyCommand);

 				}

@@ -118,16 +119,17 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 	 * {@inheritDoc}

 	 * 

 	 * Add SysML Nature on the {@link Association}.

-	 * 

+	 *

 	 * </pre>

 	 */

 	@Override

 	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

 

-		final Association association = (Association)request.getElementToConfigure();

+		final Association association = (Association) request.getElementToConfigure();

 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

 

 				// Add SysML Nature on the new Association

@@ -142,9 +144,9 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 	 * <pre>

 	 * {@inheritDoc}

 	 * 

-	 * Add a command to destroy {@link Association} ends referenced by the {@link Association} 

+	 * Add a command to destroy {@link Association} ends referenced by the {@link Association}

 	 * to delete.

-	 * 

+	 *

 	 * </pre>

 	 */

 	@Override

@@ -153,15 +155,15 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 

 		List<EObject> dependentsToKeep = (RequestParameterUtils.getDependentsToKeep(req) != null) ? RequestParameterUtils.getDependentsToKeep(req) : new ArrayList<EObject>();

 

-		Association association = (Association)req.getElementToDestroy();

-		for(Property end : association.getMemberEnds()) {

+		Association association = (Association) req.getElementToDestroy();

+		for (Property end : association.getMemberEnds()) {

 			if (!dependentsToKeep.contains(end)) {

 				dependentsToDestroy.add(end);

 			}

 		}

 

-		// Return command to destroy dependents ends 

-		if(!dependentsToDestroy.isEmpty()) {

+		// Return command to destroy dependents ends

+		if (!dependentsToDestroy.isEmpty()) {

 			return req.getDestroyDependentsCommand(dependentsToDestroy);

 		}

 

@@ -173,7 +175,7 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 	 * {@inheritDoc}

 	 * 

 	 * Add a command to related association end during re-orient.

-	 * 

+	 *

 	 * </pre>

 	 */

 	@Override

@@ -185,19 +187,19 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 		SetRequest setTypeRequest = null;

 

 		// Retrieve re-oriented association and add it to the list of re-factored elements

-		Association association = (Association)request.getRelationship();

+		Association association = (Association) request.getRelationship();

 		List<EObject> currentlyRefactoredElements = (RequestParameterUtils.getAssociationRefactoredElements(request) != null) ? RequestParameterUtils.getAssociationRefactoredElements(request) : new ArrayList<EObject>();

 

-		if(currentlyRefactoredElements.contains(association)) {

-			// Abort - already treated 

+		if (currentlyRefactoredElements.contains(association)) {

+			// Abort - already treated

 			return null;

 

 		} else {

 			RequestParameterUtils.addAssociationRefactoredElement(request, association);

 		}

 

-		// not possible to have an association on another association, so reorient is forbidden here 

-		if(request.getNewRelationshipEnd() instanceof Association) {

+		// not possible to have an association on another association, so reorient is forbidden here

+		if (request.getNewRelationshipEnd() instanceof Association) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

@@ -208,8 +210,8 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 		EObject modifiedPropertyType = null;

 

 

-		if(request.getDirection() == ReorientRelationshipRequest.REORIENT_SOURCE) {

-			if(!association.getOwnedEnds().contains(semanticSource)) {

+		if (request.getDirection() == ReorientRequest.REORIENT_SOURCE) {

+			if (!association.getOwnedEnds().contains(semanticSource)) {

 				moveRequest = new MoveRequest(request.getNewRelationshipEnd(), semanticSource);

 			}

 

@@ -217,8 +219,8 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 			setTypeRequest = new SetRequest(modifiedPropertyType, UMLPackage.eINSTANCE.getTypedElement_Type(), request.getNewRelationshipEnd());

 		}

 

-		if(request.getDirection() == ReorientRelationshipRequest.REORIENT_TARGET) {

-			if(!association.getOwnedEnds().contains(semanticTarget)) {

+		if (request.getDirection() == ReorientRequest.REORIENT_TARGET) {

+			if (!association.getOwnedEnds().contains(semanticTarget)) {

 				moveRequest = new MoveRequest(request.getNewRelationshipEnd(), semanticTarget);

 			}

 

@@ -226,22 +228,22 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 			setTypeRequest = new SetRequest(modifiedPropertyType, UMLPackage.eINSTANCE.getTypedElement_Type(), request.getNewRelationshipEnd());

 		}

 

-		if(moveRequest != null) {

+		if (moveRequest != null) {

 			// Propagate parameters to the move request

 			moveRequest.addParameters(request.getParameters());

 			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getNewRelationshipEnd());

-			if(provider != null) {

+			if (provider != null) {

 				ICommand moveCommand = provider.getEditCommand(moveRequest);

 				gmfCommand = CompositeCommand.compose(gmfCommand, moveCommand);

 			}

 		}

 

-		if(setTypeRequest != null) {

+		if (setTypeRequest != null) {

 			// Propagate parameters to the set request

 			setTypeRequest.addParameters(request.getParameters());

 

 			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(modifiedPropertyType);

-			if(provider != null) {

+			if (provider != null) {

 				ICommand setTypeCommand = provider.getEditCommand(setTypeRequest);

 				gmfCommand = CompositeCommand.compose(gmfCommand, setTypeCommand);

 			}

@@ -251,8 +253,8 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 		Set<View> viewsToDestroy = new HashSet<View>();

 		viewsToDestroy.addAll(getViewsToDestroy(association, request));

 

-		//return the command to destroy all these views

-		if(!viewsToDestroy.isEmpty()) {

+		// return the command to destroy all these views

+		if (!viewsToDestroy.isEmpty()) {

 			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getRelationship(), false);

 			ddr.setClientContext(request.getClientContext());

 			ddr.addParameters(request.getParameters());

@@ -260,7 +262,7 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 			gmfCommand = CompositeCommand.compose(gmfCommand, destroyViewsCommand);

 		}

 

-		if(gmfCommand != null) {

+		if (gmfCommand != null) {

 			gmfCommand.reduce();

 		}

 		return gmfCommand;

@@ -268,18 +270,18 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Returns all views referencing Association except the view currently re-oriented.

-	 * 

+	 *

 	 * @param association

-	 *        the association referenced by views

+	 *            the association referenced by views

 	 * @param request

-	 *        the re-orient relationship request

+	 *            the re-orient relationship request

 	 * @return the list of views to be destroy

 	 */

 	private Set<View> getViewsToDestroy(Association association, ReorientRelationshipRequest request) {

 		Set<View> viewsToDestroy = new HashSet<View>();

 

 		// Find all views representing the Associations

-		EReference[] refs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

+		EReference[] refs = new EReference[] { NotationPackage.eINSTANCE.getView_Element() };

 		@SuppressWarnings("unchecked")

 		Collection<View> associationViews = EMFCoreUtil.getReferencers(association, refs);

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneDirectedEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneDirectedEditHelperAdvice.java
index e9cd6d98115..cb9156b1175 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneDirectedEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneDirectedEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -15,8 +15,8 @@ import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

 

-/** 

- * Edit helper advice for {@link Association} with "aggregation = none" and navigable in one way (used for creation purpose only). 

+/**

+ * Edit helper advice for {@link Association} with "aggregation = none" and navigable in one way (used for creation purpose only).

  */

 public class AssociationNoneDirectedEditHelperAdvice extends AssociationNoneEditHelperAdvice {

 

@@ -24,11 +24,11 @@ public class AssociationNoneDirectedEditHelperAdvice extends AssociationNoneEdit
 	 * <pre>

 	 * {@inheritDoc}

 	 * 

-	 * The currently created {@link Association} in the default case (aggregation = none), and directed 

+	 * The currently created {@link Association} in the default case (aggregation = none), and directed

 	 * (meaning navigable in one direction only) which in SysML means the target end is owned by the association itself.

 	 * 

-	 * Moreover this end name should not be set in that case, this latter rule is not followed here for now. 

-	 * 

+	 * Moreover this end name should not be set in that case, this latter rule is not followed here for now.

+	 *

 	 * </pre>

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneEditHelperAdvice.java
index 2b9587b3122..7052dda10d2 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -46,14 +46,14 @@ public class AssociationNoneEditHelperAdvice extends AssociationEditHelperAdvice
 

 	/**

 	 * This method provides the source type provided as {@link ConfigureRequest} parameter.

-	 * 

+	 *

 	 * @return the target role

 	 */

 	protected Classifier getSourceOwnerType(ConfigureRequest req) {

 		Classifier result = null;

 		Object paramObject = req.getParameter(CreateRelationshipRequest.SOURCE);

-		if(paramObject instanceof Classifier) {

-			result = (Classifier)paramObject;

+		if (paramObject instanceof Classifier) {

+			result = (Classifier) paramObject;

 		}

 

 		return result;

@@ -61,14 +61,14 @@ public class AssociationNoneEditHelperAdvice extends AssociationEditHelperAdvice
 

 	/**

 	 * This method provides the target type provided as {@link ConfigureRequest} parameter.

-	 * 

+	 *

 	 * @return the target role

 	 */

 	protected Classifier getTargetOwnerType(ConfigureRequest req) {

 		Classifier result = null;

 		Object paramObject = req.getParameter(CreateRelationshipRequest.TARGET);

-		if(paramObject instanceof Classifier) {

-			result = (Classifier)paramObject;

+		if (paramObject instanceof Classifier) {

+			result = (Classifier) paramObject;

 		}

 

 		return result;

@@ -76,30 +76,32 @@ public class AssociationNoneEditHelperAdvice extends AssociationEditHelperAdvice
 

 	/**

 	 * Creates a new {@link Property} from the propertyType in the propertyContainer

-	 * 

+	 *

 	 * @param propertyContainer

-	 *        the container of the {@link Property}

+	 *            the container of the {@link Property}

 	 * @param propertyType

-	 *        the type of the {@link Property}

+	 *            the type of the {@link Property}

 	 * @return the new {@link Property}

-	 * @throws ExecutionException 

-	 */	

-	protected Property createTargetProperty(Property targetProperty, Classifier propertyContainer, Type propertyType, Association association, TransactionalEditingDomain editingDomain, IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+	 * @throws ExecutionException

+	 */

+	protected Property createTargetProperty(Property targetProperty, Classifier propertyContainer, Type propertyType, Association association, TransactionalEditingDomain editingDomain, IProgressMonitor progressMonitor, IAdaptable info)

+			throws ExecutionException {

 		setPropertyType(targetProperty, propertyType, editingDomain, progressMonitor, info);

 		setPropertyName(targetProperty);

 		return targetProperty;

 	}

-	

-	protected Property createSourceProperty(Property sourceProperty, Classifier propertyContainer, Type propertyType, Association association, TransactionalEditingDomain editingDomain, IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+

+	protected Property createSourceProperty(Property sourceProperty, Classifier propertyContainer, Type propertyType, Association association, TransactionalEditingDomain editingDomain, IProgressMonitor progressMonitor, IAdaptable info)

+			throws ExecutionException {

 		setPropertyType(sourceProperty, propertyType, editingDomain, progressMonitor, info);

 		setPropertyName(sourceProperty);

 		return sourceProperty;

 	}

-	

+

 	protected void setPropertyType(Property property, Type propertyType, TransactionalEditingDomain editingDomain, IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

 		// Set type using all AdviceHelper (use ServiceEdit instead of manually set)

 		SetRequest request = new SetRequest(property, UMLPackage.eINSTANCE.getTypedElement_Type(), propertyType);

-		request.setEditingDomain(editingDomain);	

+		request.setEditingDomain(editingDomain);

 		IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(property);

 		ICommand editCommand = commandProvider.getEditCommand(request);

 		editCommand.execute(progressMonitor, info);

@@ -109,7 +111,7 @@ public class AssociationNoneEditHelperAdvice extends AssociationEditHelperAdvice
 		String baseName = property.getType().getName().toLowerCase();

 		Element owner = property.getOwner();

 		if (owner instanceof Classifier) {

-			List<Property> ownedAttributes = ClassifierUtils.getOwnedAttributes((Classifier)owner);

+			List<Property> ownedAttributes = ClassifierUtils.getOwnedAttributes((Classifier) owner);

 			String defaultNameWithIncrementFromBase = NamedElementHelper.getDefaultNameWithIncrementFromBase(

 					property.getType().getName().toLowerCase(), ownedAttributes, "_");

 			property.setName(defaultNameWithIncrementFromBase);

@@ -122,17 +124,19 @@ public class AssociationNoneEditHelperAdvice extends AssociationEditHelperAdvice
 

 	/**

 	 * This method has to be specialized by subclasses (AggregationKind)

+	 * 

 	 * @param sourceProperty

-	 * 			The property to configure

+	 *            The property to configure

 	 */

-	protected void configureSourceProperty(Property sourceProperty)  {

+	protected void configureSourceProperty(Property sourceProperty) {

 		// do nothing

 	}

 

 	/**

 	 * This method has to be specialized by subclasses (AggregationKind)

+	 * 

 	 * @param sourceProperty

-	 * 			The property to configure

+	 *            The property to configure

 	 */

 	protected void configureTargetProperty(Property targetProperty) {

 		// do nothing

@@ -140,42 +144,42 @@ public class AssociationNoneEditHelperAdvice extends AssociationEditHelperAdvice
 

 	/**

 	 * This method has to be specialized by subclasses (owner)

-	 * 

+	 *

 	 * @param sourceEnd

-	 *        the semantic end

+	 *            the semantic end

 	 * @param owner

-	 *        the end container

+	 *            the end container

 	 * @param targetType

-	 *        the target type

+	 *            the target type

 	 * @param association

-	 *        the association

+	 *            the association

 	 * @throws UnsupportedOperationException

 	 */

 	protected void addSourceInModel(final Property sourceEnd, Classifier owner, Type targetType, Association association) throws UnsupportedOperationException {

 		// set the container in order to allow Stereotype appliance

-		boolean added = ClassifierUtils.addOwnedAttribute(owner, sourceEnd); 

-		if(!added) {

+		boolean added = ClassifierUtils.addOwnedAttribute(owner, sourceEnd);

+		if (!added) {

 			throw new UnsupportedOperationException("Cannot add a Property on Classifier " + owner.getQualifiedName());

 		}

 	}

 

 	/**

 	 * This method has to be specialized by subclasses (owner)

-	 * 

+	 *

 	 * @param targetEnd

-	 *        the semantic end

+	 *            the semantic end

 	 * @param owner

-	 *        the end container

+	 *            the end container

 	 * @param sourceType

-	 *        the source type

+	 *            the source type

 	 * @param association

-	 *        the association

+	 *            the association

 	 * @throws UnsupportedOperationException

 	 */

 	protected void addTargetInModel(Property targetEnd, Classifier owner, Type sourceType, Association association) {

 		// set the container in order to allow Stereotype appliance

-		boolean added = ClassifierUtils.addOwnedAttribute(owner, targetEnd); 

-		if(!added) {

+		boolean added = ClassifierUtils.addOwnedAttribute(owner, targetEnd);

+		if (!added) {

 			throw new UnsupportedOperationException("Cannot add a Property on Classifier " + owner.getQualifiedName());

 		}

 	}

@@ -185,22 +189,23 @@ public class AssociationNoneEditHelperAdvice extends AssociationEditHelperAdvice
 	 * {@inheritDoc}

 	 * 

 	 * Complete the {@link Association} creation by setting its ends.

-	 * 

+	 *

 	 * </pre>

 	 */

 	@Override

 	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

 

-		final Association association = (Association)request.getElementToConfigure();

+		final Association association = (Association) request.getElementToConfigure();

 		final Classifier sourceType = getSourceOwnerType(request);

 		final Classifier targetType = getTargetOwnerType(request);

 

-		if((sourceType == null) || (targetType == null)) {

+		if ((sourceType == null) || (targetType == null)) {

 			return UnexecutableCommand.INSTANCE;

 		}

 

 		return new ConfigureElementCommand(request) {

 

+			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

 

 				try {

@@ -220,7 +225,7 @@ public class AssociationNoneEditHelperAdvice extends AssociationEditHelperAdvice
 					configureSourceProperty(targetProperty);

 					createSourceProperty(sourceProperty, targetType, sourceType, association, request.getEditingDomain(), progressMonitor, info);

 					configureTargetProperty(sourceProperty);

-	

+

 				} catch (Exception e) {

 					Activator.log.error(e);

 					return CommandResult.newCancelledCommandResult();

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java
index b2a121d4ee9..9daeee609f3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -15,7 +15,7 @@ import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

 

-/** 

+/**

  * Edit helper advice for {@link Association} with "aggregation = shared" and navigable in one way (used for creation purpose only).

  */

 public class AssociationSharedDirectedEditHelperAdvice extends AssociationSharedEditHelperAdvice {

@@ -24,11 +24,11 @@ public class AssociationSharedDirectedEditHelperAdvice extends AssociationShared
 	 * <pre>

 	 * {@inheritDoc}

 	 * 

-	 * The currently created {@link Association} is Shared (manage by super class), and directed 

+	 * The currently created {@link Association} is Shared (manage by super class), and directed

 	 * (meaning navigable in one direction only) which in SysML means the target end is owned by the association itself.

 	 * 

-	 * Moreover this end name should not be set in that case, this latter rule is not followed here for now. 

-	 * 

+	 * Moreover this end name should not be set in that case, this latter rule is not followed here for now.

+	 *

 	 * </pre>

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java
index 76afbbc68cf..af22069ebdd 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -15,7 +15,7 @@ import org.eclipse.uml2.uml.Association;
 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Property;

 

-/** 

+/**

  * Edit helper advice for {@link Association} with "aggregation = shared" (used for creation purpose only).

  */

 public class AssociationSharedEditHelperAdvice extends AssociationNoneEditHelperAdvice {

@@ -25,7 +25,7 @@ public class AssociationSharedEditHelperAdvice extends AssociationNoneEditHelper
 	 * {@inheritDoc}

 	 * 

 	 * The currently created {@link Association} is Shared (manage by super class):

-	 * 		it source {@link Property} aggregation is set to Shared kind. 

+	 * 		it source {@link Property} aggregation is set to Shared kind.

 	 * 

 	 * The currently created {@link Association} is bidirectional (navigable in both directions):

 	 * 		it source and target {@link Property} are owned by the {@link Classifier} (target and source end types),

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/BlockConnectorEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/BlockConnectorEditHelperAdvice.java
index 90237b7c6cd..75017f0163a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/BlockConnectorEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/BlockConnectorEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -34,7 +34,7 @@ import org.eclipse.uml2.uml.Property;
 
 /**
  * <pre>
- * This HelperAdvice completes {@link Block} edit commands with SysML 
+ * This HelperAdvice completes {@link Block} edit commands with SysML
  * specific {@link Connector} related actions:
  * - Block::isEncapsulated management
  * - NestedPropertyEnd management
@@ -43,67 +43,67 @@ import org.eclipse.uml2.uml.Property;
 public class BlockConnectorEditHelperAdvice extends AbstractEditHelperAdvice {
 
 	private ConnectorUtils utils = new ConnectorUtils();
-	
+
 	@Override
 	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {
-		
+
 		EObject source = request.getSource();
 		EObject target = request.getTarget();
 		View sourceView = RequestParameterUtils.getSourceView(request);
 		View targetView = RequestParameterUtils.getTargetView(request);
 
 		// Restrict this advice action to the end of Connector creation gesture (before clicking on target)
-		// in order to add SysML specific constraint 
-		if((request.getElementType() == UMLElementTypes.CONNECTOR) 
-			&& (request.getSource() != null) && (request.getTarget() != null) && (request.getContainer() != null)) {
-		
+		// in order to add SysML specific constraint
+		if ((request.getElementType() == UMLElementTypes.CONNECTOR)
+				&& (request.getSource() != null) && (request.getTarget() != null) && (request.getContainer() != null)) {
+
 			// Restrict action to SysML Connector (meaning owned by Block)
-			if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(request.getContainer())) {
+			if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(request.getContainer())) {
 
-				// If the source or target view is enclosed in a structure encapsulated view, forbid creation.			
-				if(utils.isCrossingEncapsulation(sourceView, targetView) 
-					|| utils.isCrossingEncapsulation(targetView, sourceView)) {
+				// If the source or target view is enclosed in a structure encapsulated view, forbid creation.
+				if (utils.isCrossingEncapsulation(sourceView, targetView)
+						|| utils.isCrossingEncapsulation(targetView, sourceView)) {
 					return UnexecutableCommand.INSTANCE;
 				}
 				if (ConnectorUtils.canCreate(source, target, sourceView, targetView)) {
-					request.setParameter( org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants.UML_STRICT, false);
+					request.setParameter(org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants.UML_STRICT, false);
 				}
 			}
 		}
-		
+
 		return super.getBeforeCreateRelationshipCommand(request);
 	}
-	
+
 	@Override
 	protected ICommand getAfterCreateRelationshipCommand(CreateRelationshipRequest request) {
-		
+
 		ICommand defaultCommand = super.getAfterCreateRelationshipCommand(request);
-		
+
 		View sourceView = RequestParameterUtils.getSourceView(request);
 		View targetView = RequestParameterUtils.getTargetView(request);
 
 		// Restrict this advice action to the end of Connector creation gesture (before clicking on target)
-		// in order to add SysML specific constraint 
-		if((request.getElementType() == UMLElementTypes.CONNECTOR) 
-			&& (request.getSource() != null) && (request.getTarget() != null) && (request.getContainer() != null)) {
-		
+		// in order to add SysML specific constraint
+		if ((request.getElementType() == UMLElementTypes.CONNECTOR)
+				&& (request.getSource() != null) && (request.getTarget() != null) && (request.getContainer() != null)) {
+
 			// Restrict action to SysML Connector (meaning owned by Block)
-			if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(request.getContainer())) {
-				
+			if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(request.getContainer())) {
+
 				// Check if source view is nested
-				if(utils.isNestedConnectableElement(sourceView, targetView)){
+				if (utils.isNestedConnectableElement(sourceView, targetView)) {
 					List<Property> nestedPath = utils.getNestedPropertyPath(sourceView, targetView);
-					defaultCommand = CompositeCommand.compose(defaultCommand, new SetNestedPathCommand("Set connector nested source path", request.getNewElement(), request, nestedPath, SetNestedPathCommand.NESTED_SOURCE)); //$NON-NLS-0$
+					defaultCommand = CompositeCommand.compose(defaultCommand, new SetNestedPathCommand("Set connector nested source path", request.getNewElement(), request, nestedPath, SetNestedPathCommand.NESTED_SOURCE));
 				}
 
 				// Check if target view is nested
-				if(utils.isNestedConnectableElement(targetView, sourceView)){
+				if (utils.isNestedConnectableElement(targetView, sourceView)) {
 					List<Property> nestedPath = utils.getNestedPropertyPath(targetView, sourceView);
-					defaultCommand = CompositeCommand.compose(defaultCommand, new SetNestedPathCommand("Set connector nested source path", request.getNewElement(), request, nestedPath, SetNestedPathCommand.NESTED_TARGET)); //$NON-NLS-0$
+					defaultCommand = CompositeCommand.compose(defaultCommand, new SetNestedPathCommand("Set connector nested source path", request.getNewElement(), request, nestedPath, SetNestedPathCommand.NESTED_TARGET));
 				}
 			}
 		}
-		
+
 		return defaultCommand;
 	}
 }
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ClassifierEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ClassifierEditHelperAdvice.java
index 0c873791d84..5bc74c8cdbb 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ClassifierEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ClassifierEditHelperAdvice.java
@@ -1,13 +1,13 @@
 /*****************************************************************************

  * Copyright (c) 2011 CEA LIST.

- * 

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- * 

+ *

  *		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

@@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

@@ -49,7 +50,7 @@ public class ClassifierEditHelperAdvice extends AbstractEditHelperAdvice {
 	 * 

 	 * While moving a {@link Property} to a Classifier:

 	 * - add possibly required (sysML) association re-factor command when needed.

-	 * 

+	 *

 	 * </pre>

 	 */

 	@Override

@@ -59,51 +60,52 @@ public class ClassifierEditHelperAdvice extends AbstractEditHelperAdvice {
 

 		// Treat related associations that required a re-factor action

 		// Retrieve elements already under re-factor.

-		List<EObject> currentlyRefactoredElements = (request.getParameter(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) != null) ? (List<EObject>)request.getParameter(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) : new ArrayList<EObject>();

+		List<EObject> currentlyRefactoredElements = (request.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) != null) ? (List<EObject>) request

+				.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) : new ArrayList<EObject>();

 

 		// Find Associations related to any moved Property

-		for(Object movedObject : request.getElementsToMove().keySet()) {

+		for (Object movedObject : request.getElementsToMove().keySet()) {

 

 			// Select Property (excluding Port) in the list of moved elements

-			if(!(movedObject instanceof Property) || (movedObject instanceof Port)) {

+			if (!(movedObject instanceof Property) || (movedObject instanceof Port)) {

 				continue;

 			}

 

-			Property movedProperty = (Property)movedObject;

+			Property movedProperty = (Property) movedObject;

 			Association relatedAssociation = movedProperty.getAssociation();

 

 			// The moved property has to be related to a SysML association

-			if((relatedAssociation == null) || !(ElementUtil.hasNature(relatedAssociation, SysMLElementTypes.SYSML_NATURE))) {

+			if ((relatedAssociation == null) || !(ElementUtil.hasNature(relatedAssociation, SysMLElementTypes.SYSML_NATURE))) {

 				continue;

 			}

 

 			// Make sure the target differs from current container

-			if((movedProperty.eContainer() == request.getTargetContainer()) && (movedProperty.eContainingFeature() == request.getTargetFeature(movedProperty))) {

+			if ((movedProperty.eContainer() == request.getTargetContainer()) && (movedProperty.eContainingFeature() == request.getTargetFeature(movedProperty))) {

 				continue;

 			}

 

 			// Make sure the target differs from related association (this move does not imply a re-factor, but simply an ownership change of an association end)

-			if((relatedAssociation == request.getTargetContainer()) && ((request.getTargetFeature(movedProperty) == null) || (UMLPackage.eINSTANCE.getAssociation_OwnedEnd() == request.getTargetFeature(movedProperty)))) {

-				continue; // This is a SysML Property#isNavigable update which does not require an Association refactoring action 

+			if ((relatedAssociation == request.getTargetContainer()) && ((request.getTargetFeature(movedProperty) == null) || (UMLPackage.eINSTANCE.getAssociation_OwnedEnd() == request.getTargetFeature(movedProperty)))) {

+				continue; // This is a SysML Property#isNavigable update which does not require an Association refactoring action

 			}

-			if((getOppositeAssociationEnd(movedProperty).getType() == request.getTargetContainer())) {

-				continue; // This is a SysML Property#isNavigable update which does not require an Association refactoring action 

+			if ((getOppositeAssociationEnd(movedProperty).getType() == request.getTargetContainer())) {

+				continue; // This is a SysML Property#isNavigable update which does not require an Association refactoring action

 			}

 

 			// Moved element already under re-factor ?

-			if(currentlyRefactoredElements.contains(movedObject) || currentlyRefactoredElements.contains(relatedAssociation)) {

+			if (currentlyRefactoredElements.contains(movedObject) || currentlyRefactoredElements.contains(relatedAssociation)) {

 				continue;

 

 			} else {

-				currentlyRefactoredElements.add((EObject)movedObject);

-				request.getParameters().put(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS, currentlyRefactoredElements);

+				currentlyRefactoredElements.add((EObject) movedObject);

+				request.getParameters().put(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS, currentlyRefactoredElements);

 			}

 

 			ICommand refactorCommand = getAssociationRefactoringCommand(movedProperty, relatedAssociation, request);

 			gmfCommand = CompositeCommand.compose(gmfCommand, refactorCommand);

 		}

 

-		if(gmfCommand != null) {

+		if (gmfCommand != null) {

 			gmfCommand = gmfCommand.reduce();

 		}

 

@@ -112,13 +114,13 @@ public class ClassifierEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Create a re-factoring command related to a Property move.

-	 * 

+	 *

 	 * @param movedProperty

-	 *        the moved property

+	 *            the moved property

 	 * @param associationToRefactor

-	 *        the association to re-factor (re-orient action)

+	 *            the association to re-factor (re-orient action)

 	 * @param request

-	 *        the original move request

+	 *            the original move request

 	 * @return the re-factoring command

 	 */

 	private ICommand getAssociationRefactoringCommand(Property movedProperty, Association associationToRefactor, MoveRequest request) {

@@ -126,16 +128,16 @@ public class ClassifierEditHelperAdvice extends AbstractEditHelperAdvice {
 		Association relatedAssociation = movedProperty.getAssociation(); // Should not be null, test before calling method.

 

 		// Re-orient the related association (do not use edit service to avoid infinite loop here)

-		int direction = ReorientRelationshipRequest.REORIENT_TARGET;

-		if(movedProperty == associationToRefactor.getMemberEnds().get(0)) {

-			direction = ReorientRelationshipRequest.REORIENT_SOURCE;

+		int direction = ReorientRequest.REORIENT_TARGET;

+		if (movedProperty == associationToRefactor.getMemberEnds().get(0)) {

+			direction = ReorientRequest.REORIENT_SOURCE;

 		}

 

 		ReorientRelationshipRequest reorientRequest = new ReorientRelationshipRequest(relatedAssociation, request.getTargetContainer(), movedProperty.eContainer(), direction);

 		reorientRequest.addParameters(request.getParameters());

 

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(relatedAssociation);

-		if(provider != null) {

+		if (provider != null) {

 			return provider.getEditCommand(reorientRequest);

 		}

 

@@ -144,15 +146,15 @@ public class ClassifierEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Get the opposite end of an AssociationEnd (binary association assumed).

-	 * 

+	 *

 	 * @param associationEnd

-	 *        the association end

+	 *            the association end

 	 * @return the opposite association end or null

 	 */

 	private Property getOppositeAssociationEnd(Property associationEnd) {

 		Property oppositeEnd = null;

 

-		if(associationEnd.getAssociation() != null) {

+		if (associationEnd.getAssociation() != null) {

 			Association association = associationEnd.getAssociation();

 			Set<Property> ends = new HashSet<Property>();

 			ends.addAll(association.getMemberEnds());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ConnectorEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ConnectorEditHelperAdvice.java
index 14fd4fe1c5c..d737443989c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ConnectorEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ConnectorEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -57,9 +57,9 @@ public class ConnectorEditHelperAdvice extends AbstractEditHelperAdvice {
 	private ConnectorUtils utils = new ConnectorUtils();

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

-	 * 

+	 *

 	 * @param request

 	 * @return

 	 */

@@ -67,44 +67,44 @@ public class ConnectorEditHelperAdvice extends AbstractEditHelperAdvice {
 	protected ICommand getBeforeReorientRelationshipCommand(final ReorientRelationshipRequest request) {

 		final CompositeCommand compositeCommand = new CompositeCommand("Destroy Connector View Command");

 

-		//the UML Connector Edit Helper Advice destroys connector views when roles changes

-		//Here, we destroys connectors views, when the path changes

+		// the UML Connector Edit Helper Advice destroys connector views when roles changes

+		// Here, we destroys connectors views, when the path changes

 		final EObject editedElement = request.getRelationship();

-		if(editedElement instanceof Connector) {

+		if (editedElement instanceof Connector) {

 

-			if(applySysMLRules(((Connector)editedElement).getOwner())) {

-				final Connector connector = (Connector)editedElement;

-				//verify the path now

+			if (applySysMLRules(((Connector) editedElement).getOwner())) {

+				final Connector connector = (Connector) editedElement;

+				// verify the path now

 				int reorientDirection = request.getDirection();

 				Edge reorientedEdgeView = RequestParameterUtils.getReconnectedEdge(request);

 				View newEndView = RequestParameterUtils.getReconnectedEndView(request);

 				View oppositeEndView = null;

-				if(reorientedEdgeView != null) {

-					oppositeEndView = (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) ? reorientedEdgeView.getTarget() : reorientedEdgeView.getSource();

+				if (reorientedEdgeView != null) {

+					oppositeEndView = (reorientDirection == ReorientRequest.REORIENT_SOURCE) ? reorientedEdgeView.getTarget() : reorientedEdgeView.getSource();

 				}

 				List<Property> newNestedPath = null;

-				if(reorientedEdgeView != null && newEndView != null) {

-					//we are working with a 'graphical' reconnect request

+				if (reorientedEdgeView != null && newEndView != null) {

+					// we are working with a 'graphical' reconnect request

 					newNestedPath = utils.getNestedPropertyPath(newEndView, oppositeEndView);

 				} else {

-					newNestedPath = (List<Property>)request.getParameter(ConnectorUtils.NESTED_CONNECTOR_END_PATH);

+					newNestedPath = (List<Property>) request.getParameter(ConnectorUtils.NESTED_CONNECTOR_END_PATH);

 				}

 

 				final Set<View> viewsToDestroy = utils.getViewsRepresentingConnector(connector);

 				final Iterator<View> iter = viewsToDestroy.iterator();

 

-				while(iter.hasNext()) {

-					final Edge current = (Edge)iter.next();

-					if(current != reorientedEdgeView) {

+				while (iter.hasNext()) {

+					final Edge current = (Edge) iter.next();

+					if (current != reorientedEdgeView) {

 						View oldEndView = null;

-						if(reorientDirection == ReorientReferenceRelationshipRequest.REORIENT_SOURCE) {

+						if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

 							oldEndView = current.getSource();

-						} else if(reorientDirection == ReorientReferenceRelationshipRequest.REORIENT_TARGET) {

+						} else if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

 							oldEndView = current.getTarget();

 						}

-						if(oppositeEndView != null) {

+						if (oppositeEndView != null) {

 							final List<Property> oldNestedPath = utils.getNestedPropertyPath(oldEndView, oppositeEndView);

-							if(!newNestedPath.equals(oldNestedPath)) {

+							if (!newNestedPath.equals(oldNestedPath)) {

 								final DestroyElementRequest destroyRequest = new DestroyElementRequest(request.getEditingDomain(), current, false);

 								final IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(current);

 								compositeCommand.add(commandProvider.getEditCommand(destroyRequest));

@@ -112,7 +112,7 @@ public class ConnectorEditHelperAdvice extends AbstractEditHelperAdvice {
 						}

 					}

 				}

-				if(!compositeCommand.isEmpty()) {

+				if (!compositeCommand.isEmpty()) {

 					return compositeCommand;

 				}

 			}

@@ -121,9 +121,9 @@ public class ConnectorEditHelperAdvice extends AbstractEditHelperAdvice {
 	}

 

 	/**

-	 * 

+	 *

 	 * @param connectorOwner

-	 *        the owner of the connector

+	 *            the owner of the connector

 	 * @return

 	 */

 	protected boolean applySysMLRules(final Element connectorOwner) {

@@ -132,7 +132,7 @@ public class ConnectorEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	@Override

 	protected ICommand getAfterReorientRelationshipCommand(final ReorientRelationshipRequest request) {

-		//we set the new value for the nested path

+		// we set the new value for the nested path

 		ICommand defaultCommand = super.getAfterReorientRelationshipCommand(request);

 

 		int reorientDirection = request.getDirection();

@@ -140,63 +140,63 @@ public class ConnectorEditHelperAdvice extends AbstractEditHelperAdvice {
 

 		// Restrict this advice action to the end of Connector creation gesture (before clicking on target)

 		// in order to add SysML specific constraint

-		Connector connector = (Connector)request.getRelationship();

-		//get the direction

+		Connector connector = (Connector) request.getRelationship();

+		// get the direction

 

 		// Restrict action to SysML Connector (meaning owned by Block)

-		if(((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(connector.eContainer())) {

+		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(connector.eContainer())) {

 			List<Property> tmpNestedPath = null;

 			Edge reorientedEdgeView = RequestParameterUtils.getReconnectedEdge(request);

 			View newEndView = RequestParameterUtils.getReconnectedEndView(request);

 			View oppositeEndView = null;

 

-			//graphical case : verify encapsulation and get the new path

+			// graphical case : verify encapsulation and get the new path

 			StructuredClassifier newOwner;

-			if(reorientedEdgeView != null) {

+			if (reorientedEdgeView != null) {

 

-				oppositeEndView = (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) ? reorientedEdgeView.getTarget() : reorientedEdgeView.getSource();

+				oppositeEndView = (reorientDirection == ReorientRequest.REORIENT_SOURCE) ? reorientedEdgeView.getTarget() : reorientedEdgeView.getSource();

 				Assert.isNotNull(oppositeEndView);

 				Assert.isNotNull(newEndView);

-				if(newEndView != null && oppositeEndView != null) {

+				if (newEndView != null && oppositeEndView != null) {

 					// If the source or target view is enclosed in a structure encapsulated view, forbid creation.

-					if(utils.isCrossingEncapsulation(newEndView, oppositeEndView) || utils.isCrossingEncapsulation(oppositeEndView, newEndView)) {

+					if (utils.isCrossingEncapsulation(newEndView, oppositeEndView) || utils.isCrossingEncapsulation(oppositeEndView, newEndView)) {

 						return UnexecutableCommand.INSTANCE;

 					}

-					//					newOwner = utils.deduceContainer(newEndView, oppositeEndView);

+					// newOwner = utils.deduceContainer(newEndView, oppositeEndView);

 					tmpNestedPath = utils.getNestedPropertyPath(newEndView, oppositeEndView);

 				}

 			} else {

-				//we are in the semantic case

-				tmpNestedPath = ((List<Property>)request.getParameter(ConnectorUtils.NESTED_CONNECTOR_END_PATH));

+				// we are in the semantic case

+				tmpNestedPath = ((List<Property>) request.getParameter(ConnectorUtils.NESTED_CONNECTOR_END_PATH));

 

-				//we need to verify encapsulation

-				if(ConnectorUtils.isCrossingEncapuslation(tmpNestedPath)) {

+				// we need to verify encapsulation

+				if (ConnectorUtils.isCrossingEncapuslation(tmpNestedPath)) {

 					return UnexecutableCommand.INSTANCE;

 				}

 			}

 

 			final List<ConnectableElement> oppositeFullNestedPath = new ArrayList<ConnectableElement>();

 			final List<ConnectableElement> newFullNestedPath = new ArrayList<ConnectableElement>(tmpNestedPath);

-			ConnectableElement newRole = (Property)request.getNewRelationshipEnd();

+			ConnectableElement newRole = (Property) request.getNewRelationshipEnd();

 			final ConnectorEnd oppositeEnd;

-			if(reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-				oppositeEnd = ((Connector)request.getRelationship()).getEnds().get(1);

+			if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

+				oppositeEnd = ((Connector) request.getRelationship()).getEnds().get(1);

 			} else {

-				oppositeEnd = ((Connector)request.getRelationship()).getEnds().get(0);

+				oppositeEnd = ((Connector) request.getRelationship()).getEnds().get(0);

 			}

 			final NestedConnectorEnd nestedConnectorEnd = UMLUtil.getStereotypeApplication(oppositeEnd, NestedConnectorEnd.class);

-			if(nestedConnectorEnd != null) {

+			if (nestedConnectorEnd != null) {

 				oppositeFullNestedPath.addAll(nestedConnectorEnd.getPropertyPath());

 			}

 			oppositeFullNestedPath.add(oppositeEnd.getRole());

 			newFullNestedPath.add(newRole);

 

-			//TODO : we should recalculate a new owner according to the new nested path, then update these nested path according to the new owner

-			//we don't do it now, because we have some troubles with connector

-			//final EncapsulatedClassifier newOwner = deduceNewConnectorOwner(oppositeFullNestedPath, newFullNestedPath);

-			

-			int tmpNestedPathDirection = (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) ? SetNestedPathCommand.NESTED_SOURCE : SetNestedPathCommand.NESTED_TARGET;

-			defaultCommand = CompositeCommand.compose(defaultCommand, new SetNestedPathCommand("Set connector nested source path", request.getRelationship(), request, tmpNestedPath, tmpNestedPathDirection)); //$NON-NLS-0$

+			// TODO : we should recalculate a new owner according to the new nested path, then update these nested path according to the new owner

+			// we don't do it now, because we have some troubles with connector

+			// final EncapsulatedClassifier newOwner = deduceNewConnectorOwner(oppositeFullNestedPath, newFullNestedPath);

+

+			int tmpNestedPathDirection = (reorientDirection == ReorientRequest.REORIENT_SOURCE) ? SetNestedPathCommand.NESTED_SOURCE : SetNestedPathCommand.NESTED_TARGET;

+			defaultCommand = CompositeCommand.compose(defaultCommand, new SetNestedPathCommand("Set connector nested source path", request.getRelationship(), request, tmpNestedPath, tmpNestedPathDirection));

 		}

 

 		return defaultCommand;

@@ -204,53 +204,53 @@ public class ConnectorEditHelperAdvice extends AbstractEditHelperAdvice {
 

 

 

-	//	/**

-	//	 * @param fullNestedPathWithrole1

-	//	 * @param fullNestedPathWithRole2

-	//	 * @return

-	//	 *         the new owner for the connector

-	//	 */

-	//doesnt work currently

-	//	public static final EncapsulatedClassifier deduceNewConnectorOwner(final List<ConnectableElement> fullNestedPathWithrole1, final List<ConnectableElement> fullNestedPathWithRole2) {

-	//		final ConnectableElement firstElementPath = fullNestedPathWithrole1.get(0);

-	//		//case of encapsulation of the part

-	//		if(fullNestedPathWithRole2.get(0) == firstElementPath) {

-	//			if(fullNestedPathWithRole2.size() > 1) {

-	//				fullNestedPathWithrole1.remove(0);

-	//				fullNestedPathWithRole2.remove(0);

-	//				return deduceNewConnectorOwner(fullNestedPathWithrole1, fullNestedPathWithRole2);

-	//			} else {

-	//				return (EncapsulatedClassifier)firstElementPath.getOwner();

-	//			}

-	//		} else {

-	//			final ConnectableElement firstElementPath2 = fullNestedPathWithRole2.get(0);

-	//			if(firstElementPath.getOwner() == firstElementPath2.getOwner()) {

-	//				return (EncapsulatedClassifier)firstElementPath.getOwner();

-	//			} else {

-	//				final List<ConnectableElement> biggestList;

-	//				final List<ConnectableElement> smallestList;

-	//				if(fullNestedPathWithrole1.size() > fullNestedPathWithRole2.size()) {

-	//					biggestList = fullNestedPathWithrole1;

-	//					smallestList = fullNestedPathWithRole2;

-	//				} else {

-	//					biggestList = fullNestedPathWithRole2;

-	//					smallestList = fullNestedPathWithrole1;

-	//				}

-	//				for(int i = 0; i < biggestList.size(); i++) {

-	//					final ConnectableElement current = biggestList.get(i);

-	//					if(smallestList.contains(current) && i > 0) {

-	//						return (EncapsulatedClassifier)biggestList.get(i - 1).getOwner();

-	//					}

-	//				}

-	//			}

-	//		}

-	//		return null;

-	//		//		throw new RuntimeException("error");

+	// /**

+	// * @param fullNestedPathWithrole1

+	// * @param fullNestedPathWithRole2

+	// * @return

+	// * the new owner for the connector

+	// */

+	// doesnt work currently

+	// public static final EncapsulatedClassifier deduceNewConnectorOwner(final List<ConnectableElement> fullNestedPathWithrole1, final List<ConnectableElement> fullNestedPathWithRole2) {

+	// final ConnectableElement firstElementPath = fullNestedPathWithrole1.get(0);

+	// //case of encapsulation of the part

+	// if(fullNestedPathWithRole2.get(0) == firstElementPath) {

+	// if(fullNestedPathWithRole2.size() > 1) {

+	// fullNestedPathWithrole1.remove(0);

+	// fullNestedPathWithRole2.remove(0);

+	// return deduceNewConnectorOwner(fullNestedPathWithrole1, fullNestedPathWithRole2);

+	// } else {

+	// return (EncapsulatedClassifier)firstElementPath.getOwner();

+	// }

+	// } else {

+	// final ConnectableElement firstElementPath2 = fullNestedPathWithRole2.get(0);

+	// if(firstElementPath.getOwner() == firstElementPath2.getOwner()) {

+	// return (EncapsulatedClassifier)firstElementPath.getOwner();

+	// } else {

+	// final List<ConnectableElement> biggestList;

+	// final List<ConnectableElement> smallestList;

+	// if(fullNestedPathWithrole1.size() > fullNestedPathWithRole2.size()) {

+	// biggestList = fullNestedPathWithrole1;

+	// smallestList = fullNestedPathWithRole2;

+	// } else {

+	// biggestList = fullNestedPathWithRole2;

+	// smallestList = fullNestedPathWithrole1;

+	// }

+	// for(int i = 0; i < biggestList.size(); i++) {

+	// final ConnectableElement current = biggestList.get(i);

+	// if(smallestList.contains(current) && i > 0) {

+	// return (EncapsulatedClassifier)biggestList.get(i - 1).getOwner();

+	// }

+	// }

+	// }

+	// }

+	// return null;

+	// // throw new RuntimeException("error");

 	//

 	//

 	//

 	//

 	//

-	//	}

+	// }

 

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PackageEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PackageEditHelperAdvice.java
index 3dcb6fa5621..aafb47c5d69 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PackageEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PackageEditHelperAdvice.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2012 CEA LIST.

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ public class PackageEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * In case of {@link Association} creation, it should not be possible to target an association as target end.

 	 */

 	@Override

@@ -41,16 +41,16 @@ public class PackageEditHelperAdvice extends AbstractEditHelperAdvice {
 		// test if the creation is for a SysML association

 

 		IElementType type = request.getElementType();

-		if(hasSuperType(type, SysMLElementTypes.ASSOCIATION)) {

+		if (hasSuperType(type, SysMLElementTypes.ASSOCIATION)) {

 			// test source and target...

 			EObject target = request.getTarget();

-			if(target instanceof Association || target == null) {

+			if (target instanceof Association || target == null) {

 				return UnexecutableCommand.INSTANCE;

 			}

 

 			if (!(hasSuperType(type, SysMLElementTypes.ASSOCIATION_NONE_DIRECTED) || hasSuperType(type, SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED) || hasSuperType(type, SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED))) {

 				// The association is bidirectional. Check if that is possible.

-				

+

 				// The target can be read-only only if the association is directed.

 				if (EMFUtil.isReadOnly(target)) {

 					return UnexecutableCommand.INSTANCE;

@@ -60,25 +60,25 @@ public class PackageEditHelperAdvice extends AbstractEditHelperAdvice {
 					return UnexecutableCommand.INSTANCE;

 				}

 			}

-			

+

 		}

 

 		return super.getBeforeCreateRelationshipCommand(request);

 	}

 

 	protected boolean hasSuperType(IElementType elementType, IElementType typeToTest) {

-		if(elementType == null || typeToTest == null) {

+		if (elementType == null || typeToTest == null) {

 			return false;

 		}

 

-		if(elementType.equals(typeToTest)) {

+		if (elementType.equals(typeToTest)) {

 			return true;

 		}

 

 		List<IElementType> superTypes = Arrays.asList(elementType.getAllSuperTypes());

-			if(superTypes.contains(typeToTest)) {

-				return true;

-			}

+		if (superTypes.contains(typeToTest)) {

+			return true;

+		}

 

 		return false;

 	}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PropertyEditHelperAdvice.java
index d028b869d48..3834a62738a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PropertyEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *      Christian W. Damus (CEA) - bug 402525

  *

@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.dialogs.MessageDialogWithToggle;

@@ -87,19 +88,19 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 		ICommand gmfCommand = super.getBeforeSetCommand(request);

 

 		EObject elementToEdit = request.getElementToEdit();

-		if((elementToEdit instanceof Property) && !(elementToEdit instanceof Port) && (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && (request.getValue() instanceof Type)) {

+		if ((elementToEdit instanceof Property) && !(elementToEdit instanceof Port) && (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && (request.getValue() instanceof Type)) {

 

-			Property propertyToEdit = (Property)elementToEdit;

+			Property propertyToEdit = (Property) elementToEdit;

 

 			// SysML specification : all property typed by a ConstraintBlock must have a ContraintProperty stereotype applied

-			if(request.getValue() instanceof org.eclipse.uml2.uml.Class) {

-				ICommand stereotypeApplicationCommand = getConstraintPropertyStereotypeApplicationCommand(propertyToEdit, (org.eclipse.uml2.uml.Class)request.getValue(), request);

+			if (request.getValue() instanceof org.eclipse.uml2.uml.Class) {

+				ICommand stereotypeApplicationCommand = getConstraintPropertyStereotypeApplicationCommand(propertyToEdit, (org.eclipse.uml2.uml.Class) request.getValue(), request);

 				gmfCommand = CompositeCommand.compose(gmfCommand, stereotypeApplicationCommand);

 			}

 

-			// Exclude ConstraintParameter (simple property without ConstraintProperty stereotype owned by a ConstraintBlock) 

-			if(propertyToEdit.eContainer() instanceof org.eclipse.uml2.uml.Class && UMLUtil.getStereotypeApplication((Element)propertyToEdit.eContainer(), ConstraintBlock.class) != null) {

-				if(UMLUtil.getStereotypeApplication(propertyToEdit, ConstraintProperty.class) == null) {

+			// Exclude ConstraintParameter (simple property without ConstraintProperty stereotype owned by a ConstraintBlock)

+			if (propertyToEdit.eContainer() instanceof org.eclipse.uml2.uml.Class && UMLUtil.getStereotypeApplication((Element) propertyToEdit.eContainer(), ConstraintBlock.class) != null) {

+				if (UMLUtil.getStereotypeApplication(propertyToEdit, ConstraintProperty.class) == null) {

 					return gmfCommand;

 				}

 			}

@@ -107,14 +108,15 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 			Association relatedAssociation = propertyToEdit.getAssociation();

 

 			// The edited property has to be related to a SysML association

-			if((relatedAssociation == null) || !(ElementUtil.hasNature(relatedAssociation, SysMLElementTypes.SYSML_NATURE))) {

+			if ((relatedAssociation == null) || !(ElementUtil.hasNature(relatedAssociation, SysMLElementTypes.SYSML_NATURE))) {

 

-				// If no association exist and the new type is a Block 

+				// If no association exist and the new type is a Block

 				// (not a ConstraintBlock => a property typed by a ConstraintBlock is a ConstraintProperty, not a Part neither a Reference),

 				// add the association

-				if((relatedAssociation == null) && ((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches((Type)request.getValue()) && !((ISpecializationType)SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type)request.getValue()) && ((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches(propertyToEdit.eContainer())) {

+				if ((relatedAssociation == null) && ((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue()) && !((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) request.getValue())

+						&& ((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(propertyToEdit.eContainer())) {

 

-					ICommand addAssociationCommand = getCreatePartAssociationCommand((org.eclipse.uml2.uml.Class)propertyToEdit.eContainer(), propertyToEdit, (org.eclipse.uml2.uml.Class)request.getValue());

+					ICommand addAssociationCommand = getCreatePartAssociationCommand((org.eclipse.uml2.uml.Class) propertyToEdit.eContainer(), propertyToEdit, (org.eclipse.uml2.uml.Class) request.getValue());

 					gmfCommand = CompositeCommand.compose(gmfCommand, addAssociationCommand);

 				}

 

@@ -123,13 +125,14 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 

 			// Setting new type can be related to an association re-orient (or trigger the association re-orient)

 			// Retrieve elements already under re-factor.

-			List<EObject> currentlyRefactoredElements = (request.getParameter(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) != null) ? (List<EObject>)request.getParameter(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) : new ArrayList<EObject>();

-			if(!currentlyRefactoredElements.contains(propertyToEdit)) {

+			List<EObject> currentlyRefactoredElements = (request.getParameter(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) != null) ? (List<EObject>) request.getParameter(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS)

+					: new ArrayList<EObject>();

+			if (!currentlyRefactoredElements.contains(propertyToEdit)) {

 				currentlyRefactoredElements.add(propertyToEdit);

 				request.getParameters().put(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS, currentlyRefactoredElements);

 

 				// Current association already under re-factor ?

-				if(currentlyRefactoredElements.contains(relatedAssociation)) {

+				if (currentlyRefactoredElements.contains(relatedAssociation)) {

 					return gmfCommand;

 				}

 			}

@@ -137,7 +140,7 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 			// If the new type is not a block, destroy related association

 			// This must be done only if the setting of the property type is not part of an association re-orient (hence after the previous code-block),

 			// otherwise there is no legitimate reason to destroy the existing association while re-orienting it.

-			if(!((ISpecializationType)SysMLElementTypes.BLOCK).getMatcher().matches((Type)request.getValue()) && propertyToEdit.getType() != null) {

+			if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue()) && propertyToEdit.getType() != null) {

 				ICommand destroyCommand = getDestroyPartAssociationCommand(relatedAssociation, propertyToEdit);

 				gmfCommand = CompositeCommand.compose(gmfCommand, destroyCommand);

 

@@ -148,7 +151,7 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 			gmfCommand = CompositeCommand.compose(gmfCommand, refactorCommand);

 		}

 

-		if(gmfCommand != null) {

+		if (gmfCommand != null) {

 			gmfCommand = gmfCommand.reduce();

 		}

 

@@ -156,9 +159,9 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterSetCommand(org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest)

-	 * 

+	 *

 	 * @param setRequest

 	 * @return

 	 */

@@ -166,16 +169,16 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 	protected ICommand getAfterSetCommand(SetRequest setRequest) {

 		ICommand afterSetCommand = super.getAfterSetCommand(setRequest);

 		EObject elementToEdit = setRequest.getElementToEdit();

-		if((elementToEdit instanceof Property) && !(elementToEdit instanceof Port) && (setRequest.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && (setRequest.getValue() instanceof Type)) {

-			afterSetCommand = getDestroyAssociatedNestedConnectorCommand((Property)elementToEdit, afterSetCommand);

+		if ((elementToEdit instanceof Property) && !(elementToEdit instanceof Port) && (setRequest.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && (setRequest.getValue() instanceof Type)) {

+			afterSetCommand = getDestroyAssociatedNestedConnectorCommand((Property) elementToEdit, afterSetCommand);

 		}

 		return afterSetCommand;

 	}

 

 	/**

-	 * 

+	 *

 	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)

-	 * 

+	 *

 	 * @param destroyDependentsRequest

 	 * @return

 	 */

@@ -183,27 +186,27 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 	protected ICommand getAfterDestroyDependentsCommand(DestroyDependentsRequest destroyDependentsRequest) {

 		ICommand afterDestroyDependentsCommand = super.getAfterDestroyDependentsCommand(destroyDependentsRequest);

 		EObject elementToDestroy = destroyDependentsRequest.getElementToDestroy();

-		if(elementToDestroy instanceof Property) {

-			afterDestroyDependentsCommand = getDestroyAssociatedNestedConnectorCommand((Property)elementToDestroy, afterDestroyDependentsCommand);

+		if (elementToDestroy instanceof Property) {

+			afterDestroyDependentsCommand = getDestroyAssociatedNestedConnectorCommand((Property) elementToDestroy, afterDestroyDependentsCommand);

 		}

 		return afterDestroyDependentsCommand;

 	}

 

 	/**

 	 * Create a destroy command for all connectors that have this property in their <NestedConnectorEnd> property path.

-	 * 

+	 *

 	 * @param property

-	 *        the part to be destroyed

+	 *            the part to be destroyed

 	 * @param command

 	 * @return

 	 */

 	private ICommand getDestroyAssociatedNestedConnectorCommand(Property property, ICommand command) {

 		Package rootPackage = PackageUtil.getRootPackage(property);

-		// When creating a property in a new-element dialog, it is not attached to the model, yet.  So, there will be no need to worry about connectors

-		if(rootPackage != null) {

+		// When creating a property in a new-element dialog, it is not attached to the model, yet. So, there will be no need to worry about connectors

+		if (rootPackage != null) {

 			List<Connector> instancesFilteredByType = org.eclipse.papyrus.uml.tools.utils.ElementUtil.getInstancesFilteredByType(rootPackage, Connector.class, null);

-			List<Connector> connectorToDestroy = ConnectorUtils.filterConnectorByPropertyInNestedConnectorEnd(instancesFilteredByType, (Property)property);

-			for(Connector connector : connectorToDestroy) {

+			List<Connector> connectorToDestroy = ConnectorUtils.filterConnectorByPropertyInNestedConnectorEnd(instancesFilteredByType, property);

+			for (Connector connector : connectorToDestroy) {

 				ICommand destroyConnectorCommand = getDestroyConnectorCommand(connector);

 				command = CompositeCommand.compose(command, destroyConnectorCommand);

 			}

@@ -213,46 +216,46 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Create a connector destroy command.

-	 * 

+	 *

 	 * @param connector

 	 * @return the connector destroy command

 	 */

 	private ICommand getDestroyConnectorCommand(Connector connector) {

 		DestroyElementRequest request = new DestroyElementRequest(connector, false);

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(connector.eContainer());

-		if(provider == null) {

+		if (provider == null) {

 			return null;

 		}

 		return provider.getEditCommand(request);

 	}

-	

+

 	/**

 	 * Create a re-factoring command related to a Property move.

-	 * 

+	 *

 	 * @param setProperty

-	 *        the property which type is set

+	 *            the property which type is set

 	 * @param associationToRefactor

-	 *        the association to re-factor (re-orient action)

+	 *            the association to re-factor (re-orient action)

 	 * @param request

-	 *        the original set request

+	 *            the original set request

 	 * @return the re-factoring command

 	 */

 	private ICommand getAssociationRefactoringCommand(Property setProperty, Association associationToRefactor, SetRequest request) {

 

 		Association relatedAssociation = setProperty.getAssociation(); // Should not be null, test before calling method.

 

-		if(associationToRefactor.getMemberEnds().size() >= 2) {

+		if (associationToRefactor.getMemberEnds().size() >= 2) {

 			// Re-orient the related association (do not use edit service to avoid infinite loop here)

-			int direction = ReorientRelationshipRequest.REORIENT_TARGET;

-			if(setProperty == associationToRefactor.getMemberEnds().get(1)) {

-				direction = ReorientRelationshipRequest.REORIENT_SOURCE;

+			int direction = ReorientRequest.REORIENT_TARGET;

+			if (setProperty == associationToRefactor.getMemberEnds().get(1)) {

+				direction = ReorientRequest.REORIENT_SOURCE;

 			}

 

-			ReorientRelationshipRequest reorientRequest = new ReorientRelationshipRequest(relatedAssociation, (Type)request.getValue(), setProperty.eContainer(), direction);

+			ReorientRelationshipRequest reorientRequest = new ReorientRelationshipRequest(relatedAssociation, (Type) request.getValue(), setProperty.eContainer(), direction);

 			reorientRequest.addParameters(request.getParameters());

 

 			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(relatedAssociation);

-			if(provider != null) {

+			if (provider != null) {

 				return provider.getEditCommand(reorientRequest);

 			}

 		}

@@ -262,7 +265,7 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Create a part association creation command.

-	 * 

+	 *

 	 * @return the part association creation command

 	 */

 	private ICommand getCreatePartAssociationCommand(final org.eclipse.uml2.uml.Class sourceBlock, final Property sourceProperty, final org.eclipse.uml2.uml.Class targetBlock) {

@@ -286,7 +289,7 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 				Association association = UMLFactory.eINSTANCE.createAssociation();

 

 				// Add the association in the model

-				org.eclipse.uml2.uml.Package container = (org.eclipse.uml2.uml.Package)EMFCoreUtil.getLeastCommonContainer(Arrays.asList(new EObject[]{ sourceBlock, targetBlock }), UMLPackage.eINSTANCE.getPackage());

+				org.eclipse.uml2.uml.Package container = (org.eclipse.uml2.uml.Package) EMFCoreUtil.getLeastCommonContainer(Arrays.asList(new EObject[] { sourceBlock, targetBlock }), UMLPackage.eINSTANCE.getPackage());

 				container.getPackagedElements().add(association);

 

 				// Use existing Property as source...

@@ -311,7 +314,7 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Apply/remove the ConstraintProperty stereotype application

-	 * 

+	 *

 	 * @return the ConstraintProperty stereotype application command

 	 */

 	private ICommand getConstraintPropertyStereotypeApplicationCommand(final Property sourceProperty, final org.eclipse.uml2.uml.Class targetBlock, final SetRequest request) {

@@ -322,27 +325,30 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

 				// SysML specification : all property typed by a ConstraintBlock must have a ContraintProperty stereotype applied

 				ConstraintProperty constraintPropertyApplication = UMLUtil.getStereotypeApplication(sourceProperty, ConstraintProperty.class);

-				if(UMLUtil.getStereotypeApplication(targetBlock, ConstraintBlock.class) != null) {

-					if(constraintPropertyApplication == null) {

+				if (UMLUtil.getStereotypeApplication(targetBlock, ConstraintBlock.class) != null) {

+					if (constraintPropertyApplication == null) {

 						StereotypeApplicationHelper.INSTANCE.applyStereotype(sourceProperty, ConstraintsPackage.eINSTANCE.getConstraintProperty());

 						// Remove representations

 						Set<View> memberViewsToDestroy = CrossReferencerUtil.getCrossReferencingViews(sourceProperty, null);

-						if(memberViewsToDestroy.size() != 0) {

+						if (memberViewsToDestroy.size() != 0) {

 							final IPreferenceStore store = Activator.getDefault().getPreferenceStore();

 							final String DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY = "displayMessageForTypingActionPreferenceKey";

 							boolean contains = store.contains(DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY);

-							if(!contains) {

+							if (!contains) {

 								store.setValue(DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY, MessageDialogWithToggle.NEVER);

 								store.setDefault(DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY, MessageDialogWithToggle.NEVER);

 							}

 							final String hideValue = store.getString(DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY);

-							if(!hideValue.equals(MessageDialogWithToggle.ALWAYS)) {

+							if (!hideValue.equals(MessageDialogWithToggle.ALWAYS)) {

 								int size = memberViewsToDestroy.size();

-								MessageDialogWithToggle.openInformation(Display.getDefault().getActiveShell(), "Change Type Action", "WARNING! Typing a Property by a ConstraintBlock make this property become a ConstraintProperty. ConstraintProperty have a specific representation. " + "\nSo all representations of this property will be removed from the model  (" + size + " occurence" + ((size > 1) ? "s" : "") + ").", "Don't show this dialog the next time", false, store, DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY);

+								MessageDialogWithToggle.openInformation(Display.getDefault().getActiveShell(), "Change Type Action",

+										"WARNING! Typing a Property by a ConstraintBlock make this property become a ConstraintProperty. ConstraintProperty have a specific representation. "

+												+ "\nSo all representations of this property will be removed from the model  (" + size + " occurence" + ((size > 1) ? "s" : "") + ").", "Don't show this dialog the next time", false, store,

+										DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY);

 							}

 

 						}

-						for(View view : memberViewsToDestroy) {

+						for (View view : memberViewsToDestroy) {

 							final DestroyElementRequest destroyRequest = new DestroyElementRequest(request.getEditingDomain(), view, false);

 							final IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(view);

 							ICommand editCommand = commandProvider.getEditCommand(destroyRequest);

@@ -350,7 +356,7 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 						}

 					}

 				} else {

-					if(constraintPropertyApplication != null) {

+					if (constraintPropertyApplication != null) {

 						StereotypeApplicationHelper.INSTANCE.removeFromContainmentList(sourceProperty, constraintPropertyApplication);

 					}

 				}

@@ -361,18 +367,18 @@ public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Create a part association destroy command.

-	 * 

+	 *

 	 * @return the part association destroy command

 	 */

 	@SuppressWarnings("unchecked")

 	private ICommand getDestroyPartAssociationCommand(Association partAssociation, Property propertyToEdit) {

 

 		DestroyElementRequest request = new DestroyElementRequest(partAssociation, false);

-		List<EObject> dependentsToKeep = Arrays.asList(new EObject[]{ propertyToEdit });

+		List<EObject> dependentsToKeep = Arrays.asList(new EObject[] { propertyToEdit });

 		request.getParameters().put(RequestParameterConstants.DEPENDENTS_TO_KEEP, dependentsToKeep);

 

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(partAssociation.eContainer());

-		if(provider == null) {

+		if (provider == null) {

 			return null;

 		}

 		ICommand destroyCommand = provider.getEditCommand(request);

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ActorPartPropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ActorPartPropertyMatcher.java
index ac1d3a030af..19d5f2a25a8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ActorPartPropertyMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ActorPartPropertyMatcher.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -24,22 +24,22 @@ import org.eclipse.uml2.uml.Property;
  * Test if current {@link Property} is a {@link Actor} Part

  */

 public class ActorPartPropertyMatcher implements IElementMatcher {

-	

+

 	/**

 	 * {@inheritDoc}

 	 */

 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if((eObject instanceof Property) && !(eObject instanceof Port)) {

+		if ((eObject instanceof Property) && !(eObject instanceof Port)) {

+

+			Property element = (Property) eObject;

 

-			Property element = (Property)eObject;

-			

 			// The property is necessary a composition and has a type

 			if ((element.getType() != null) && (element.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {

-				

+

 				// Moreover its type has to be a Actor

-				if(element.getType() instanceof Actor) {

+				if (element.getType() instanceof Actor) {

 					isMatch = true;

 				}

 			}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java
index f8dad2bcbb4..44d4b8e29a2 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java
@@ -23,10 +23,10 @@ public class AllocateMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Abstraction) {

+		if (eObject instanceof Abstraction) {

 

-			Abstraction element = (Abstraction)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Allocate.class) != null) {

+			Abstraction element = (Abstraction) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Allocate.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AssociationMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AssociationMatcher.java
index 1ddebafa827..31063869b6d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AssociationMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AssociationMatcher.java
@@ -22,27 +22,27 @@ import org.eclipse.uml2.uml.Element;
  * This nature is used to:

  * - distinguish between UML and SysML expected behavior for {@link Association}

  * - decide whether and {@link Association} can be dropped and used in a specific diagram

- * - select the property view to use 

+ * - select the property view to use

  * </pre>

  */

 public class AssociationMatcher implements IElementMatcher {

-	

+

 	/** Test is the eObject is a SysML Association */

 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

 

 		if (eObject instanceof Association) {

-		

+

 			Association association = (Association) eObject;

 			if (hasValidNature(association)) {

 				isMatch = true;

 			}

 		}

-		

+

 		return isMatch;

 	}

-	

+

 	/** Valid nature is SysML Nature */

 	private boolean hasValidNature(Element element) {

 		return ElementUtil.hasNature(element, SysMLElementTypes.SYSML_NATURE);

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/BlockMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/BlockMatcher.java
index 44942f86aff..7dfc419fd8e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/BlockMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/BlockMatcher.java
@@ -23,10 +23,10 @@ public class BlockMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Class) {

+		if (eObject instanceof Class) {

 

-			Class element = (Class)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Block.class) != null) {

+			Class element = (Class) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Block.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java
index 855222ebb81..4da31863355 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java
@@ -23,10 +23,10 @@ public class ConformMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Dependency) {

+		if (eObject instanceof Dependency) {

 

-			Dependency element = (Dependency)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Conform.class) != null) {

+			Dependency element = (Dependency) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Conform.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java
index e0389a12cbd..f294cca846c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java
@@ -23,10 +23,10 @@ public class ConstraintBlockMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Class) {

+		if (eObject instanceof Class) {

 

-			Class element = (Class)eObject;

-			if(UMLUtil.getStereotypeApplication(element, ConstraintBlock.class) != null) {

+			Class element = (Class) eObject;

+			if (UMLUtil.getStereotypeApplication(element, ConstraintBlock.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java
index cc9d68f79db..676cc0ed6b0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java
@@ -23,10 +23,10 @@ public class ConstraintPropertyMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Property) {

+		if (eObject instanceof Property) {

 

 			Property element = (Property) eObject;

-			if(UMLUtil.getStereotypeApplication(element, ConstraintProperty.class) != null) {

+			if (UMLUtil.getStereotypeApplication(element, ConstraintProperty.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java
index f796413cb4d..74c51ab3f8a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java
@@ -23,10 +23,10 @@ public class CopyMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Abstraction) {

+		if (eObject instanceof Abstraction) {

 

-			Abstraction element = (Abstraction)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Copy.class) != null) {

+			Abstraction element = (Abstraction) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Copy.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java
index 320d26593bd..b88f0de6593 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java
@@ -23,10 +23,10 @@ public class DeriveReqtMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Abstraction) {

+		if (eObject instanceof Abstraction) {

 

-			Abstraction element = (Abstraction)eObject;

-			if(UMLUtil.getStereotypeApplication(element, DeriveReqt.class) != null) {

+			Abstraction element = (Abstraction) eObject;

+			if (UMLUtil.getStereotypeApplication(element, DeriveReqt.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java
index b1c8556d992..479f2fcc8a0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java
@@ -23,10 +23,10 @@ public class DimensionMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof InstanceSpecification) {

+		if (eObject instanceof InstanceSpecification) {

 

-			InstanceSpecification element = (InstanceSpecification)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Dimension.class) != null) {

+			InstanceSpecification element = (InstanceSpecification) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Dimension.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInMatcher.java
index 79afdc05690..2aaa65be6ed 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInMatcher.java
@@ -25,12 +25,12 @@ public class FlowPortInMatcher implements IElementMatcher {
 

 		boolean isFlowPort_IN = false;

 

-		if(eObject instanceof Port) {

+		if (eObject instanceof Port) {

 

-			Port port = (Port)eObject;

+			Port port = (Port) eObject;

 			FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);

 

-			if((flowPort != null) && (flowPort.getDirection() == FlowDirection.IN)) {

+			if ((flowPort != null) && (flowPort.getDirection() == FlowDirection.IN)) {

 				isFlowPort_IN = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInOutMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInOutMatcher.java
index 47d357e8d91..3ae4e13f393 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInOutMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInOutMatcher.java
@@ -25,12 +25,12 @@ public class FlowPortInOutMatcher implements IElementMatcher {
 

 		boolean isFlowPort_INOUT = false;

 

-		if(eObject instanceof Port) {

+		if (eObject instanceof Port) {

 

-			Port port = (Port)eObject;

+			Port port = (Port) eObject;

 			FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);

 

-			if((flowPort != null) && (flowPort.getDirection() == FlowDirection.INOUT)) {

+			if ((flowPort != null) && (flowPort.getDirection() == FlowDirection.INOUT)) {

 				isFlowPort_INOUT = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortMatcher.java
index 90294bf2964..e5411ac7f52 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortMatcher.java
@@ -23,10 +23,10 @@ public class FlowPortMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isFlowPort = false;

-		if(eObject instanceof Port) {

+		if (eObject instanceof Port) {

 

-			Port port = (Port)eObject;

-			if(UMLUtil.getStereotypeApplication(port, FlowPort.class) != null) {

+			Port port = (Port) eObject;

+			if (UMLUtil.getStereotypeApplication(port, FlowPort.class) != null) {

 				isFlowPort = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortNAMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortNAMatcher.java
index 87f38de218f..100b21b739f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortNAMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortNAMatcher.java
@@ -24,12 +24,12 @@ public class FlowPortNAMatcher implements IElementMatcher {
 

 		boolean isFlowPort_NA = false;

 

-		if(eObject instanceof Port) {

+		if (eObject instanceof Port) {

 

-			Port port = (Port)eObject;

+			Port port = (Port) eObject;

 			FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);

 

-			if((flowPort != null) && (! flowPort.isAtomic())) {

+			if ((flowPort != null) && (!flowPort.isAtomic())) {

 				isFlowPort_NA = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortOutMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortOutMatcher.java
index 4fe81a1afa7..9de3c167516 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortOutMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortOutMatcher.java
@@ -25,12 +25,12 @@ public class FlowPortOutMatcher implements IElementMatcher {
 

 		boolean isFlowPort_OUT = false;

 

-		if(eObject instanceof Port) {

+		if (eObject instanceof Port) {

 

-			Port port = (Port)eObject;

+			Port port = (Port) eObject;

 			FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);

 

-			if((flowPort != null) && (flowPort.getDirection() == FlowDirection.OUT)) {

+			if ((flowPort != null) && (flowPort.getDirection() == FlowDirection.OUT)) {

 				isFlowPort_OUT = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPropertyMatcher.java
index a384b9fa163..38c9ff296e5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPropertyMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPropertyMatcher.java
@@ -23,10 +23,10 @@ public class FlowPropertyMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isFlowProperty = false;

-		if(eObject instanceof Property) {

+		if (eObject instanceof Property) {

 

-			Property element = (Property)eObject;

-			if(UMLUtil.getStereotypeApplication(element, FlowProperty.class) != null) {

+			Property element = (Property) eObject;

+			if (UMLUtil.getStereotypeApplication(element, FlowProperty.class) != null) {

 				isFlowProperty = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowSpecificationMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowSpecificationMatcher.java
index 75de23621dc..8268b4e4e7f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowSpecificationMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowSpecificationMatcher.java
@@ -23,10 +23,10 @@ public class FlowSpecificationMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isFlowSpec = false;

-		if(eObject instanceof Interface) {

+		if (eObject instanceof Interface) {

 

-			Interface element = (Interface)eObject;

-			if(UMLUtil.getStereotypeApplication(element, FlowSpecification.class) != null) {

+			Interface element = (Interface) eObject;

+			if (UMLUtil.getStereotypeApplication(element, FlowSpecification.class) != null) {

 				isFlowSpec = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java
index 85a4f09af02..1e7466038e0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java
@@ -23,10 +23,10 @@ public class ItemFlowMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof InformationFlow) {

+		if (eObject instanceof InformationFlow) {

 

-			InformationFlow element = (InformationFlow)eObject;

-			if(UMLUtil.getStereotypeApplication(element, ItemFlow.class) != null) {

+			InformationFlow element = (InformationFlow) eObject;

+			if (UMLUtil.getStereotypeApplication(element, ItemFlow.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/PartPropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/PartPropertyMatcher.java
index c1161f8ce4d..b0828daa4bf 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/PartPropertyMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/PartPropertyMatcher.java
@@ -21,22 +21,22 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * Test if current {@link Property} is a {@link Block} Part

  */

 public class PartPropertyMatcher implements IElementMatcher {

-	

+

 	/**

 	 * {@inheritDoc}

 	 */

 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if((eObject instanceof Property) && !(eObject instanceof Port)) {

+		if ((eObject instanceof Property) && !(eObject instanceof Port)) {

+

+			Property element = (Property) eObject;

 

-			Property element = (Property)eObject;

-			

 			// The property is necessary a composition and has a type

 			if ((element.getType() != null) && (element.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {

-				

+

 				// Moreover its type has to be a Block

-				if(UMLUtil.getStereotypeApplication(element.getType(), Block.class) != null) {

+				if (UMLUtil.getStereotypeApplication(element.getType(), Block.class) != null) {

 					isMatch = true;

 				}

 			}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java
index 4bcea041202..e106e83044b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java
@@ -23,10 +23,10 @@ public class ProblemMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Comment) {

+		if (eObject instanceof Comment) {

 

-			Comment element = (Comment)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Problem.class) != null) {

+			Comment element = (Comment) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Problem.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java
index 29e755e784d..ba129dd61a8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java
@@ -23,10 +23,10 @@ public class RationaleMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Comment) {

+		if (eObject instanceof Comment) {

 

-			Comment element = (Comment)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Rationale.class) != null) {

+			Comment element = (Comment) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Rationale.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ReferencePropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ReferencePropertyMatcher.java
index 03d8a670920..604574d1a6f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ReferencePropertyMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ReferencePropertyMatcher.java
@@ -28,15 +28,15 @@ public class ReferencePropertyMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if((eObject instanceof Property) && !(eObject instanceof Port)) {

+		if ((eObject instanceof Property) && !(eObject instanceof Port)) {

+

+			Property element = (Property) eObject;

 

-			Property element = (Property)eObject;

-			

 			// The property is not a composition and has a type

 			if ((element.getType() != null) && (element.getAggregation() != AggregationKind.COMPOSITE_LITERAL)) {

-				

+

 				// Moreover its type has to be a Block

-				if(UMLUtil.getStereotypeApplication(element.getType(), Block.class) != null) {

+				if (UMLUtil.getStereotypeApplication(element.getType(), Block.class) != null) {

 					isMatch = true;

 				}

 			}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RequirementMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RequirementMatcher.java
index 0995d6f21e2..d30d2745113 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RequirementMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RequirementMatcher.java
@@ -23,10 +23,10 @@ public class RequirementMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Class) {

+		if (eObject instanceof Class) {

 

-			Class element = (Class)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Requirement.class) != null) {

+			Class element = (Class) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Requirement.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java
index 9535b83016c..1e11e82ccf4 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java
@@ -23,10 +23,10 @@ public class SatisfyMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Abstraction) {

+		if (eObject instanceof Abstraction) {

 

-			Abstraction element = (Abstraction)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Satisfy.class) != null) {

+			Abstraction element = (Abstraction) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Satisfy.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java
index 9adbc265c5d..a7afda41799 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java
@@ -23,10 +23,10 @@ public class UnitMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof InstanceSpecification) {

+		if (eObject instanceof InstanceSpecification) {

 

-			InstanceSpecification element = (InstanceSpecification)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Unit.class) != null) {

+			InstanceSpecification element = (InstanceSpecification) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Unit.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValuePropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValuePropertyMatcher.java
index 655a99f65dd..5ebf3f74c1d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValuePropertyMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValuePropertyMatcher.java
@@ -29,18 +29,18 @@ public class ValuePropertyMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if((eObject instanceof Property) && !(eObject instanceof Port)) {

+		if ((eObject instanceof Property) && !(eObject instanceof Port)) {

+

+			Property element = (Property) eObject;

 

-			Property element = (Property)eObject;

-			

 			// The property is necessary a composition and has a type

 			if ((element.getType() != null) && (element.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {

-				

+

 				// Moreover its type has either to be a DataType or a ValueType

-				if(UMLUtil.getStereotypeApplication(element.getType(), ValueType.class) != null) {

+				if (UMLUtil.getStereotypeApplication(element.getType(), ValueType.class) != null) {

 					isMatch = true;

 				}

-				if(element.getType() instanceof DataType) {

+				if (element.getType() instanceof DataType) {

 					isMatch = true;

 				}

 			}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java
index 81b73fe7512..5b98c8073ba 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java
@@ -23,10 +23,10 @@ public class ValueTypeEnumerationMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Enumeration) {

+		if (eObject instanceof Enumeration) {

 

-			Enumeration element = (Enumeration)eObject;

-			if(UMLUtil.getStereotypeApplication(element, ValueType.class) != null) {

+			Enumeration element = (Enumeration) eObject;

+			if (UMLUtil.getStereotypeApplication(element, ValueType.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java
index e3e4b2a44fe..48aae2bc7d7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java
@@ -23,10 +23,10 @@ public class ValueTypeMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof DataType) {

+		if (eObject instanceof DataType) {

 

-			DataType element = (DataType)eObject;

-			if(UMLUtil.getStereotypeApplication(element, ValueType.class) != null) {

+			DataType element = (DataType) eObject;

+			if (UMLUtil.getStereotypeApplication(element, ValueType.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java
index 00c89f2a0d7..b61e4cfd6b3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java
@@ -23,10 +23,10 @@ public class ValueTypePrimitiveTypeMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof PrimitiveType) {

+		if (eObject instanceof PrimitiveType) {

 

-			PrimitiveType element = (PrimitiveType)eObject;

-			if(UMLUtil.getStereotypeApplication(element, ValueType.class) != null) {

+			PrimitiveType element = (PrimitiveType) eObject;

+			if (UMLUtil.getStereotypeApplication(element, ValueType.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java
index d9e52e59daa..e3f67bf23a4 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java
@@ -23,10 +23,10 @@ public class VerifyMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Abstraction) {

+		if (eObject instanceof Abstraction) {

 

-			Abstraction element = (Abstraction)eObject;

-			if(UMLUtil.getStereotypeApplication(element, Verify.class) != null) {

+			Abstraction element = (Abstraction) eObject;

+			if (UMLUtil.getStereotypeApplication(element, Verify.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java
index 69e22c18fda..0a732ebd188 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java
@@ -23,10 +23,10 @@ public class ViewMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Package) {

+		if (eObject instanceof Package) {

 

-			Package element = (Package)eObject;

-			if(UMLUtil.getStereotypeApplication(element, View.class) != null) {

+			Package element = (Package) eObject;

+			if (UMLUtil.getStereotypeApplication(element, View.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java
index 80df0478472..b917cce651a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java
@@ -23,10 +23,10 @@ public class ViewPointMatcher implements IElementMatcher {
 	public boolean matches(EObject eObject) {

 

 		boolean isMatch = false;

-		if(eObject instanceof Class) {

+		if (eObject instanceof Class) {

 

-			Class element = (Class)eObject;

-			if(UMLUtil.getStereotypeApplication(element, ViewPoint.class) != null) {

+			Class element = (Class) eObject;

+			if (UMLUtil.getStereotypeApplication(element, ViewPoint.class) != null) {

 				isMatch = true;

 			}

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/menu/AbstractCreateSysmlChildMenu.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/menu/AbstractCreateSysmlChildMenu.java
index bacaa503732..5bd56d38b13 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/menu/AbstractCreateSysmlChildMenu.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/menu/AbstractCreateSysmlChildMenu.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

- * 

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -24,7 +24,7 @@ public abstract class AbstractCreateSysmlChildMenu extends AbstractCreateMenuFro
 

 	/**

 	 * Constructor.

-	 * 

+	 *

 	 */

 	public AbstractCreateSysmlChildMenu() {

 		super(SYSML_CREATION_COMMAND_CATEGORY);

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/stereotype/helper/advice/BlockEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/stereotype/helper/advice/BlockEditHelperAdvice.java
index 0c69eca800f..1cf68fda908 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/stereotype/helper/advice/BlockEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/stereotype/helper/advice/BlockEditHelperAdvice.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

@@ -37,7 +37,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 

 /**

  * <pre>

- * This advice is used to remove inconsistent {@link Connector} when a related {@link Block} 

+ * This advice is used to remove inconsistent {@link Connector} when a related {@link Block}

  * is set as encapsulated ({@link Block#isEncapsulated()} property).

  * </pre>

  */

@@ -49,12 +49,12 @@ public class BlockEditHelperAdvice extends AbstractEditHelperAdvice {
 	 * 

 	 * Returns the command to destroy any {@link Connector} breaking encapsulation rules.

 	 * </pre>

-	 * 

+	 *

 	 * @param request

-	 *        the request to modify the model

+	 *            the request to modify the model

 	 * @return

 	 *         the command to destroy the views of the parts which are not owned by the new type

-	 * 

+	 *

 	 */

 	@Override

 	protected ICommand getBeforeSetCommand(SetRequest request) {

@@ -62,18 +62,18 @@ public class BlockEditHelperAdvice extends AbstractEditHelperAdvice {
 		Set<Connector> connectorToDelete = new HashSet<Connector>();

 

 		EObject elementToEdit = request.getElementToEdit();

-		if((elementToEdit instanceof Block) && (request.getFeature() == BlocksPackage.eINSTANCE.getBlock_IsEncapsulated())) {

+		if ((elementToEdit instanceof Block) && (request.getFeature() == BlocksPackage.eINSTANCE.getBlock_IsEncapsulated())) {

+

+			Block blockApp = (Block) elementToEdit;

+			Boolean setAsEncapsulated = (request.getValue() instanceof Boolean) ? (Boolean) request.getValue() : false;

+			if (!blockApp.isEncapsulated() && setAsEncapsulated) {

 

-			Block blockApp = (Block)elementToEdit;

-			Boolean setAsEncapsulated = (request.getValue() instanceof Boolean) ? (Boolean)request.getValue() : false;

-			if(!blockApp.isEncapsulated() && setAsEncapsulated) {

-				

 				for (Property property : getPropertyTypedByBlock(blockApp)) {

 					for (NestedConnectorEnd nestedEnd : getRelatedNestedConnectorEnd(property)) {

 						ConnectorEnd end = nestedEnd.getBase_ConnectorEnd();

 						Connector connector = (end != null) ? (Connector) end.eContainer() : null;

 						if (connector != null) {

-							connectorToDelete.add(connector);	

+							connectorToDelete.add(connector);

 						}

 					}

 				}

@@ -81,12 +81,12 @@ public class BlockEditHelperAdvice extends AbstractEditHelperAdvice {
 		}

 

 		// Add connector destroy command if needed

-		if(!(connectorToDelete.isEmpty())) {

+		if (!(connectorToDelete.isEmpty())) {

 			DestroyDependentsRequest req = new DestroyDependentsRequest(request.getEditingDomain(), elementToEdit, false);

 			req.setClientContext(request.getClientContext());

 			req.addParameters(request.getParameters());

 			ICommand connectorDestroyCommand = req.getDestroyDependentsCommand(connectorToDelete);

-			if(connectorDestroyCommand != null) {

+			if (connectorDestroyCommand != null) {

 				setCommand = CompositeCommand.compose(connectorDestroyCommand, setCommand);

 			}

 		}

@@ -96,27 +96,31 @@ public class BlockEditHelperAdvice extends AbstractEditHelperAdvice {
 

 	/**

 	 * Get any {@link Property} typed by the given {@link Block} (its base class).

-	 * @param block the block.

-	 * @return a collection of {@link Property} 

+	 * 

+	 * @param block

+	 *            the block.

+	 * @return a collection of {@link Property}

 	 */

 	@SuppressWarnings("unchecked")

 	private Collection<Property> getPropertyTypedByBlock(Block block) {

-		EReference[] eRefs = new EReference[]{ UMLPackage.eINSTANCE.getTypedElement_Type() };

-		 

-		Collection<Property> references = (Collection<Property>) EMFCoreUtil.getReferencers(block.getBase_Class(), eRefs);

+		EReference[] eRefs = new EReference[] { UMLPackage.eINSTANCE.getTypedElement_Type() };

+

+		Collection<Property> references = EMFCoreUtil.getReferencers(block.getBase_Class(), eRefs);

 		return (references != null) ? references : Collections.unmodifiableList(new ArrayList<Property>());

 	}

-	

+

 	/**

 	 * Get any {@link NestedConnectorEnd} stereotype application that holds the property in its path.

-	 * @param property the property that should be in the path.

-	 * @return a collection of {@link NestedConnectorEnd} 

+	 * 

+	 * @param property

+	 *            the property that should be in the path.

+	 * @return a collection of {@link NestedConnectorEnd}

 	 */

 	@SuppressWarnings("unchecked")

 	private Collection<NestedConnectorEnd> getRelatedNestedConnectorEnd(Property property) {

-		EReference[] eRefs = new EReference[]{ BlocksPackage.eINSTANCE.getNestedConnectorEnd_PropertyPath() };

-	

-		Collection<NestedConnectorEnd> references = (Collection<NestedConnectorEnd>) EMFCoreUtil.getReferencers(property, eRefs);

+		EReference[] eRefs = new EReference[] { BlocksPackage.eINSTANCE.getNestedConnectorEnd_PropertyPath() };

+

+		Collection<NestedConnectorEnd> references = EMFCoreUtil.getReferencers(property, eRefs);

 		return (references != null) ? references : Collections.unmodifiableList(new ArrayList<NestedConnectorEnd>());

 	}

 }

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java
index af7de2bfed2..3bf674d4879 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
+ *
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -58,25 +58,26 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 	/**
 	 * Gets the encapsulated container.
 	 *
-	 * @param view the view
+	 * @param view
+	 *            the view
 	 * @return the nearest encapsulated structure container or null
 	 */
 	public View getEncapsulatedContainer(View view) {
 		View encapsulatedContainer = null;
 
-		for(View containerView : getStructureContainers(view)) {
+		for (View containerView : getStructureContainers(view)) {
 
-			if(view == containerView) {
+			if (view == containerView) {
 				continue;
 			}
 
-			if((view.getElement() instanceof Port) && (containerView.getChildren().contains(view))) {
+			if ((view.getElement() instanceof Port) && (containerView.getChildren().contains(view))) {
 				continue;
 			}
 
 			StructuredClassifier structuredClassifier = getStructuredClassifier(containerView);
 			Block block = UMLUtil.getStereotypeApplication(structuredClassifier, Block.class);
-			if(block.isEncapsulated()) {
+			if (block.isEncapsulated()) {
 				encapsulatedContainer = containerView;
 				break;
 			}
@@ -87,22 +88,22 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 
 	/**
 	 * Test if an encapsulation crossing is required to connect the checked end to the opposite end.
-	 * 
+	 *
 	 * @param checkedEnd
-	 *        the checked end view.
+	 *            the checked end view.
 	 * @param oppositeEnd
-	 *        the opposite end view.
+	 *            the opposite end view.
 	 * @return true if the gesture break encapsulation rule.
 	 */
 	public boolean isCrossingEncapsulation(View checkedEnd, View oppositeEnd) {
 		boolean isCrossingEncapsulation = false;
 
 		View encapsulatedContainer = new ConnectorUtils().getEncapsulatedContainer(checkedEnd);
-		if(encapsulatedContainer != null) {
+		if (encapsulatedContainer != null) {
 			View containerView = new ConnectorUtils().deduceViewContainer(checkedEnd, oppositeEnd);
 			List<View> containers = new ConnectorUtils().getStructureContainers(checkedEnd);
 
-			if(containers.indexOf(encapsulatedContainer) < containers.indexOf(containerView)) {
+			if (containers.indexOf(encapsulatedContainer) < containers.indexOf(containerView)) {
 				isCrossingEncapsulation = true;
 			}
 		}
@@ -112,22 +113,22 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 
 	/**
 	 * Get the path of structure views crossed by the checked end.
-	 * 
+	 *
 	 * @param checkedEnd
-	 *        the checked end view.
+	 *            the checked end view.
 	 * @param oppositeEnd
-	 *        the opposite end view.
+	 *            the opposite end view.
 	 * @return the list of crossed structure views.
 	 */
 	public List<View> getNestedPath(View checkedEnd, View oppositeEnd) {
 		List<View> isNestedConnectableElement = new ArrayList<View>();
 
 		View nearestContainer = new ConnectorUtils().getNearestStructureContainer(checkedEnd);
-		if(nearestContainer != null) {
+		if (nearestContainer != null) {
 			View containerView = new ConnectorUtils().deduceViewContainer(checkedEnd, oppositeEnd);
 			List<View> containers = new ConnectorUtils().getStructureContainers(checkedEnd);
 
-			if(containers.indexOf(nearestContainer) < containers.indexOf(containerView)) {
+			if (containers.indexOf(nearestContainer) < containers.indexOf(containerView)) {
 				isNestedConnectableElement = containers.subList(containers.indexOf(nearestContainer), containers.indexOf(containerView));
 			}
 		}
@@ -140,27 +141,27 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 
 	/**
 	 * Get the path of structure views crossed by the checked end.
-	 * 
+	 *
 	 * @param checkedEnd
-	 *        the checked end view.
+	 *            the checked end view.
 	 * @param oppositeEnd
-	 *        the opposite end view.
+	 *            the opposite end view.
 	 * @return the list of crossed structure views.
 	 */
 	public List<Property> getNestedPropertyPath(View checkedEnd, View oppositeEnd) {
 		List<Property> nestedPropertyPath = new ArrayList<Property>();
 		List<View> nestedPath = getNestedPath(checkedEnd, oppositeEnd);
 
-		for(View view : nestedPath) {
-			if((view.getElement() != null) && (view.getElement() instanceof Property)) {
-				nestedPropertyPath.add((Property)view.getElement());
+		for (View view : nestedPath) {
+			if ((view.getElement() != null) && (view.getElement() instanceof Property)) {
+				nestedPropertyPath.add((Property) view.getElement());
 			}
 		}
 
 		// if end is a port, and the list is not empty, add the property from the check view in the list
-		if(!nestedPropertyPath.isEmpty() && checkedEnd.getElement() instanceof Port) {
+		if (!nestedPropertyPath.isEmpty() && checkedEnd.getElement() instanceof Port) {
 			Property partWithPort = getPartWithPort(checkedEnd, oppositeEnd);
-			if(partWithPort != null) {
+			if (partWithPort != null) {
 				nestedPropertyPath.add(partWithPort);
 			}
 		}
@@ -170,11 +171,11 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 
 	/**
 	 * Test if the checked end is nested (means it cross StructuredClassifier borders).
-	 * 
+	 *
 	 * @param checkedEnd
-	 *        the checked end view.
+	 *            the checked end view.
 	 * @param oppositeEnd
-	 *        the opposite end view.
+	 *            the opposite end view.
 	 * @return true if the checked end is nested.
 	 */
 	public boolean isNestedConnectableElement(View checkedEnd, View oppositeEnd) {
@@ -184,19 +185,20 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 	/**
 	 * Gets the nearest structure container.
 	 *
-	 * @param view the view
+	 * @param view
+	 *            the view
 	 * @return the nearest structure container or null
 	 */
 	public View getNearestStructureContainer(View view) {
 		View nearestStructureContainer = null;
 
-		for(View containerView : getStructureContainers(view)) {
+		for (View containerView : getStructureContainers(view)) {
 
-			if(view == containerView) {
+			if (view == containerView) {
 				continue;
 			}
 
-			if((view.getElement() instanceof Port) && (containerView.getChildren().contains(view))) {
+			if ((view.getElement() instanceof Port) && (containerView.getChildren().contains(view))) {
 				continue;
 			}
 
@@ -212,25 +214,26 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 	/**
 	 * Gets the role path.
 	 *
-	 * @param end the connector end
+	 * @param end
+	 *            the connector end
 	 * @return the role path
-	 * the path for the role of the connector end (without using label provider)
+	 *         the path for the role of the connector end (without using label provider)
 	 */
 	public static final String getRolePath(final ConnectorEnd end) {
 		final NestedConnectorEnd nestedConnectorEnd = UMLUtil.getStereotypeApplication(end, NestedConnectorEnd.class);
 		final ConnectableElement role = end.getRole();
 		final StringBuilder rolePath = new StringBuilder();
-		if(role != null) {
-			if(nestedConnectorEnd != null) {
+		if (role != null) {
+			if (nestedConnectorEnd != null) {
 				final List<Property> properties = nestedConnectorEnd.getPropertyPath();
-				for(final Property current : properties) {
+				for (final Property current : properties) {
 					rolePath.append(getNameWithQuotes(current));
 					rolePath.append(ConnectorUtils.PART_SEPARATOR);
 				}
 			} else {
-				//when the stereotype is applied, the Property for partWithPort is included in the stereotype#path
+				// when the stereotype is applied, the Property for partWithPort is included in the stereotype#path
 				final Property partWithPort = end.getPartWithPort();
-				if(partWithPort != null) {
+				if (partWithPort != null) {
 					rolePath.append(getNameWithQuotes(partWithPort));
 					rolePath.append(ConnectorUtils.PART_SEPARATOR);
 				}
@@ -244,9 +247,10 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 	/**
 	 * Gets the name with quotes.
 	 *
-	 * @param property a property
+	 * @param property
+	 *            a property
 	 * @return the name with quotes
-	 * the property name with name delimiter if it is required
+	 *         the property name with name delimiter if it is required
 	 */
 	public static final String getNameWithQuotes(final NamedElement property) {
 		final String partName = property.getName();
@@ -254,10 +258,10 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 		final Pattern pattern = Pattern.compile(ConnectorUtils.HAS_NO_WORD_CHAR_REGEX);
 		final Matcher matcher = pattern.matcher(partName);
 		boolean mustHaveQuote = false;
-		while(matcher.find() && !mustHaveQuote) {
+		while (matcher.find() && !mustHaveQuote) {
 			mustHaveQuote = true;
 		}
-		if(mustHaveQuote) {
+		if (mustHaveQuote) {
 			partNameBuffer.append(ConnectorUtils.STRING_DELIMITER);
 			partNameBuffer.append(partName);
 			partNameBuffer.append(ConnectorUtils.STRING_DELIMITER);
@@ -271,19 +275,19 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 	/**
 	 * Checks if is crossing encapuslation.
 	 *
-	 * @param nestedPath the nested path
-	 * @return true, if is crossing encapuslation
-	 * <code>true</code> if we are breaking encapsulation (see SysML rules in SysML Standard 1.2, p.44):
-	 * isEncapsulated: Boolean [0..1] If true, then the block is treated as a black box; a part typed by this black box can only be connected
-	 * via its ports or directly to its outer boundary. If false, or if a value is not present, then connections can be established to
-	 * elements of its internal structure via deep-nested connector ends.
+	 * @param nestedPath
+	 *            the nested path
+	 * @return true, if is crossing encapuslation <code>true</code> if we are breaking encapsulation (see SysML rules in SysML Standard 1.2, p.44):
+	 *         isEncapsulated: Boolean [0..1] If true, then the block is treated as a black box; a part typed by this black box can only be connected
+	 *         via its ports or directly to its outer boundary. If false, or if a value is not present, then connections can be established to
+	 *         elements of its internal structure via deep-nested connector ends.
 	 */
 	public static final boolean isCrossingEncapuslation(final List<Property> nestedPath) {
-		for(final Property current : nestedPath) {
+		for (final Property current : nestedPath) {
 			final Type type = current.getType();
-			if(type != null) {
+			if (type != null) {
 				final Block block = UMLUtil.getStereotypeApplication(type, Block.class);
-				if(block != null && block.isEncapsulated()) {
+				if (block != null && block.isEncapsulated()) {
 					return true;
 				}
 			}
@@ -294,21 +298,23 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 	/**
 	 * Can display existing connector between views according to nested paths.
 	 *
-	 * @param connector a connector existing in the model
-	 * @param sourceView a potential source for this connector
-	 * @param targetView a potential target for this connector
-	 * @return true, if successful
-	 * <code>true</code> if displaying the existing connector between this source and this target view is correct
+	 * @param connector
+	 *            a connector existing in the model
+	 * @param sourceView
+	 *            a potential source for this connector
+	 * @param targetView
+	 *            a potential target for this connector
+	 * @return true, if successful <code>true</code> if displaying the existing connector between this source and this target view is correct
 	 */
 	public static boolean canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths(final Connector connector, final View sourceView, final View targetView) {
 		ConnectorUtils utils = new ConnectorUtils();
 		final List<Property> sourcePath = utils.getNestedPropertyPath(sourceView, targetView);
 		final List<Property> targetPath = utils.getNestedPropertyPath(targetView, sourceView);
 		boolean hasWantedPath = true;
-		for(final ConnectorEnd end : connector.getEnds()) {
-			if(sourceView != null && end.getRole() == sourceView.getElement()) {
+		for (final ConnectorEnd end : connector.getEnds()) {
+			if (sourceView != null && end.getRole() == sourceView.getElement()) {
 				hasWantedPath = hasWantedPath && haveSamePath(sourcePath, end);
-			} else if(targetView != null && end.getRole() == targetView.getElement()) {
+			} else if (targetView != null && end.getRole() == targetView.getElement()) {
 				hasWantedPath = hasWantedPath && haveSamePath(targetPath, end);
 			}
 		}
@@ -316,146 +322,153 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 	}
 
 
-	
+
 	/**
 	 * Have same path.
 	 *
-	 * @param wantedPath the wanted nested path for the end
-	 * @param end an end
+	 * @param wantedPath
+	 *            the wanted nested path for the end
+	 * @param end
+	 *            an end
 	 * @return true, if successful
-	 * true if the end has as nested path THE wanted path
+	 *         true if the end has as nested path THE wanted path
 	 */
 	protected static boolean haveSamePath(final List<Property> wantedPath, final ConnectorEnd end) {
 		Stereotype ste = end.getAppliedStereotype("SysML::Blocks::NestedConnectorEnd");//$NON-NLS-1$
-		if(ste != null) {
-			final NestedConnectorEnd nestedConnectorEnd = (NestedConnectorEnd)end.getStereotypeApplication(ste);
+		if (ste != null) {
+			final NestedConnectorEnd nestedConnectorEnd = (NestedConnectorEnd) end.getStereotypeApplication(ste);
 			return nestedConnectorEnd.getPropertyPath().equals(wantedPath);
 		} else {
 			return wantedPath.isEmpty();
 		}
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Can display existing connector between views according to partWithPort.
 	 *
-	 * @param connector the connector
-	 * @param sourceView the source view
-	 * @param targetView the target view
+	 * @param connector
+	 *            the connector
+	 * @param sourceView
+	 *            the source view
+	 * @param targetView
+	 *            the target view
 	 * @return true, if successful
 	 */
 	public boolean canDisplayExistingConnectorBetweenViewsAccordingToPartWithPort(final Connector connector, final View sourceView, final View targetView) {
 		Property partWithPort = getPartWithPortFromConnector(connector);
-		if (partWithPort != null){
+		if (partWithPort != null) {
 			String partWithPortName = partWithPort.getName();
 			Type partWithPortType = partWithPort.getType();
 			EObject sourceContainer = ((View) sourceView.eContainer()).getElement();
-			EObject targetContainer = ((View) targetView.eContainer()).getElement();		
-			
+			EObject targetContainer = ((View) targetView.eContainer()).getElement();
+
 			boolean sameSourceType = false;
-			if (sourceContainer instanceof TypedElement){
-				sameSourceType = partWithPortType.conformsTo(((TypedElement)sourceContainer).getType());
+			if (sourceContainer instanceof TypedElement) {
+				sameSourceType = partWithPortType.conformsTo(((TypedElement) sourceContainer).getType());
 			}
 			boolean sameSourceName = partWithPortName.equals(((NamedElement) sourceContainer).getName());
-			
+
 			boolean sameTargetType = false;
-			if (targetContainer instanceof TypedElement){
-				sameTargetType = partWithPortType.conformsTo(((TypedElement)targetContainer).getType());
+			if (targetContainer instanceof TypedElement) {
+				sameTargetType = partWithPortType.conformsTo(((TypedElement) targetContainer).getType());
 			}
 			boolean sametargetName = partWithPortName.equals(((NamedElement) targetContainer).getName());
-			
+
 			return (sameSourceType && sameSourceName) || (sameTargetType && sametargetName);
 		}
 		return true;
-	}	
-	
+	}
+
 	/**
 	 * Gets the partWithPort from the connector.
 	 *
-	 * @param connector the connector
+	 * @param connector
+	 *            the connector
 	 * @return the part with port from connector
 	 */
-	public Property getPartWithPortFromConnector(final Connector connector){
-		if (connector!=null && connector.getEnds() != null){
-			for(final ConnectorEnd end : connector.getEnds()) {
+	public Property getPartWithPortFromConnector(final Connector connector) {
+		if (connector != null && connector.getEnds() != null) {
+			for (final ConnectorEnd end : connector.getEnds()) {
 				Property partWithPort = end.getPartWithPort();
-				if (partWithPort != null){
+				if (partWithPort != null) {
 					return partWithPort;
 				}
 			}
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Test if the relationship creation is allowed.
-	 * 
+	 *
 	 * @param source
-	 *        the relationship source can be null
+	 *            the relationship source can be null
 	 * @param target
-	 *        the relationship target can be null
+	 *            the relationship target can be null
 	 * @param sourceView
-	 *        the relationship graphical source can be null
+	 *            the relationship graphical source can be null
 	 * @param targetView
-	 *        the relationship graphical target can be null
+	 *            the relationship graphical target can be null
 	 * @return true if the creation is allowed
 	 */
 	public static boolean canCreate(EObject source, EObject target, View sourceView, View targetView) {
 
-		if((source != null) && !(source instanceof ConnectableElement)) {
+		if ((source != null) && !(source instanceof ConnectableElement)) {
 			return false;
 		}
 
-		if((target != null) && !(target instanceof ConnectableElement)) {
+		if ((target != null) && !(target instanceof ConnectableElement)) {
 			return false;
 		}
 
-		if((sourceView != null) && (targetView != null)) {
+		if ((sourceView != null) && (targetView != null)) {
 			// Allow to create a self connector on a view
-//			if(sourceView == targetView) {
-//				return false;
-//			}
+			// if(sourceView == targetView) {
+			// return false;
+			// }
 
 			// Cannot create a connector from a view representing a Part to its own Port (or the opposite)
-			if((sourceView.getChildren().contains(targetView)) || (targetView.getChildren().contains(sourceView))) {
+			if ((sourceView.getChildren().contains(targetView)) || (targetView.getChildren().contains(sourceView))) {
 				return false;
 			}
 
 			// Cannot connect a Part to one of its (possibly indirect) containment, must connect to one of its Port.
-			if(new ConnectorUtils().getStructureContainers(sourceView).contains(targetView) || new ConnectorUtils().getStructureContainers(targetView).contains(sourceView)) {
+			if (new ConnectorUtils().getStructureContainers(sourceView).contains(targetView) || new ConnectorUtils().getStructureContainers(targetView).contains(sourceView)) {
 				return false;
 			}
 		}
 		return true;
 	}
-	
-	
+
+
 
 	/**
 	 * Filter connectors that have this property in their <NestedConnectorEnd> property path.
+	 * 
 	 * @param connectors
 	 * @param part
 	 * @return connectors that have this property in their <NestedConnectorEnd> property path.
 	 */
-	public static List<Connector> filterConnectorByPropertyInNestedConnectorEnd(List<Connector> connectors, Property part) {		
+	public static List<Connector> filterConnectorByPropertyInNestedConnectorEnd(List<Connector> connectors, Property part) {
 		List<Connector> res = new ArrayList<Connector>();
-		for(Connector connector : connectors) {
+		for (Connector connector : connectors) {
 			EList<ConnectorEnd> ends = connector.getEnds();
-			for(ConnectorEnd connectorEnd : ends) {
+			for (ConnectorEnd connectorEnd : ends) {
 				NestedConnectorEnd stereotypeApplication = UMLUtil.getStereotypeApplication(connectorEnd, NestedConnectorEnd.class);
-				if (stereotypeApplication != null){
+				if (stereotypeApplication != null) {
 					EList<Property> propertyPath = stereotypeApplication.getPropertyPath();
-					for(Property property : propertyPath) {
-						if (property.equals(part)){	
+					for (Property property : propertyPath) {
+						if (property.equals(part)) {
 							res.add(connector);
 						}
 					}
 				}
-			}			
+			}
 		}
 		return res;
-	}	
-	
-	
+	}
+
+
 }
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlFactory.java
index 3e10ed719e1..820add8a829 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.SysmlPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface SysmlFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	SysmlFactory eINSTANCE = org.eclipse.papyrus.sysml.internal.impl.SysmlFactoryImpl.init();

@@ -37,7 +37,7 @@ public interface SysmlFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlPackage.java
index 0d5acd097a5..3953a44c237 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EPackage;
  * <!-- end-user-doc --> <!-- begin-model-doc --> Version : 1.0 Based on OMG

  * SysML Specification V1.0 (formal/2007-09-01) Trace instead of Abstraction in

  * SysML specifications. <!-- end-model-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.SysmlFactory

  * @model kind="package"

  * @generated

@@ -45,7 +45,7 @@ public interface SysmlPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -53,7 +53,7 @@ public interface SysmlPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em>Dummy</em>' data type. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see java.lang.String

 		 * @see org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl#getDummy()

 		 * @generated

@@ -65,7 +65,7 @@ public interface SysmlPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "sysml";

@@ -73,7 +73,7 @@ public interface SysmlPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML";

@@ -81,7 +81,7 @@ public interface SysmlPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "SysML";

@@ -90,7 +90,7 @@ public interface SysmlPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	SysmlPackage eINSTANCE = org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl.init();

@@ -98,7 +98,7 @@ public interface SysmlPackage extends EPackage {
 	/**

 	 * The meta object id for the '<em>Dummy</em>' data type. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see java.lang.String

 	 * @see org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl#getDummy()

 	 * @generated

@@ -108,7 +108,7 @@ public interface SysmlPackage extends EPackage {
 	/**

 	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for data type '<em>Dummy</em>'.

 	 * @see java.lang.String

 	 * @model instanceClass="java.lang.String"

@@ -119,7 +119,7 @@ public interface SysmlPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java
index bf50c965eaa..d7bfc047646 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface ActivitiesFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	ActivitiesFactory eINSTANCE = org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesFactoryImpl.init();

@@ -37,7 +37,7 @@ public interface ActivitiesFactory extends EFactory {
 	 * Returns a new object of class '<em>Optional</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Optional</em>'.

 	 * @generated

 	 */

@@ -47,7 +47,7 @@ public interface ActivitiesFactory extends EFactory {
 	 * Returns a new object of class '<em>Continuous</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Continuous</em>'.

 	 * @generated

 	 */

@@ -56,7 +56,7 @@ public interface ActivitiesFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Control Operator</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Control Operator</em>'.

 	 * @generated

 	 */

@@ -66,7 +66,7 @@ public interface ActivitiesFactory extends EFactory {
 	 * Returns a new object of class '<em>Discrete</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Discrete</em>'.

 	 * @generated

 	 */

@@ -76,7 +76,7 @@ public interface ActivitiesFactory extends EFactory {
 	 * Returns a new object of class '<em>No Buffer</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>No Buffer</em>'.

 	 * @generated

 	 */

@@ -86,7 +86,7 @@ public interface ActivitiesFactory extends EFactory {
 	 * Returns a new object of class '<em>Overwrite</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Overwrite</em>'.

 	 * @generated

 	 */

@@ -96,7 +96,7 @@ public interface ActivitiesFactory extends EFactory {
 	 * Returns a new object of class '<em>Probability</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Probability</em>'.

 	 * @generated

 	 */

@@ -106,7 +106,7 @@ public interface ActivitiesFactory extends EFactory {
 	 * Returns a new object of class '<em>Rate</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Rate</em>'.

 	 * @generated

 	 */

@@ -116,7 +116,7 @@ public interface ActivitiesFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java
index 9c3ef6ec85b..e1ed3d66064 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesFactory

  * @model kind="package"

  * @generated

@@ -44,7 +44,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -53,7 +53,7 @@ public interface ActivitiesPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.OptionalImpl

 		 * <em>Optional</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.OptionalImpl

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getOptional()

 		 * @generated

@@ -63,7 +63,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Parameter</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference OPTIONAL__BASE_PARAMETER = eINSTANCE.getOptional_Base_Parameter();

@@ -71,7 +71,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl <em>Rate</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getRate()

 		 * @generated

@@ -81,7 +81,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Parameter</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RATE__BASE_PARAMETER = eINSTANCE.getRate_Base_Parameter();

@@ -89,7 +89,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Activity Edge</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RATE__BASE_ACTIVITY_EDGE = eINSTANCE.getRate_Base_ActivityEdge();

@@ -97,7 +97,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Rate</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RATE__RATE = eINSTANCE.getRate_Rate();

@@ -106,7 +106,7 @@ public interface ActivitiesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl <em>Probability</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getProbability()

 		 * @generated

@@ -116,7 +116,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Activity Edge</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference PROBABILITY__BASE_ACTIVITY_EDGE = eINSTANCE.getProbability_Base_ActivityEdge();

@@ -124,7 +124,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Parameter Set</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference PROBABILITY__BASE_PARAMETER_SET = eINSTANCE.getProbability_Base_ParameterSet();

@@ -132,7 +132,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Probability</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference PROBABILITY__PROBABILITY = eINSTANCE.getProbability_Probability();

@@ -141,7 +141,7 @@ public interface ActivitiesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.ContinuousImpl <em>Continuous</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ContinuousImpl

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getContinuous()

 		 * @generated

@@ -152,7 +152,7 @@ public interface ActivitiesPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.DiscreteImpl

 		 * <em>Discrete</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.DiscreteImpl

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getDiscrete()

 		 * @generated

@@ -164,7 +164,7 @@ public interface ActivitiesPackage extends EPackage {
 		 * class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getControlOperator()

 		 * @generated

@@ -174,7 +174,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Operation</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference CONTROL_OPERATOR__BASE_OPERATION = eINSTANCE.getControlOperator_Base_Operation();

@@ -182,7 +182,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Behavior</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference CONTROL_OPERATOR__BASE_BEHAVIOR = eINSTANCE.getControlOperator_Base_Behavior();

@@ -191,7 +191,7 @@ public interface ActivitiesPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl

 		 * <em>No Buffer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getNoBuffer()

 		 * @generated

@@ -201,7 +201,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Object Node</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference NO_BUFFER__BASE_OBJECT_NODE = eINSTANCE.getNoBuffer_Base_ObjectNode();

@@ -210,7 +210,7 @@ public interface ActivitiesPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl

 		 * <em>Overwrite</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl

 		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getOverwrite()

 		 * @generated

@@ -220,7 +220,7 @@ public interface ActivitiesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Object Node</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference OVERWRITE__BASE_OBJECT_NODE = eINSTANCE.getOverwrite_Base_ObjectNode();

@@ -230,7 +230,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "activities";

@@ -238,7 +238,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Activities";

@@ -246,7 +246,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "Activities";

@@ -255,7 +255,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	ActivitiesPackage eINSTANCE = org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl.init();

@@ -263,7 +263,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.OptionalImpl <em>Optional</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.OptionalImpl

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getOptional()

 	 * @generated

@@ -273,7 +273,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Parameter</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -282,7 +282,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Optional</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -292,7 +292,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The number of operations of the '<em>Optional</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -301,7 +301,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl <em>Rate</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getRate()

 	 * @generated

@@ -311,7 +311,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Parameter</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -320,7 +320,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Activity Edge</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -329,7 +329,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Rate</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -338,7 +338,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Rate</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -348,7 +348,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The number of operations of the '<em>Rate</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -358,7 +358,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl

 	 * <em>Probability</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getProbability()

 	 * @generated

@@ -368,7 +368,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Activity Edge</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -377,7 +377,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Parameter Set</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -386,7 +386,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Probability</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -395,7 +395,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Probability</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -405,7 +405,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The number of operations of the '<em>Probability</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -415,7 +415,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.ContinuousImpl

 	 * <em>Continuous</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ContinuousImpl

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getContinuous()

 	 * @generated

@@ -425,7 +425,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Parameter</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -434,7 +434,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Activity Edge</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -443,7 +443,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Rate</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -452,7 +452,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Continuous</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -462,7 +462,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The number of operations of the '<em>Continuous</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -471,7 +471,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.DiscreteImpl <em>Discrete</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.DiscreteImpl

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getDiscrete()

 	 * @generated

@@ -481,7 +481,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Parameter</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -490,7 +490,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Activity Edge</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -499,7 +499,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Rate</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -508,7 +508,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Discrete</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -518,7 +518,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The number of operations of the '<em>Discrete</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -528,7 +528,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl <em>Control Operator</em>}' class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getControlOperator()

 	 * @generated

@@ -538,7 +538,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Operation</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -547,7 +547,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Behavior</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -556,7 +556,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Control Operator</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -566,7 +566,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The number of operations of the '<em>Control Operator</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -575,7 +575,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl <em>No Buffer</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getNoBuffer()

 	 * @generated

@@ -585,7 +585,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Object Node</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -594,7 +594,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>No Buffer</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -604,7 +604,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The number of operations of the '<em>No Buffer</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -613,7 +613,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl <em>Overwrite</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl

 	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getOverwrite()

 	 * @generated

@@ -623,7 +623,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Object Node</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -632,7 +632,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Overwrite</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -642,7 +642,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * The number of operations of the '<em>Overwrite</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -651,7 +651,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -660,7 +660,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Continuous <em>Continuous</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Continuous</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Continuous

 	 * @generated

@@ -671,7 +671,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.activities.ControlOperator

 	 * <em>Control Operator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Control Operator</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.ControlOperator

 	 * @generated

@@ -679,10 +679,9 @@ public interface ActivitiesPackage extends EPackage {
 	EClass getControlOperator();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Behavior <em>Base Behavior</em>}

-	 * '.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Behavior <em>Base Behavior</em>} '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Behavior</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Behavior()

 	 * @see #getControlOperator()

@@ -694,7 +693,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Operation

 	 * <em>Base Operation</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Operation</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Operation()

 	 * @see #getControlOperator()

@@ -705,7 +704,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Discrete <em>Discrete</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Discrete</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Discrete

 	 * @generated

@@ -716,7 +715,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.NoBuffer <em>No Buffer</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>No Buffer</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.NoBuffer

 	 * @generated

@@ -727,7 +726,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.NoBuffer#getBase_ObjectNode

 	 * <em>Base Object Node</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Object Node</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.NoBuffer#getBase_ObjectNode()

 	 * @see #getNoBuffer()

@@ -738,7 +737,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Optional <em>Optional</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Optional</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Optional

 	 * @generated

@@ -748,7 +747,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter <em>Base Parameter</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Parameter</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter()

 	 * @see #getOptional()

@@ -760,7 +759,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Overwrite <em>Overwrite</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Overwrite</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Overwrite

 	 * @generated

@@ -771,7 +770,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.Overwrite#getBase_ObjectNode

 	 * <em>Base Object Node</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Object Node</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Overwrite#getBase_ObjectNode()

 	 * @see #getOverwrite()

@@ -782,7 +781,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Probability <em>Probability</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Probability</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Probability

 	 * @generated

@@ -793,7 +792,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ActivityEdge

 	 * <em>Base Activity Edge</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Activity Edge</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Probability#getBase_ActivityEdge()

 	 * @see #getProbability()

@@ -805,7 +804,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ParameterSet

 	 * <em>Base Parameter Set</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Parameter Set</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Probability#getBase_ParameterSet()

 	 * @see #getProbability()

@@ -816,7 +815,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Probability#getProbability <em>Probability</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Probability</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Probability#getProbability()

 	 * @see #getProbability()

@@ -827,7 +826,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.activities.Rate <em>Rate</em>}'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Rate</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Rate

 	 * @generated

@@ -838,7 +837,7 @@ public interface ActivitiesPackage extends EPackage {
 	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.Rate#getBase_ActivityEdge

 	 * <em>Base Activity Edge</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Activity Edge</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Rate#getBase_ActivityEdge()

 	 * @see #getRate()

@@ -849,7 +848,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Rate#getBase_Parameter <em>Base Parameter</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Parameter</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Rate#getBase_Parameter()

 	 * @see #getRate()

@@ -860,7 +859,7 @@ public interface ActivitiesPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Rate#getRate <em>Rate</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Rate</em>'.

 	 * @see org.eclipse.papyrus.sysml.activities.Rate#getRate()

 	 * @see #getRate()

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Continuous.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Continuous.java
index 547fbd325a9..7af2047755b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Continuous.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Continuous.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -15,8 +15,8 @@ package org.eclipse.papyrus.sysml.activities;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Continuous</b></em>'. <!-- end-user-doc -->

- * 

- * 

+ *

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getContinuous()

  * @model

  * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ControlOperator.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ControlOperator.java
index 4a2c79f3aed..43694a322ff 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ControlOperator.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ControlOperator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.uml2.uml.Operation;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Control Operator</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -27,7 +27,7 @@ import org.eclipse.uml2.uml.Operation;
  * <li>{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Behavior <em>Base Behavior</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getControlOperator()

  * @model

  * @generated

@@ -41,7 +41,7 @@ public interface ControlOperator extends EObject {
 	 * If the meaning of the '<em>Base Behavior</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Behavior</em>' reference.

 	 * @see #setBase_Behavior(Behavior)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getControlOperator_Base_Behavior()

@@ -57,7 +57,7 @@ public interface ControlOperator extends EObject {
 	 * If the meaning of the '<em>Base Operation</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Operation</em>' reference.

 	 * @see #setBase_Operation(Operation)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getControlOperator_Base_Operation()

@@ -70,9 +70,9 @@ public interface ControlOperator extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Behavior <em>Base Behavior</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Behavior</em>' reference.

+	 *            the new value of the '<em>Base Behavior</em>' reference.

 	 * @see #getBase_Behavior()

 	 * @generated

 	 */

@@ -82,9 +82,9 @@ public interface ControlOperator extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Operation <em>Base Operation</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Operation</em>' reference.

+	 *            the new value of the '<em>Base Operation</em>' reference.

 	 * @see #getBase_Operation()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Discrete.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Discrete.java
index 9ab8b05d6e9..14830fb9f55 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Discrete.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Discrete.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -15,8 +15,8 @@ package org.eclipse.papyrus.sysml.activities;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Discrete</b></em>'. <!-- end-user-doc -->

- * 

- * 

+ *

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getDiscrete()

  * @model

  * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/NoBuffer.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/NoBuffer.java
index ae6c9661106..b9cacccc111 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/NoBuffer.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/NoBuffer.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.ObjectNode;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>No Buffer</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.activities.NoBuffer#getBase_ObjectNode <em>Base Object Node</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getNoBuffer()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface NoBuffer extends EObject {
 	 * If the meaning of the '<em>Base Object Node</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Object Node</em>' reference.

 	 * @see #setBase_ObjectNode(ObjectNode)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getNoBuffer_Base_ObjectNode()

@@ -52,9 +52,9 @@ public interface NoBuffer extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.NoBuffer#getBase_ObjectNode <em>Base Object Node</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Object Node</em>' reference.

+	 *            the new value of the '<em>Base Object Node</em>' reference.

 	 * @see #getBase_ObjectNode()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optional.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optional.java
index 635b4147269..c6b2cd3561f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optional.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optional.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Parameter;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Optional</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter <em>Base Parameter</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOptional()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface Optional extends EObject {
 	 * If the meaning of the '<em>Base Parameter</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Parameter</em>' reference.

 	 * @see #setBase_Parameter(Parameter)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOptional_Base_Parameter()

@@ -52,9 +52,9 @@ public interface Optional extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter <em>Base Parameter</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Parameter</em>' reference.

+	 *            the new value of the '<em>Base Parameter</em>' reference.

 	 * @see #getBase_Parameter()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Overwrite.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Overwrite.java
index d880fb4243a..518c85fa82b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Overwrite.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Overwrite.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.ObjectNode;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Overwrite</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.activities.Overwrite#getBase_ObjectNode <em>Base Object Node</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOverwrite()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface Overwrite extends EObject {
 	 * If the meaning of the '<em>Base Object Node</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Object Node</em>' reference.

 	 * @see #setBase_ObjectNode(ObjectNode)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOverwrite_Base_ObjectNode()

@@ -52,9 +52,9 @@ public interface Overwrite extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Overwrite#getBase_ObjectNode <em>Base Object Node</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Object Node</em>' reference.

+	 *            the new value of the '<em>Base Object Node</em>' reference.

 	 * @see #getBase_ObjectNode()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Probability.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Probability.java
index a19ba64f80b..565b810542c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Probability.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Probability.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.uml2.uml.ValueSpecification;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Probability</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * <li>{@link org.eclipse.papyrus.sysml.activities.Probability#getProbability <em>Probability</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getProbability()

  * @model

  * @generated

@@ -43,7 +43,7 @@ public interface Probability extends EObject {
 	 * If the meaning of the '<em>Base Activity Edge</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Activity Edge</em>' reference.

 	 * @see #setBase_ActivityEdge(ActivityEdge)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getProbability_Base_ActivityEdge()

@@ -59,7 +59,7 @@ public interface Probability extends EObject {
 	 * If the meaning of the '<em>Base Parameter Set</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Parameter Set</em>' reference.

 	 * @see #setBase_ParameterSet(ParameterSet)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getProbability_Base_ParameterSet()

@@ -75,7 +75,7 @@ public interface Probability extends EObject {
 	 * If the meaning of the '<em>Probability</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Probability</em>' reference.

 	 * @see #setProbability(ValueSpecification)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getProbability_Probability()

@@ -88,9 +88,9 @@ public interface Probability extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ActivityEdge <em>Base Activity Edge</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Activity Edge</em>' reference.

+	 *            the new value of the '<em>Base Activity Edge</em>' reference.

 	 * @see #getBase_ActivityEdge()

 	 * @generated

 	 */

@@ -100,9 +100,9 @@ public interface Probability extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ParameterSet <em>Base Parameter Set</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Parameter Set</em>' reference.

+	 *            the new value of the '<em>Base Parameter Set</em>' reference.

 	 * @see #getBase_ParameterSet()

 	 * @generated

 	 */

@@ -112,9 +112,9 @@ public interface Probability extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Probability#getProbability <em>Probability</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Probability</em>' reference.

+	 *            the new value of the '<em>Probability</em>' reference.

 	 * @see #getProbability()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Rate.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Rate.java
index 6e5a8773e72..06b24cd226e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Rate.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Rate.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.uml2.uml.Parameter;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Rate</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.Parameter;
  * <li>{@link org.eclipse.papyrus.sysml.activities.Rate#getRate <em>Rate</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getRate()

  * @model

  * @generated

@@ -43,7 +43,7 @@ public interface Rate extends EObject {
 	 * If the meaning of the '<em>Base Activity Edge</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Activity Edge</em>' reference.

 	 * @see #setBase_ActivityEdge(ActivityEdge)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getRate_Base_ActivityEdge()

@@ -59,7 +59,7 @@ public interface Rate extends EObject {
 	 * If the meaning of the '<em>Base Parameter</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Parameter</em>' reference.

 	 * @see #setBase_Parameter(Parameter)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getRate_Base_Parameter()

@@ -75,7 +75,7 @@ public interface Rate extends EObject {
 	 * If the meaning of the '<em>Rate</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Rate</em>' reference.

 	 * @see #setRate(InstanceSpecification)

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getRate_Rate()

@@ -88,9 +88,9 @@ public interface Rate extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Rate#getBase_ActivityEdge <em>Base Activity Edge</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Activity Edge</em>' reference.

+	 *            the new value of the '<em>Base Activity Edge</em>' reference.

 	 * @see #getBase_ActivityEdge()

 	 * @generated

 	 */

@@ -100,9 +100,9 @@ public interface Rate extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Rate#getBase_Parameter <em>Base Parameter</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Parameter</em>' reference.

+	 *            the new value of the '<em>Base Parameter</em>' reference.

 	 * @see #getBase_Parameter()

 	 * @generated

 	 */

@@ -111,9 +111,9 @@ public interface Rate extends EObject {
 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Rate#getRate <em>Rate</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Rate</em>' reference.

+	 *            the new value of the '<em>Rate</em>' reference.

 	 * @see #getRate()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesFactoryImpl.java
index 93382dfad6f..8e05955df75 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -32,14 +32,14 @@ import org.eclipse.papyrus.sysml.activities.Rate;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -52,13 +52,13 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static ActivitiesFactory init() {

 		try {

-			ActivitiesFactory theActivitiesFactory = (ActivitiesFactory)EPackage.Registry.INSTANCE.getEFactory(ActivitiesPackage.eNS_URI);

-			if(theActivitiesFactory != null) {

+			ActivitiesFactory theActivitiesFactory = (ActivitiesFactory) EPackage.Registry.INSTANCE.getEFactory(ActivitiesPackage.eNS_URI);

+			if (theActivitiesFactory != null) {

 				return theActivitiesFactory;

 			}

 		} catch (Exception exception) {

@@ -71,7 +71,7 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivitiesFactoryImpl() {

@@ -80,12 +80,12 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		case ActivitiesPackage.OPTIONAL:

 			return createOptional();

 		case ActivitiesPackage.RATE:

@@ -109,7 +109,7 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Optional createOptional() {

@@ -119,7 +119,7 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Continuous createContinuous() {

@@ -129,7 +129,7 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ControlOperator createControlOperator() {

@@ -139,7 +139,7 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Discrete createDiscrete() {

@@ -149,7 +149,7 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NoBuffer createNoBuffer() {

@@ -159,7 +159,7 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Overwrite createOverwrite() {

@@ -169,7 +169,7 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Probability createProbability() {

@@ -179,7 +179,7 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Rate createRate() {

@@ -189,11 +189,11 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivitiesPackage getActivitiesPackage() {

-		return (ActivitiesPackage)getEPackage();

+		return (ActivitiesPackage) getEPackage();

 	}

 

 } // ActivitiesFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesPackageImpl.java
index 1aba164fc04..4f1571be694 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -53,43 +53,43 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass optionalEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link ActivitiesPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link ActivitiesPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static ActivitiesPackage init() {

-		if(isInited)

-			return (ActivitiesPackage)EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI);

+		if (isInited) {

+			return (ActivitiesPackage) EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ActivitiesPackageImpl());

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ActivitiesPackageImpl());

 

 		isInited = true;

 

@@ -97,16 +97,24 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theActivitiesPackage.createPackageContents();

@@ -145,7 +153,7 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getOptional() {

@@ -154,72 +162,72 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getOptional_Base_Parameter() {

-		return (EReference)optionalEClass.getEStructuralFeatures().get(0);

+		return (EReference) optionalEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rateEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass probabilityEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass continuousEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass discreteEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass controlOperatorEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass noBufferEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass overwriteEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -229,9 +237,8 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#eNS_URI

 	 * @see #init()

@@ -246,12 +253,13 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create classes and their features

@@ -285,16 +293,16 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivitiesFactory getActivitiesFactory() {

-		return (ActivitiesFactory)getEFactoryInstance();

+		return (ActivitiesFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getContinuous() {

@@ -303,7 +311,7 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getControlOperator() {

@@ -312,25 +320,25 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getControlOperator_Base_Behavior() {

-		return (EReference)controlOperatorEClass.getEStructuralFeatures().get(1);

+		return (EReference) controlOperatorEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getControlOperator_Base_Operation() {

-		return (EReference)controlOperatorEClass.getEStructuralFeatures().get(0);

+		return (EReference) controlOperatorEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getDiscrete() {

@@ -339,7 +347,7 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getNoBuffer() {

@@ -348,16 +356,16 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getNoBuffer_Base_ObjectNode() {

-		return (EReference)noBufferEClass.getEStructuralFeatures().get(0);

+		return (EReference) noBufferEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getOverwrite() {

@@ -366,16 +374,16 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getOverwrite_Base_ObjectNode() {

-		return (EReference)overwriteEClass.getEStructuralFeatures().get(0);

+		return (EReference) overwriteEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getProbability() {

@@ -384,34 +392,34 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getProbability_Base_ActivityEdge() {

-		return (EReference)probabilityEClass.getEStructuralFeatures().get(0);

+		return (EReference) probabilityEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getProbability_Base_ParameterSet() {

-		return (EReference)probabilityEClass.getEStructuralFeatures().get(1);

+		return (EReference) probabilityEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getProbability_Probability() {

-		return (EReference)probabilityEClass.getEStructuralFeatures().get(2);

+		return (EReference) probabilityEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getRate() {

@@ -420,41 +428,42 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRate_Base_ActivityEdge() {

-		return (EReference)rateEClass.getEStructuralFeatures().get(1);

+		return (EReference) rateEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRate_Base_Parameter() {

-		return (EReference)rateEClass.getEStructuralFeatures().get(0);

+		return (EReference) rateEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRate_Rate() {

-		return (EReference)rateEClass.getEStructuralFeatures().get(2);

+		return (EReference) rateEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

@@ -463,7 +472,7 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 		setNsURI(eNS_URI);

 

 		// Obtain other dependent packages

-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

 

 		// Create type parameters

 

@@ -475,31 +484,40 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 

 		// Initialize classes, features, and operations; add parameters

 		initEClass(optionalEClass, Optional.class, "Optional", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getOptional_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 1, 1, Optional.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getOptional_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 1, 1, Optional.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 

 		initEClass(rateEClass, Rate.class, "Rate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEReference(getRate_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 1, 1, Rate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getRate_Base_ActivityEdge(), theUMLPackage.getActivityEdge(), null, "base_ActivityEdge", null, 1, 1, Rate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getRate_Base_ActivityEdge(), theUMLPackage.getActivityEdge(), null, "base_ActivityEdge", null, 1, 1, Rate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 		initEReference(getRate_Rate(), theUMLPackage.getInstanceSpecification(), null, "rate", null, 0, 1, Rate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(probabilityEClass, Probability.class, "Probability", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getProbability_Base_ActivityEdge(), theUMLPackage.getActivityEdge(), null, "base_ActivityEdge", null, 1, 1, Probability.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getProbability_Base_ParameterSet(), theUMLPackage.getParameterSet(), null, "base_ParameterSet", null, 1, 1, Probability.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getProbability_Probability(), theUMLPackage.getValueSpecification(), null, "probability", null, 0, 1, Probability.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getProbability_Base_ActivityEdge(), theUMLPackage.getActivityEdge(), null, "base_ActivityEdge", null, 1, 1, Probability.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

+		initEReference(getProbability_Base_ParameterSet(), theUMLPackage.getParameterSet(), null, "base_ParameterSet", null, 1, 1, Probability.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

+		initEReference(getProbability_Probability(), theUMLPackage.getValueSpecification(), null, "probability", null, 0, 1, Probability.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

 

 		initEClass(continuousEClass, Continuous.class, "Continuous", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

 		initEClass(discreteEClass, Discrete.class, "Discrete", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

 		initEClass(controlOperatorEClass, ControlOperator.class, "ControlOperator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getControlOperator_Base_Operation(), theUMLPackage.getOperation(), null, "base_Operation", null, 1, 1, ControlOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getControlOperator_Base_Behavior(), theUMLPackage.getBehavior(), null, "base_Behavior", null, 1, 1, ControlOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getControlOperator_Base_Operation(), theUMLPackage.getOperation(), null, "base_Operation", null, 1, 1, ControlOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

+		initEReference(getControlOperator_Base_Behavior(), theUMLPackage.getBehavior(), null, "base_Behavior", null, 1, 1, ControlOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

 

 		initEClass(noBufferEClass, NoBuffer.class, "NoBuffer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getNoBuffer_Base_ObjectNode(), theUMLPackage.getObjectNode(), null, "base_ObjectNode", null, 1, 1, NoBuffer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getNoBuffer_Base_ObjectNode(), theUMLPackage.getObjectNode(), null, "base_ObjectNode", null, 1, 1, NoBuffer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 

 		initEClass(overwriteEClass, Overwrite.class, "Overwrite", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getOverwrite_Base_ObjectNode(), theUMLPackage.getObjectNode(), null, "base_ObjectNode", null, 1, 1, Overwrite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getOverwrite_Base_ObjectNode(), theUMLPackage.getObjectNode(), null, "base_ObjectNode", null, 1, 1, Overwrite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 	}

 

 } // ActivitiesPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ContinuousImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ContinuousImpl.java
index 672adde767c..be6f478e4d3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ContinuousImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ContinuousImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,14 +21,14 @@ import org.eclipse.papyrus.sysml.activities.Continuous;
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Continuous</b></em>'. <!-- end-user-doc -->

  * <p>

  * </p>

- * 

+ *

  * @generated

  */

 public class ContinuousImpl extends RateImpl implements Continuous {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ContinuousImpl() {

@@ -37,7 +37,7 @@ public class ContinuousImpl extends RateImpl implements Continuous {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ControlOperatorImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ControlOperatorImpl.java
index 4957c0bcd44..85c7b12ef91 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ControlOperatorImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ControlOperatorImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -32,7 +32,7 @@ import org.eclipse.uml2.uml.Operation;
  * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl#getBase_Behavior <em>Base Behavior</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements ControlOperator {

@@ -41,7 +41,7 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 	 * The cached value of the '{@link #getBase_Operation() <em>Base Operation</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Operation()

 	 * @generated

 	 * @ordered

@@ -52,7 +52,7 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 	 * The cached value of the '{@link #getBase_Behavior() <em>Base Behavior</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Behavior()

 	 * @generated

 	 * @ordered

@@ -61,7 +61,7 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ControlOperatorImpl() {

@@ -70,7 +70,7 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Behavior basicGetBase_Behavior() {

@@ -79,7 +79,7 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Operation basicGetBase_Operation() {

@@ -88,19 +88,21 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION:

-			if(resolve)

+			if (resolve) {

 				return getBase_Operation();

+			}

 			return basicGetBase_Operation();

 		case ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR:

-			if(resolve)

+			if (resolve) {

 				return getBase_Behavior();

+			}

 			return basicGetBase_Behavior();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -108,12 +110,12 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION:

 			return base_Operation != null;

 		case ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR:

@@ -124,17 +126,17 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION:

-			setBase_Operation((Operation)newValue);

+			setBase_Operation((Operation) newValue);

 			return;

 		case ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR:

-			setBase_Behavior((Behavior)newValue);

+			setBase_Behavior((Behavior) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -142,7 +144,7 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -152,17 +154,17 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION:

-			setBase_Operation((Operation)null);

+			setBase_Operation((Operation) null);

 			return;

 		case ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR:

-			setBase_Behavior((Behavior)null);

+			setBase_Behavior((Behavior) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -170,16 +172,17 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Behavior getBase_Behavior() {

-		if(base_Behavior != null && base_Behavior.eIsProxy()) {

-			InternalEObject oldBase_Behavior = (InternalEObject)base_Behavior;

-			base_Behavior = (Behavior)eResolveProxy(oldBase_Behavior);

-			if(base_Behavior != oldBase_Behavior) {

-				if(eNotificationRequired())

+		if (base_Behavior != null && base_Behavior.eIsProxy()) {

+			InternalEObject oldBase_Behavior = (InternalEObject) base_Behavior;

+			base_Behavior = (Behavior) eResolveProxy(oldBase_Behavior);

+			if (base_Behavior != oldBase_Behavior) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));

+				}

 			}

 		}

 		return base_Behavior;

@@ -187,16 +190,17 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Operation getBase_Operation() {

-		if(base_Operation != null && base_Operation.eIsProxy()) {

-			InternalEObject oldBase_Operation = (InternalEObject)base_Operation;

-			base_Operation = (Operation)eResolveProxy(oldBase_Operation);

-			if(base_Operation != oldBase_Operation) {

-				if(eNotificationRequired())

+		if (base_Operation != null && base_Operation.eIsProxy()) {

+			InternalEObject oldBase_Operation = (InternalEObject) base_Operation;

+			base_Operation = (Operation) eResolveProxy(oldBase_Operation);

+			if (base_Operation != oldBase_Operation) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION, oldBase_Operation, base_Operation));

+				}

 			}

 		}

 		return base_Operation;

@@ -204,26 +208,28 @@ public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Behavior(Behavior newBase_Behavior) {

 		Behavior oldBase_Behavior = base_Behavior;

 		base_Behavior = newBase_Behavior;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Operation(Operation newBase_Operation) {

 		Operation oldBase_Operation = base_Operation;

 		base_Operation = newBase_Operation;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION, oldBase_Operation, base_Operation));

+		}

 	}

 

 } // ControlOperatorImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/DiscreteImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/DiscreteImpl.java
index d2a3dadb042..b5c01ac2325 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/DiscreteImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/DiscreteImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,14 +21,14 @@ import org.eclipse.papyrus.sysml.activities.Discrete;
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Discrete</b></em>'. <!-- end-user-doc -->

  * <p>

  * </p>

- * 

+ *

  * @generated

  */

 public class DiscreteImpl extends RateImpl implements Discrete {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected DiscreteImpl() {

@@ -37,7 +37,7 @@ public class DiscreteImpl extends RateImpl implements Discrete {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/NoBufferImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/NoBufferImpl.java
index d00f298ee64..1267758b28b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/NoBufferImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/NoBufferImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.ObjectNode;
  * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl#getBase_ObjectNode <em>Base Object Node</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuffer {

@@ -39,7 +39,7 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 	 * The cached value of the '{@link #getBase_ObjectNode() <em>Base Object Node</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_ObjectNode()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected NoBufferImpl() {

@@ -57,7 +57,7 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ObjectNode basicGetBase_ObjectNode() {

@@ -66,15 +66,16 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE:

-			if(resolve)

+			if (resolve) {

 				return getBase_ObjectNode();

+			}

 			return basicGetBase_ObjectNode();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE:

 			return base_ObjectNode != null;

 		}

@@ -96,14 +97,14 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE:

-			setBase_ObjectNode((ObjectNode)newValue);

+			setBase_ObjectNode((ObjectNode) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE:

-			setBase_ObjectNode((ObjectNode)null);

+			setBase_ObjectNode((ObjectNode) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ObjectNode getBase_ObjectNode() {

-		if(base_ObjectNode != null && base_ObjectNode.eIsProxy()) {

-			InternalEObject oldBase_ObjectNode = (InternalEObject)base_ObjectNode;

-			base_ObjectNode = (ObjectNode)eResolveProxy(oldBase_ObjectNode);

-			if(base_ObjectNode != oldBase_ObjectNode) {

-				if(eNotificationRequired())

+		if (base_ObjectNode != null && base_ObjectNode.eIsProxy()) {

+			InternalEObject oldBase_ObjectNode = (InternalEObject) base_ObjectNode;

+			base_ObjectNode = (ObjectNode) eResolveProxy(oldBase_ObjectNode);

+			if (base_ObjectNode != oldBase_ObjectNode) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE, oldBase_ObjectNode, base_ObjectNode));

+				}

 			}

 		}

 		return base_ObjectNode;

@@ -153,14 +155,15 @@ public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuff
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_ObjectNode(ObjectNode newBase_ObjectNode) {

 		ObjectNode oldBase_ObjectNode = base_ObjectNode;

 		base_ObjectNode = newBase_ObjectNode;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE, oldBase_ObjectNode, base_ObjectNode));

+		}

 	}

 

 } // NoBufferImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OptionalImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OptionalImpl.java
index 74a2b0a7ecf..11508b6c986 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OptionalImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OptionalImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Parameter;
  * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.OptionalImpl#getBase_Parameter <em>Base Parameter</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class OptionalImpl extends MinimalEObjectImpl.Container implements Optional {

@@ -39,7 +39,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option
 	 * The cached value of the '{@link #getBase_Parameter() <em>Base Parameter</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Parameter()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected OptionalImpl() {

@@ -57,7 +57,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -67,16 +67,17 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Parameter getBase_Parameter() {

-		if(base_Parameter != null && base_Parameter.eIsProxy()) {

-			InternalEObject oldBase_Parameter = (InternalEObject)base_Parameter;

-			base_Parameter = (Parameter)eResolveProxy(oldBase_Parameter);

-			if(base_Parameter != oldBase_Parameter) {

-				if(eNotificationRequired())

+		if (base_Parameter != null && base_Parameter.eIsProxy()) {

+			InternalEObject oldBase_Parameter = (InternalEObject) base_Parameter;

+			base_Parameter = (Parameter) eResolveProxy(oldBase_Parameter);

+			if (base_Parameter != oldBase_Parameter) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.OPTIONAL__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

+				}

 			}

 		}

 		return base_Parameter;

@@ -84,7 +85,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Parameter basicGetBase_Parameter() {

@@ -93,27 +94,29 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Parameter(Parameter newBase_Parameter) {

 		Parameter oldBase_Parameter = base_Parameter;

 		base_Parameter = newBase_Parameter;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.OPTIONAL__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

-			if(resolve)

+			if (resolve) {

 				return getBase_Parameter();

+			}

 			return basicGetBase_Parameter();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -121,14 +124,14 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

-			setBase_Parameter((Parameter)newValue);

+			setBase_Parameter((Parameter) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -136,14 +139,14 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

-			setBase_Parameter((Parameter)null);

+			setBase_Parameter((Parameter) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -151,12 +154,12 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

 			return base_Parameter != null;

 		}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OverwriteImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OverwriteImpl.java
index c13f8fa6236..6934aaa574f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OverwriteImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OverwriteImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.ObjectNode;
  * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl#getBase_ObjectNode <em>Base Object Node</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overwrite {

@@ -39,7 +39,7 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 	 * The cached value of the '{@link #getBase_ObjectNode() <em>Base Object Node</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_ObjectNode()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected OverwriteImpl() {

@@ -57,7 +57,7 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ObjectNode basicGetBase_ObjectNode() {

@@ -66,15 +66,16 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE:

-			if(resolve)

+			if (resolve) {

 				return getBase_ObjectNode();

+			}

 			return basicGetBase_ObjectNode();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE:

 			return base_ObjectNode != null;

 		}

@@ -96,14 +97,14 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE:

-			setBase_ObjectNode((ObjectNode)newValue);

+			setBase_ObjectNode((ObjectNode) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE:

-			setBase_ObjectNode((ObjectNode)null);

+			setBase_ObjectNode((ObjectNode) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ObjectNode getBase_ObjectNode() {

-		if(base_ObjectNode != null && base_ObjectNode.eIsProxy()) {

-			InternalEObject oldBase_ObjectNode = (InternalEObject)base_ObjectNode;

-			base_ObjectNode = (ObjectNode)eResolveProxy(oldBase_ObjectNode);

-			if(base_ObjectNode != oldBase_ObjectNode) {

-				if(eNotificationRequired())

+		if (base_ObjectNode != null && base_ObjectNode.eIsProxy()) {

+			InternalEObject oldBase_ObjectNode = (InternalEObject) base_ObjectNode;

+			base_ObjectNode = (ObjectNode) eResolveProxy(oldBase_ObjectNode);

+			if (base_ObjectNode != oldBase_ObjectNode) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE, oldBase_ObjectNode, base_ObjectNode));

+				}

 			}

 		}

 		return base_ObjectNode;

@@ -153,14 +155,15 @@ public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overw
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_ObjectNode(ObjectNode newBase_ObjectNode) {

 		ObjectNode oldBase_ObjectNode = base_ObjectNode;

 		base_ObjectNode = newBase_ObjectNode;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE, oldBase_ObjectNode, base_ObjectNode));

+		}

 	}

 

 } // OverwriteImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ProbabilityImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ProbabilityImpl.java
index 6580172852a..21dd9a37b4f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ProbabilityImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ProbabilityImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -34,7 +34,7 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl#getProbability <em>Probability</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Probability {

@@ -43,7 +43,7 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 	 * The cached value of the '{@link #getBase_ActivityEdge() <em>Base Activity Edge</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_ActivityEdge()

 	 * @generated

 	 * @ordered

@@ -54,7 +54,7 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 	 * The cached value of the '{@link #getBase_ParameterSet() <em>Base Parameter Set</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_ParameterSet()

 	 * @generated

 	 * @ordered

@@ -64,7 +64,7 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 	/**

 	 * The cached value of the '{@link #getProbability() <em>Probability</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getProbability()

 	 * @generated

 	 * @ordered

@@ -73,7 +73,7 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ProbabilityImpl() {

@@ -82,7 +82,7 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivityEdge basicGetBase_ActivityEdge() {

@@ -91,7 +91,7 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ParameterSet basicGetBase_ParameterSet() {

@@ -100,7 +100,7 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ValueSpecification basicGetProbability() {

@@ -109,23 +109,26 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE:

-			if(resolve)

+			if (resolve) {

 				return getBase_ActivityEdge();

+			}

 			return basicGetBase_ActivityEdge();

 		case ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET:

-			if(resolve)

+			if (resolve) {

 				return getBase_ParameterSet();

+			}

 			return basicGetBase_ParameterSet();

 		case ActivitiesPackage.PROBABILITY__PROBABILITY:

-			if(resolve)

+			if (resolve) {

 				return getProbability();

+			}

 			return basicGetProbability();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -133,12 +136,12 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE:

 			return base_ActivityEdge != null;

 		case ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET:

@@ -151,20 +154,20 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE:

-			setBase_ActivityEdge((ActivityEdge)newValue);

+			setBase_ActivityEdge((ActivityEdge) newValue);

 			return;

 		case ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET:

-			setBase_ParameterSet((ParameterSet)newValue);

+			setBase_ParameterSet((ParameterSet) newValue);

 			return;

 		case ActivitiesPackage.PROBABILITY__PROBABILITY:

-			setProbability((ValueSpecification)newValue);

+			setProbability((ValueSpecification) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -172,7 +175,7 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -182,20 +185,20 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE:

-			setBase_ActivityEdge((ActivityEdge)null);

+			setBase_ActivityEdge((ActivityEdge) null);

 			return;

 		case ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET:

-			setBase_ParameterSet((ParameterSet)null);

+			setBase_ParameterSet((ParameterSet) null);

 			return;

 		case ActivitiesPackage.PROBABILITY__PROBABILITY:

-			setProbability((ValueSpecification)null);

+			setProbability((ValueSpecification) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -203,16 +206,17 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivityEdge getBase_ActivityEdge() {

-		if(base_ActivityEdge != null && base_ActivityEdge.eIsProxy()) {

-			InternalEObject oldBase_ActivityEdge = (InternalEObject)base_ActivityEdge;

-			base_ActivityEdge = (ActivityEdge)eResolveProxy(oldBase_ActivityEdge);

-			if(base_ActivityEdge != oldBase_ActivityEdge) {

-				if(eNotificationRequired())

+		if (base_ActivityEdge != null && base_ActivityEdge.eIsProxy()) {

+			InternalEObject oldBase_ActivityEdge = (InternalEObject) base_ActivityEdge;

+			base_ActivityEdge = (ActivityEdge) eResolveProxy(oldBase_ActivityEdge);

+			if (base_ActivityEdge != oldBase_ActivityEdge) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE, oldBase_ActivityEdge, base_ActivityEdge));

+				}

 			}

 		}

 		return base_ActivityEdge;

@@ -220,16 +224,17 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ParameterSet getBase_ParameterSet() {

-		if(base_ParameterSet != null && base_ParameterSet.eIsProxy()) {

-			InternalEObject oldBase_ParameterSet = (InternalEObject)base_ParameterSet;

-			base_ParameterSet = (ParameterSet)eResolveProxy(oldBase_ParameterSet);

-			if(base_ParameterSet != oldBase_ParameterSet) {

-				if(eNotificationRequired())

+		if (base_ParameterSet != null && base_ParameterSet.eIsProxy()) {

+			InternalEObject oldBase_ParameterSet = (InternalEObject) base_ParameterSet;

+			base_ParameterSet = (ParameterSet) eResolveProxy(oldBase_ParameterSet);

+			if (base_ParameterSet != oldBase_ParameterSet) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET, oldBase_ParameterSet, base_ParameterSet));

+				}

 			}

 		}

 		return base_ParameterSet;

@@ -237,16 +242,17 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ValueSpecification getProbability() {

-		if(probability != null && probability.eIsProxy()) {

-			InternalEObject oldProbability = (InternalEObject)probability;

-			probability = (ValueSpecification)eResolveProxy(oldProbability);

-			if(probability != oldProbability) {

-				if(eNotificationRequired())

+		if (probability != null && probability.eIsProxy()) {

+			InternalEObject oldProbability = (InternalEObject) probability;

+			probability = (ValueSpecification) eResolveProxy(oldProbability);

+			if (probability != oldProbability) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.PROBABILITY__PROBABILITY, oldProbability, probability));

+				}

 			}

 		}

 		return probability;

@@ -254,38 +260,41 @@ public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Pro
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_ActivityEdge(ActivityEdge newBase_ActivityEdge) {

 		ActivityEdge oldBase_ActivityEdge = base_ActivityEdge;

 		base_ActivityEdge = newBase_ActivityEdge;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE, oldBase_ActivityEdge, base_ActivityEdge));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_ParameterSet(ParameterSet newBase_ParameterSet) {

 		ParameterSet oldBase_ParameterSet = base_ParameterSet;

 		base_ParameterSet = newBase_ParameterSet;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET, oldBase_ParameterSet, base_ParameterSet));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setProbability(ValueSpecification newProbability) {

 		ValueSpecification oldProbability = probability;

 		probability = newProbability;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.PROBABILITY__PROBABILITY, oldProbability, probability));

+		}

 	}

 

 } // ProbabilityImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/RateImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/RateImpl.java
index 5b9e79bfb52..3a53fce3aae 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/RateImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/RateImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -34,7 +34,7 @@ import org.eclipse.uml2.uml.Parameter;
  * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl#getRate <em>Rate</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class RateImpl extends MinimalEObjectImpl.Container implements Rate {

@@ -43,7 +43,7 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 	 * The cached value of the '{@link #getBase_Parameter() <em>Base Parameter</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Parameter()

 	 * @generated

 	 * @ordered

@@ -54,7 +54,7 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 	 * The cached value of the '{@link #getBase_ActivityEdge() <em>Base Activity Edge</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_ActivityEdge()

 	 * @generated

 	 * @ordered

@@ -64,7 +64,7 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 	/**

 	 * The cached value of the '{@link #getRate() <em>Rate</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getRate()

 	 * @generated

 	 * @ordered

@@ -73,7 +73,7 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RateImpl() {

@@ -82,7 +82,7 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivityEdge basicGetBase_ActivityEdge() {

@@ -91,7 +91,7 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Parameter basicGetBase_Parameter() {

@@ -100,7 +100,7 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InstanceSpecification basicGetRate() {

@@ -109,23 +109,26 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.RATE__BASE_PARAMETER:

-			if(resolve)

+			if (resolve) {

 				return getBase_Parameter();

+			}

 			return basicGetBase_Parameter();

 		case ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE:

-			if(resolve)

+			if (resolve) {

 				return getBase_ActivityEdge();

+			}

 			return basicGetBase_ActivityEdge();

 		case ActivitiesPackage.RATE__RATE:

-			if(resolve)

+			if (resolve) {

 				return getRate();

+			}

 			return basicGetRate();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -133,12 +136,12 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.RATE__BASE_PARAMETER:

 			return base_Parameter != null;

 		case ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE:

@@ -151,20 +154,20 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.RATE__BASE_PARAMETER:

-			setBase_Parameter((Parameter)newValue);

+			setBase_Parameter((Parameter) newValue);

 			return;

 		case ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE:

-			setBase_ActivityEdge((ActivityEdge)newValue);

+			setBase_ActivityEdge((ActivityEdge) newValue);

 			return;

 		case ActivitiesPackage.RATE__RATE:

-			setRate((InstanceSpecification)newValue);

+			setRate((InstanceSpecification) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -172,7 +175,7 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -182,20 +185,20 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ActivitiesPackage.RATE__BASE_PARAMETER:

-			setBase_Parameter((Parameter)null);

+			setBase_Parameter((Parameter) null);

 			return;

 		case ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE:

-			setBase_ActivityEdge((ActivityEdge)null);

+			setBase_ActivityEdge((ActivityEdge) null);

 			return;

 		case ActivitiesPackage.RATE__RATE:

-			setRate((InstanceSpecification)null);

+			setRate((InstanceSpecification) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -203,16 +206,17 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivityEdge getBase_ActivityEdge() {

-		if(base_ActivityEdge != null && base_ActivityEdge.eIsProxy()) {

-			InternalEObject oldBase_ActivityEdge = (InternalEObject)base_ActivityEdge;

-			base_ActivityEdge = (ActivityEdge)eResolveProxy(oldBase_ActivityEdge);

-			if(base_ActivityEdge != oldBase_ActivityEdge) {

-				if(eNotificationRequired())

+		if (base_ActivityEdge != null && base_ActivityEdge.eIsProxy()) {

+			InternalEObject oldBase_ActivityEdge = (InternalEObject) base_ActivityEdge;

+			base_ActivityEdge = (ActivityEdge) eResolveProxy(oldBase_ActivityEdge);

+			if (base_ActivityEdge != oldBase_ActivityEdge) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE, oldBase_ActivityEdge, base_ActivityEdge));

+				}

 			}

 		}

 		return base_ActivityEdge;

@@ -220,16 +224,17 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Parameter getBase_Parameter() {

-		if(base_Parameter != null && base_Parameter.eIsProxy()) {

-			InternalEObject oldBase_Parameter = (InternalEObject)base_Parameter;

-			base_Parameter = (Parameter)eResolveProxy(oldBase_Parameter);

-			if(base_Parameter != oldBase_Parameter) {

-				if(eNotificationRequired())

+		if (base_Parameter != null && base_Parameter.eIsProxy()) {

+			InternalEObject oldBase_Parameter = (InternalEObject) base_Parameter;

+			base_Parameter = (Parameter) eResolveProxy(oldBase_Parameter);

+			if (base_Parameter != oldBase_Parameter) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.RATE__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

+				}

 			}

 		}

 		return base_Parameter;

@@ -237,16 +242,17 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InstanceSpecification getRate() {

-		if(rate != null && rate.eIsProxy()) {

-			InternalEObject oldRate = (InternalEObject)rate;

-			rate = (InstanceSpecification)eResolveProxy(oldRate);

-			if(rate != oldRate) {

-				if(eNotificationRequired())

+		if (rate != null && rate.eIsProxy()) {

+			InternalEObject oldRate = (InternalEObject) rate;

+			rate = (InstanceSpecification) eResolveProxy(oldRate);

+			if (rate != oldRate) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.RATE__RATE, oldRate, rate));

+				}

 			}

 		}

 		return rate;

@@ -254,38 +260,41 @@ public class RateImpl extends MinimalEObjectImpl.Container implements Rate {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_ActivityEdge(ActivityEdge newBase_ActivityEdge) {

 		ActivityEdge oldBase_ActivityEdge = base_ActivityEdge;

 		base_ActivityEdge = newBase_ActivityEdge;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE, oldBase_ActivityEdge, base_ActivityEdge));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Parameter(Parameter newBase_Parameter) {

 		Parameter oldBase_Parameter = base_Parameter;

 		base_Parameter = newBase_Parameter;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.RATE__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setRate(InstanceSpecification newRate) {

 		InstanceSpecification oldRate = rate;

 		rate = newRate;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.RATE__RATE, oldRate, rate));

+		}

 	}

 

 } // RateImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java
index f7d28c56ce6..eaa06e2511e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -31,7 +31,7 @@ import org.eclipse.papyrus.sysml.activities.Rate;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides

  * an adapter <code>createXXX</code> method for each class of the model. <!--

  * end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage

  * @generated

  */

@@ -40,7 +40,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static ActivitiesPackage modelPackage;

@@ -48,7 +48,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The switch that delegates to the <code>createXXX</code> methods. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ActivitiesSwitch<Adapter> modelSwitch = new ActivitiesSwitch<Adapter>() {

@@ -103,11 +103,11 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivitiesAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = ActivitiesPackage.eINSTANCE;

 		}

 	}

@@ -116,15 +116,15 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param target

-	 *        the object to adapt.

+	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

 	@Override

 	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

+		return modelSwitch.doSwitch((EObject) target);

 	}

 

 	/**

@@ -132,7 +132,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.activities.Optional

 	 * @generated

@@ -147,7 +147,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.activities.Continuous

 	 * @generated

@@ -162,7 +162,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.activities.ControlOperator

 	 * @generated

@@ -176,7 +176,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.activities.Discrete

 	 * @generated

@@ -189,7 +189,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This

 	 * default implementation returns null. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -203,7 +203,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.activities.NoBuffer

 	 * @generated

@@ -218,7 +218,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.activities.Overwrite

 	 * @generated

@@ -233,7 +233,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.activities.Probability

 	 * @generated

@@ -247,7 +247,7 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * begin-user-doc --> This default implementation returns null so that we

 	 * can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.activities.Rate

 	 * @generated

@@ -261,17 +261,17 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if

 	 * the object is either the model's package or is an instance object of the

 	 * model. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

 	}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceFactoryImpl.java
index 0b333fb214d..89acbee6bc9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.util.ActivitiesResourceImpl

  * @generated

  */

@@ -31,7 +31,7 @@ public class ActivitiesResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivitiesResourceFactoryImpl() {

@@ -42,7 +42,7 @@ public class ActivitiesResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceImpl.java
index 9eeb972411a..881bf80b002 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.util.ActivitiesResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class ActivitiesResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public ActivitiesResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java
index 625bef72be1..9ce786c20aa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -32,7 +32,7 @@ import org.eclipse.papyrus.sysml.activities.Rate;
  * starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the

  * result of the switch. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage

  * @generated

  */

@@ -41,7 +41,7 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static ActivitiesPackage modelPackage;

@@ -50,11 +50,11 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivitiesSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = ActivitiesPackage.eINSTANCE;

 		}

 	}

@@ -62,7 +62,7 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	/**

 	 * Checks whether this is a switch for the given package. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -77,9 +77,9 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Continuous</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -93,9 +93,9 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation

 	 * returns null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Control Operator</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -109,9 +109,9 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Discrete</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -125,9 +125,9 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>No Buffer</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -141,9 +141,9 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Overwrite</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -157,9 +157,9 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation

 	 * returns null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Probability</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -172,9 +172,9 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of ' <em>Rate</em>'. <!-- begin-user-doc --> This implementation returns null;

 	 * returning a non-null result will terminate the switch. <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of ' <em>Rate</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -188,9 +188,9 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch, but this is

 	 * the last case anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -204,79 +204,81 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case ActivitiesPackage.OPTIONAL:

-		{

-			Optional optional = (Optional)theEObject;

+		switch (classifierID) {

+		case ActivitiesPackage.OPTIONAL: {

+			Optional optional = (Optional) theEObject;

 			T result = caseOptional(optional);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ActivitiesPackage.RATE:

-		{

-			Rate rate = (Rate)theEObject;

+		case ActivitiesPackage.RATE: {

+			Rate rate = (Rate) theEObject;

 			T result = caseRate(rate);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ActivitiesPackage.PROBABILITY:

-		{

-			Probability probability = (Probability)theEObject;

+		case ActivitiesPackage.PROBABILITY: {

+			Probability probability = (Probability) theEObject;

 			T result = caseProbability(probability);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ActivitiesPackage.CONTINUOUS:

-		{

-			Continuous continuous = (Continuous)theEObject;

+		case ActivitiesPackage.CONTINUOUS: {

+			Continuous continuous = (Continuous) theEObject;

 			T result = caseContinuous(continuous);

-			if(result == null)

+			if (result == null) {

 				result = caseRate(continuous);

-			if(result == null)

+			}

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ActivitiesPackage.DISCRETE:

-		{

-			Discrete discrete = (Discrete)theEObject;

+		case ActivitiesPackage.DISCRETE: {

+			Discrete discrete = (Discrete) theEObject;

 			T result = caseDiscrete(discrete);

-			if(result == null)

+			if (result == null) {

 				result = caseRate(discrete);

-			if(result == null)

+			}

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ActivitiesPackage.CONTROL_OPERATOR:

-		{

-			ControlOperator controlOperator = (ControlOperator)theEObject;

+		case ActivitiesPackage.CONTROL_OPERATOR: {

+			ControlOperator controlOperator = (ControlOperator) theEObject;

 			T result = caseControlOperator(controlOperator);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ActivitiesPackage.NO_BUFFER:

-		{

-			NoBuffer noBuffer = (NoBuffer)theEObject;

+		case ActivitiesPackage.NO_BUFFER: {

+			NoBuffer noBuffer = (NoBuffer) theEObject;

 			T result = caseNoBuffer(noBuffer);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ActivitiesPackage.OVERWRITE:

-		{

-			Overwrite overwrite = (Overwrite)theEObject;

+		case ActivitiesPackage.OVERWRITE: {

+			Overwrite overwrite = (Overwrite) theEObject;

 			T result = caseOverwrite(overwrite);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

 		default:

@@ -289,9 +291,9 @@ public class ActivitiesSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Optional</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesXMLProcessor.java
index b1676bc30f9..eb8b4094c77 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ActivitiesXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class ActivitiesXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivitiesXMLProcessor() {

@@ -44,12 +44,12 @@ public class ActivitiesXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the ActivitiesResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new ActivitiesResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new ActivitiesResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocate.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocate.java
index 9346d58599a..19ebd966708 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocate.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocate.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Abstraction;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Allocate</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocate#getBase_Abstraction <em>Base Abstraction</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocate()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface Allocate extends EObject {
 	 * If the meaning of the '<em>Base Abstraction</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Abstraction</em>' reference.

 	 * @see #setBase_Abstraction(Abstraction)

 	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocate_Base_Abstraction()

@@ -52,9 +52,9 @@ public interface Allocate extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.allocations.Allocate#getBase_Abstraction <em>Base Abstraction</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Abstraction</em>' reference.

+	 *            the new value of the '<em>Base Abstraction</em>' reference.

 	 * @see #getBase_Abstraction()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocateActivityPartition.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocateActivityPartition.java
index 873730ecf21..583d7e357ad 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocateActivityPartition.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocateActivityPartition.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.ActivityPartition;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Allocate Activity Partition</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition#getBase_ActivityPartition <em>Base Activity Partition</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocateActivityPartition()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface AllocateActivityPartition extends EObject {
 	 * If the meaning of the '<em>Base Activity Partition</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Activity Partition</em>' reference.

 	 * @see #setBase_ActivityPartition(ActivityPartition)

 	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocateActivityPartition_Base_ActivityPartition()

@@ -53,9 +53,9 @@ public interface AllocateActivityPartition extends EObject {
 	 * <em>Base Activity Partition</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Activity Partition</em>' reference.

+	 *            the new value of the '<em>Base Activity Partition</em>' reference.

 	 * @see #getBase_ActivityPartition()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocated.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocated.java
index 407b7b31914..44fc979e92a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocated.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocated.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.uml2.uml.NamedElement;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Allocated</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.NamedElement;
  * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo <em>Allocated To</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocated()

  * @model

  * @generated

@@ -44,7 +44,7 @@ public interface Allocated extends EObject {
 	 * If the meaning of the '<em>Allocated From</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Allocated From</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocated_AllocatedFrom()

 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"

@@ -53,13 +53,12 @@ public interface Allocated extends EObject {
 	EList<NamedElement> getAllocatedFrom();

 

 	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '

-	 * <em><b>Allocated From</b></em>' reference list.

+	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the ' <em><b>Allocated From</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getAllocatedFrom()

 	 * @generated

@@ -67,17 +66,16 @@ public interface Allocated extends EObject {
 	NamedElement getAllocatedFrom(String name);

 

 	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '

-	 * <em><b>Allocated From</b></em>' reference list.

+	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the ' <em><b>Allocated From</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @param ignoreCase

-	 *        Whether to ignore case in {@link java.lang.String} comparisons.

+	 *            Whether to ignore case in {@link java.lang.String} comparisons.

 	 * @param eClass

-	 *        The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getAllocatedFrom()

 	 * @generated

@@ -92,7 +90,7 @@ public interface Allocated extends EObject {
 	 * If the meaning of the '<em>Allocated To</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Allocated To</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocated_AllocatedTo()

 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"

@@ -105,9 +103,9 @@ public interface Allocated extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getAllocatedTo()

 	 * @generated

@@ -119,13 +117,13 @@ public interface Allocated extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @param ignoreCase

-	 *        Whether to ignore case in {@link java.lang.String} comparisons.

+	 *            Whether to ignore case in {@link java.lang.String} comparisons.

 	 * @param eClass

-	 *        The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getAllocatedTo()

 	 * @generated

@@ -139,7 +137,7 @@ public interface Allocated extends EObject {
 	 * If the meaning of the '<em>Base Named Element</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Named Element</em>' reference.

 	 * @see #setBase_NamedElement(NamedElement)

 	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocated_Base_NamedElement()

@@ -152,9 +150,9 @@ public interface Allocated extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getBase_NamedElement <em>Base Named Element</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Named Element</em>' reference.

+	 *            the new value of the '<em>Base Named Element</em>' reference.

 	 * @see #getBase_NamedElement()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsFactory.java
index 6f894c10a94..7abf6421596 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface AllocationsFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	AllocationsFactory eINSTANCE = org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsFactoryImpl.init();

@@ -37,7 +37,7 @@ public interface AllocationsFactory extends EFactory {
 	 * Returns a new object of class '<em>Allocate</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Allocate</em>'.

 	 * @generated

 	 */

@@ -46,7 +46,7 @@ public interface AllocationsFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Allocate Activity Partition</em>'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Allocate Activity Partition</em>'.

 	 * @generated

 	 */

@@ -56,7 +56,7 @@ public interface AllocationsFactory extends EFactory {
 	 * Returns a new object of class '<em>Allocated</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Allocated</em>'.

 	 * @generated

 	 */

@@ -66,7 +66,7 @@ public interface AllocationsFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsPackage.java
index 59c259b2d4f..ed5c73af8cf 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.allocations.AllocationsFactory

  * @model kind="package"

  * @generated

@@ -44,7 +44,7 @@ public interface AllocationsPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -53,7 +53,7 @@ public interface AllocationsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateImpl

 		 * <em>Allocate</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateImpl

 		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocate()

 		 * @generated

@@ -63,7 +63,7 @@ public interface AllocationsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Abstraction</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference ALLOCATE__BASE_ABSTRACTION = eINSTANCE.getAllocate_Base_Abstraction();

@@ -72,7 +72,7 @@ public interface AllocationsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl

 		 * <em>Allocated</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl

 		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocated()

 		 * @generated

@@ -82,7 +82,7 @@ public interface AllocationsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Named Element</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference ALLOCATED__BASE_NAMED_ELEMENT = eINSTANCE.getAllocated_Base_NamedElement();

@@ -90,7 +90,7 @@ public interface AllocationsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Allocated From</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference ALLOCATED__ALLOCATED_FROM = eINSTANCE.getAllocated_AllocatedFrom();

@@ -98,7 +98,7 @@ public interface AllocationsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Allocated To</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference ALLOCATED__ALLOCATED_TO = eINSTANCE.getAllocated_AllocatedTo();

@@ -108,7 +108,7 @@ public interface AllocationsPackage extends EPackage {
 		 * <em>Allocate Activity Partition</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateActivityPartitionImpl

 		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocateActivityPartition()

 		 * @generated

@@ -118,7 +118,7 @@ public interface AllocationsPackage extends EPackage {
 		/**

 		 * The meta object literal for the ' <em><b>Base Activity Partition</b></em>' reference feature. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION = eINSTANCE.getAllocateActivityPartition_Base_ActivityPartition();

@@ -128,7 +128,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "allocations";

@@ -136,7 +136,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations";

@@ -144,7 +144,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "Allocations";

@@ -153,7 +153,7 @@ public interface AllocationsPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	AllocationsPackage eINSTANCE = org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl.init();

@@ -161,7 +161,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateImpl <em>Allocate</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateImpl

 	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocate()

 	 * @generated

@@ -171,7 +171,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -180,7 +180,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Allocate</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -190,7 +190,7 @@ public interface AllocationsPackage extends EPackage {
 	 * The number of operations of the '<em>Allocate</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -199,7 +199,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl <em>Allocated</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl

 	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocated()

 	 * @generated

@@ -209,7 +209,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -218,7 +218,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Allocated From</b></em>' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -227,7 +227,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Allocated To</b></em>' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -236,7 +236,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Allocated</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -246,7 +246,7 @@ public interface AllocationsPackage extends EPackage {
 	 * The number of operations of the '<em>Allocated</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -257,7 +257,7 @@ public interface AllocationsPackage extends EPackage {
 	 * <em>Allocate Activity Partition</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateActivityPartitionImpl

 	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocateActivityPartition()

 	 * @generated

@@ -267,7 +267,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Activity Partition</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -277,7 +277,7 @@ public interface AllocationsPackage extends EPackage {
 	 * The number of structural features of the '<em>Allocate Activity Partition</em>' class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -287,7 +287,7 @@ public interface AllocationsPackage extends EPackage {
 	 * The number of operations of the '<em>Allocate Activity Partition</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -297,7 +297,7 @@ public interface AllocationsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.allocations.Allocate <em>Allocate</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Allocate</em>'.

 	 * @see org.eclipse.papyrus.sysml.allocations.Allocate

 	 * @generated

@@ -308,7 +308,7 @@ public interface AllocationsPackage extends EPackage {
 	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.allocations.Allocate#getBase_Abstraction

 	 * <em>Base Abstraction</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Abstraction</em>'.

 	 * @see org.eclipse.papyrus.sysml.allocations.Allocate#getBase_Abstraction()

 	 * @see #getAllocate()

@@ -317,11 +317,10 @@ public interface AllocationsPackage extends EPackage {
 	EReference getAllocate_Base_Abstraction();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition <em>Allocate Activity Partition</em>}

-	 * '.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition <em>Allocate Activity Partition</em>} '.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Allocate Activity Partition</em>'.

 	 * @see org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition

 	 * @generated

@@ -333,7 +332,7 @@ public interface AllocationsPackage extends EPackage {
 	 * <em>Base Activity Partition</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Activity Partition</em>'.

 	 * @see org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition#getBase_ActivityPartition()

 	 * @see #getAllocateActivityPartition()

@@ -344,7 +343,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.allocations.Allocated <em>Allocated</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Allocated</em>'.

 	 * @see org.eclipse.papyrus.sysml.allocations.Allocated

 	 * @generated

@@ -355,7 +354,7 @@ public interface AllocationsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom

 	 * <em>Allocated From</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Allocated From</em>'.

 	 * @see org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom()

 	 * @see #getAllocated()

@@ -366,7 +365,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo <em>Allocated To</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Allocated To</em>'.

 	 * @see org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo()

 	 * @see #getAllocated()

@@ -378,7 +377,7 @@ public interface AllocationsPackage extends EPackage {
 	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.allocations.Allocated#getBase_NamedElement

 	 * <em>Base Named Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Named Element</em>'.

 	 * @see org.eclipse.papyrus.sysml.allocations.Allocated#getBase_NamedElement()

 	 * @see #getAllocated()

@@ -389,7 +388,7 @@ public interface AllocationsPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateActivityPartitionImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateActivityPartitionImpl.java
index 238a076c361..446a48330b6 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateActivityPartitionImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateActivityPartitionImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,11 +27,10 @@ import org.eclipse.uml2.uml.ActivityPartition;
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateActivityPartitionImpl#getBase_ActivityPartition <em>Base Activity Partition

- * </em>}</li>

+ * <li>{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateActivityPartitionImpl#getBase_ActivityPartition <em>Base Activity Partition </em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container implements AllocateActivityPartition {

@@ -40,7 +39,7 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 	 * The cached value of the '{@link #getBase_ActivityPartition() <em>Base Activity Partition</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_ActivityPartition()

 	 * @generated

 	 * @ordered

@@ -49,7 +48,7 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected AllocateActivityPartitionImpl() {

@@ -58,7 +57,7 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivityPartition basicGetBase_ActivityPartition() {

@@ -67,15 +66,16 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION:

-			if(resolve)

+			if (resolve) {

 				return getBase_ActivityPartition();

+			}

 			return basicGetBase_ActivityPartition();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -83,12 +83,12 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION:

 			return base_ActivityPartition != null;

 		}

@@ -97,14 +97,14 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION:

-			setBase_ActivityPartition((ActivityPartition)newValue);

+			setBase_ActivityPartition((ActivityPartition) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -112,7 +112,7 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -122,14 +122,14 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION:

-			setBase_ActivityPartition((ActivityPartition)null);

+			setBase_ActivityPartition((ActivityPartition) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -137,16 +137,17 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ActivityPartition getBase_ActivityPartition() {

-		if(base_ActivityPartition != null && base_ActivityPartition.eIsProxy()) {

-			InternalEObject oldBase_ActivityPartition = (InternalEObject)base_ActivityPartition;

-			base_ActivityPartition = (ActivityPartition)eResolveProxy(oldBase_ActivityPartition);

-			if(base_ActivityPartition != oldBase_ActivityPartition) {

-				if(eNotificationRequired())

+		if (base_ActivityPartition != null && base_ActivityPartition.eIsProxy()) {

+			InternalEObject oldBase_ActivityPartition = (InternalEObject) base_ActivityPartition;

+			base_ActivityPartition = (ActivityPartition) eResolveProxy(oldBase_ActivityPartition);

+			if (base_ActivityPartition != oldBase_ActivityPartition) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION, oldBase_ActivityPartition, base_ActivityPartition));

+				}

 			}

 		}

 		return base_ActivityPartition;

@@ -154,14 +155,15 @@ public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_ActivityPartition(ActivityPartition newBase_ActivityPartition) {

 		ActivityPartition oldBase_ActivityPartition = base_ActivityPartition;

 		base_ActivityPartition = newBase_ActivityPartition;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION, oldBase_ActivityPartition, base_ActivityPartition));

+		}

 	}

 

 } // AllocateActivityPartitionImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateImpl.java
index 078abfeb600..5ee2c0e8b91 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Abstraction;
  * <li>{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class AllocateImpl extends MinimalEObjectImpl.Container implements Allocate {

@@ -39,7 +39,7 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 	 * The cached value of the '{@link #getBase_Abstraction() <em>Base Abstraction</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Abstraction()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected AllocateImpl() {

@@ -57,7 +57,7 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Abstraction basicGetBase_Abstraction() {

@@ -66,15 +66,16 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATE__BASE_ABSTRACTION:

-			if(resolve)

+			if (resolve) {

 				return getBase_Abstraction();

+			}

 			return basicGetBase_Abstraction();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATE__BASE_ABSTRACTION:

 			return base_Abstraction != null;

 		}

@@ -96,14 +97,14 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATE__BASE_ABSTRACTION:

-			setBase_Abstraction((Abstraction)newValue);

+			setBase_Abstraction((Abstraction) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATE__BASE_ABSTRACTION:

-			setBase_Abstraction((Abstraction)null);

+			setBase_Abstraction((Abstraction) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Abstraction getBase_Abstraction() {

-		if(base_Abstraction != null && base_Abstraction.eIsProxy()) {

-			InternalEObject oldBase_Abstraction = (InternalEObject)base_Abstraction;

-			base_Abstraction = (Abstraction)eResolveProxy(oldBase_Abstraction);

-			if(base_Abstraction != oldBase_Abstraction) {

-				if(eNotificationRequired())

+		if (base_Abstraction != null && base_Abstraction.eIsProxy()) {

+			InternalEObject oldBase_Abstraction = (InternalEObject) base_Abstraction;

+			base_Abstraction = (Abstraction) eResolveProxy(oldBase_Abstraction);

+			if (base_Abstraction != oldBase_Abstraction) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, AllocationsPackage.ALLOCATE__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));

+				}

 			}

 		}

 		return base_Abstraction;

@@ -153,14 +155,15 @@ public class AllocateImpl extends MinimalEObjectImpl.Container implements Alloca
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Abstraction(Abstraction newBase_Abstraction) {

 		Abstraction oldBase_Abstraction = base_Abstraction;

 		base_Abstraction = newBase_Abstraction;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, AllocationsPackage.ALLOCATE__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));

+		}

 	}

 

 } // AllocateImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocatedImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocatedImpl.java
index 4722f5c4af4..0a6e0ad009c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocatedImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocatedImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -41,7 +41,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <li>{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl#getAllocatedTo <em>Allocated To</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class AllocatedImpl extends MinimalEObjectImpl.Container implements Allocated {

@@ -50,7 +50,7 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 	 * The cached value of the '{@link #getBase_NamedElement() <em>Base Named Element</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_NamedElement()

 	 * @generated

 	 * @ordered

@@ -59,7 +59,7 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected AllocatedImpl() {

@@ -68,7 +68,7 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement basicGetBase_NamedElement() {

@@ -77,15 +77,16 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT:

-			if(resolve)

+			if (resolve) {

 				return getBase_NamedElement();

+			}

 			return basicGetBase_NamedElement();

 		case AllocationsPackage.ALLOCATED__ALLOCATED_FROM:

 			return getAllocatedFrom();

@@ -97,12 +98,12 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT:

 			return base_NamedElement != null;

 		case AllocationsPackage.ALLOCATED__ALLOCATED_FROM:

@@ -115,14 +116,14 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT:

-			setBase_NamedElement((NamedElement)newValue);

+			setBase_NamedElement((NamedElement) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -130,7 +131,7 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -140,14 +141,14 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT:

-			setBase_NamedElement((NamedElement)null);

+			setBase_NamedElement((NamedElement) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -155,7 +156,7 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<NamedElement> getAllocatedFrom() {

@@ -165,20 +166,20 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 		EList<NamedElement> allocatedFrom = new BasicEList<NamedElement>();

 		Allocate currentAllocate = null;

 

-		if(getBase_NamedElement() != null) {

+		if (getBase_NamedElement() != null) {

 			// Find Allocate link

 			Iterator<DirectedRelationship> itDep = getBase_NamedElement().getTargetDirectedRelationships().iterator();

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				DirectedRelationship currentDRelationship = itDep.next();

 				currentAllocate = UMLUtil.getStereotypeApplication(currentDRelationship, Allocate.class);

 

-				if(currentAllocate != null) {

+				if (currentAllocate != null) {

 					EList<Element> targets = currentAllocate.getBase_Abstraction().getSources();

 					Iterator<Element> it = targets.iterator();

-					while(it.hasNext()) {

+					while (it.hasNext()) {

 						Element currentElt = it.next();

-						if(currentElt instanceof NamedElement) {

-							allocatedFrom.add((NamedElement)currentElt);

+						if (currentElt instanceof NamedElement) {

+							allocatedFrom.add((NamedElement) currentElt);

 						}

 					}

 				}

@@ -192,7 +193,7 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getAllocatedFrom(String name) {

@@ -202,15 +203,17 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getAllocatedFrom(String name, boolean ignoreCase, EClass eClass) {

-		allocatedFromLoop: for(NamedElement allocatedFrom : getAllocatedFrom()) {

-			if(eClass != null && !eClass.isInstance(allocatedFrom))

+		allocatedFromLoop: for (NamedElement allocatedFrom : getAllocatedFrom()) {

+			if (eClass != null && !eClass.isInstance(allocatedFrom)) {

 				continue allocatedFromLoop;

-			if(name != null && !(ignoreCase ? name.equalsIgnoreCase(allocatedFrom.getName()) : name.equals(allocatedFrom.getName())))

+			}

+			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(allocatedFrom.getName()) : name.equals(allocatedFrom.getName()))) {

 				continue allocatedFromLoop;

+			}

 			return allocatedFrom;

 		}

 		return null;

@@ -218,7 +221,7 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<NamedElement> getAllocatedTo() {

@@ -228,14 +231,14 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 		EList<NamedElement> allocatedTo = new BasicEList<NamedElement>();

 		Allocate currentAllocate = null;

 

-		if(getBase_NamedElement() != null) {

+		if (getBase_NamedElement() != null) {

 			// Find Allocate link

 			Iterator<Dependency> itDep = getBase_NamedElement().getClientDependencies().iterator();

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				Dependency currentDependency = itDep.next();

 				currentAllocate = UMLUtil.getStereotypeApplication(currentDependency, Allocate.class);

 

-				if(currentAllocate != null) {

+				if (currentAllocate != null) {

 					allocatedTo.addAll(currentAllocate.getBase_Abstraction().getSuppliers());

 				}

 			}

@@ -247,7 +250,7 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getAllocatedTo(String name) {

@@ -257,15 +260,17 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getAllocatedTo(String name, boolean ignoreCase, EClass eClass) {

-		allocatedToLoop: for(NamedElement allocatedTo : getAllocatedTo()) {

-			if(eClass != null && !eClass.isInstance(allocatedTo))

+		allocatedToLoop: for (NamedElement allocatedTo : getAllocatedTo()) {

+			if (eClass != null && !eClass.isInstance(allocatedTo)) {

 				continue allocatedToLoop;

-			if(name != null && !(ignoreCase ? name.equalsIgnoreCase(allocatedTo.getName()) : name.equals(allocatedTo.getName())))

+			}

+			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(allocatedTo.getName()) : name.equals(allocatedTo.getName()))) {

 				continue allocatedToLoop;

+			}

 			return allocatedTo;

 		}

 		return null;

@@ -273,16 +278,17 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getBase_NamedElement() {

-		if(base_NamedElement != null && base_NamedElement.eIsProxy()) {

-			InternalEObject oldBase_NamedElement = (InternalEObject)base_NamedElement;

-			base_NamedElement = (NamedElement)eResolveProxy(oldBase_NamedElement);

-			if(base_NamedElement != oldBase_NamedElement) {

-				if(eNotificationRequired())

+		if (base_NamedElement != null && base_NamedElement.eIsProxy()) {

+			InternalEObject oldBase_NamedElement = (InternalEObject) base_NamedElement;

+			base_NamedElement = (NamedElement) eResolveProxy(oldBase_NamedElement);

+			if (base_NamedElement != oldBase_NamedElement) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));

+				}

 			}

 		}

 		return base_NamedElement;

@@ -290,14 +296,15 @@ public class AllocatedImpl extends MinimalEObjectImpl.Container implements Alloc
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_NamedElement(NamedElement newBase_NamedElement) {

 		NamedElement oldBase_NamedElement = base_NamedElement;

 		base_NamedElement = newBase_NamedElement;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));

+		}

 	}

 

 } // AllocatedImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsFactoryImpl.java
index 96cff554b69..e0b8afd379d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,14 +27,14 @@ import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class AllocationsFactoryImpl extends EFactoryImpl implements AllocationsFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -47,13 +47,13 @@ public class AllocationsFactoryImpl extends EFactoryImpl implements AllocationsF
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static AllocationsFactory init() {

 		try {

-			AllocationsFactory theAllocationsFactory = (AllocationsFactory)EPackage.Registry.INSTANCE.getEFactory(AllocationsPackage.eNS_URI);

-			if(theAllocationsFactory != null) {

+			AllocationsFactory theAllocationsFactory = (AllocationsFactory) EPackage.Registry.INSTANCE.getEFactory(AllocationsPackage.eNS_URI);

+			if (theAllocationsFactory != null) {

 				return theAllocationsFactory;

 			}

 		} catch (Exception exception) {

@@ -66,7 +66,7 @@ public class AllocationsFactoryImpl extends EFactoryImpl implements AllocationsF
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocationsFactoryImpl() {

@@ -75,12 +75,12 @@ public class AllocationsFactoryImpl extends EFactoryImpl implements AllocationsF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		case AllocationsPackage.ALLOCATE:

 			return createAllocate();

 		case AllocationsPackage.ALLOCATED:

@@ -94,7 +94,7 @@ public class AllocationsFactoryImpl extends EFactoryImpl implements AllocationsF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Allocate createAllocate() {

@@ -104,7 +104,7 @@ public class AllocationsFactoryImpl extends EFactoryImpl implements AllocationsF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocateActivityPartition createAllocateActivityPartition() {

@@ -114,7 +114,7 @@ public class AllocationsFactoryImpl extends EFactoryImpl implements AllocationsF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Allocated createAllocated() {

@@ -124,11 +124,11 @@ public class AllocationsFactoryImpl extends EFactoryImpl implements AllocationsF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocationsPackage getAllocationsPackage() {

-		return (AllocationsPackage)getEPackage();

+		return (AllocationsPackage) getEPackage();

 	}

 

 } // AllocationsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsPackageImpl.java
index 3f2de5600f3..fee2f037735 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -48,36 +48,36 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class AllocationsPackageImpl extends EPackageImpl implements AllocationsPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link AllocationsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link AllocationsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static AllocationsPackage init() {

-		if(isInited)

-			return (AllocationsPackage)EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI);

+		if (isInited) {

+			return (AllocationsPackage) EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AllocationsPackageImpl());

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AllocationsPackageImpl());

 

 		isInited = true;

 

@@ -85,16 +85,24 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theAllocationsPackage.createPackageContents();

@@ -133,35 +141,35 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass allocateEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass allocatedEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass allocateActivityPartitionEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -171,9 +179,8 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#eNS_URI

 	 * @see #init()

@@ -188,12 +195,13 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create classes and their features

@@ -211,7 +219,7 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getAllocate() {

@@ -220,16 +228,16 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getAllocate_Base_Abstraction() {

-		return (EReference)allocateEClass.getEStructuralFeatures().get(0);

+		return (EReference) allocateEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getAllocateActivityPartition() {

@@ -238,16 +246,16 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getAllocateActivityPartition_Base_ActivityPartition() {

-		return (EReference)allocateActivityPartitionEClass.getEStructuralFeatures().get(0);

+		return (EReference) allocateActivityPartitionEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getAllocated() {

@@ -256,50 +264,51 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getAllocated_AllocatedFrom() {

-		return (EReference)allocatedEClass.getEStructuralFeatures().get(1);

+		return (EReference) allocatedEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getAllocated_AllocatedTo() {

-		return (EReference)allocatedEClass.getEStructuralFeatures().get(2);

+		return (EReference) allocatedEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getAllocated_Base_NamedElement() {

-		return (EReference)allocatedEClass.getEStructuralFeatures().get(0);

+		return (EReference) allocatedEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocationsFactory getAllocationsFactory() {

-		return (AllocationsFactory)getEFactoryInstance();

+		return (AllocationsFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

@@ -308,7 +317,7 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 		setNsURI(eNS_URI);

 

 		// Obtain other dependent packages

-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

 

 		// Create type parameters

 

@@ -318,15 +327,20 @@ public class AllocationsPackageImpl extends EPackageImpl implements AllocationsP
 

 		// Initialize classes, features, and operations; add parameters

 		initEClass(allocateEClass, Allocate.class, "Allocate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getAllocate_Base_Abstraction(), theUMLPackage.getAbstraction(), null, "base_Abstraction", null, 1, 1, Allocate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getAllocate_Base_Abstraction(), theUMLPackage.getAbstraction(), null, "base_Abstraction", null, 1, 1, Allocate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

 

 		initEClass(allocatedEClass, Allocated.class, "Allocated", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getAllocated_Base_NamedElement(), theUMLPackage.getNamedElement(), null, "base_NamedElement", null, 1, 1, Allocated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getAllocated_AllocatedFrom(), theUMLPackage.getNamedElement(), null, "allocatedFrom", null, 0, -1, Allocated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getAllocated_AllocatedTo(), theUMLPackage.getNamedElement(), null, "allocatedTo", null, 0, -1, Allocated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

+		initEReference(getAllocated_Base_NamedElement(), theUMLPackage.getNamedElement(), null, "base_NamedElement", null, 1, 1, Allocated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

+		initEReference(getAllocated_AllocatedFrom(), theUMLPackage.getNamedElement(), null, "allocatedFrom", null, 0, -1, Allocated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

+		initEReference(getAllocated_AllocatedTo(), theUMLPackage.getNamedElement(), null, "allocatedTo", null, 0, -1, Allocated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

 

 		initEClass(allocateActivityPartitionEClass, AllocateActivityPartition.class, "AllocateActivityPartition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getAllocateActivityPartition_Base_ActivityPartition(), theUMLPackage.getActivityPartition(), null, "base_ActivityPartition", null, 1, 1, AllocateActivityPartition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getAllocateActivityPartition_Base_ActivityPartition(), theUMLPackage.getActivityPartition(), null, "base_ActivityPartition", null, 1, 1, AllocateActivityPartition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 	}

 

 } // AllocationsPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsAdapterFactory.java
index 8424991e2b6..c6b0f45cc9f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,7 +26,7 @@ import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides

  * an adapter <code>createXXX</code> method for each class of the model. <!--

  * end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage

  * @generated

  */

@@ -35,7 +35,7 @@ public class AllocationsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static AllocationsPackage modelPackage;

@@ -43,7 +43,7 @@ public class AllocationsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The switch that delegates to the <code>createXXX</code> methods. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected AllocationsSwitch<Adapter> modelSwitch = new AllocationsSwitch<Adapter>() {

@@ -73,11 +73,11 @@ public class AllocationsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocationsAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = AllocationsPackage.eINSTANCE;

 		}

 	}

@@ -86,15 +86,15 @@ public class AllocationsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param target

-	 *        the object to adapt.

+	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

 	@Override

 	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

+		return modelSwitch.doSwitch((EObject) target);

 	}

 

 	/**

@@ -104,7 +104,7 @@ public class AllocationsAdapterFactory extends AdapterFactoryImpl {
 	 * default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases

 	 * anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition

 	 * @generated

@@ -119,7 +119,7 @@ public class AllocationsAdapterFactory extends AdapterFactoryImpl {
 	 * --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.allocations.Allocate

 	 * @generated

@@ -134,7 +134,7 @@ public class AllocationsAdapterFactory extends AdapterFactoryImpl {
 	 * returns null so that we can easily ignore cases; it's useful to ignore a

 	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.allocations.Allocated

 	 * @generated

@@ -147,7 +147,7 @@ public class AllocationsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This

 	 * default implementation returns null. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -160,17 +160,17 @@ public class AllocationsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if

 	 * the object is either the model's package or is an instance object of the

 	 * model. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

 	}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceFactoryImpl.java
index 65a781f68f4..09e5e1a3ebb 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.allocations.util.AllocationsResourceImpl

  * @generated

  */

@@ -31,7 +31,7 @@ public class AllocationsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocationsResourceFactoryImpl() {

@@ -42,7 +42,7 @@ public class AllocationsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceImpl.java
index bd615f95063..9a9537bc31f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.allocations.util.AllocationsResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class AllocationsResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public AllocationsResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsSwitch.java
index 5ecd1c44704..edd0b54cb63 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsSwitch.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsSwitch.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,7 +27,7 @@ import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
  * starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the

  * result of the switch. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage

  * @generated

  */

@@ -36,7 +36,7 @@ public class AllocationsSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static AllocationsPackage modelPackage;

@@ -45,11 +45,11 @@ public class AllocationsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocationsSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = AllocationsPackage.eINSTANCE;

 		}

 	}

@@ -57,7 +57,7 @@ public class AllocationsSwitch<T> extends Switch<T> {
 	/**

 	 * Checks whether this is a switch for the given package. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -72,9 +72,9 @@ public class AllocationsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Allocate</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -88,9 +88,9 @@ public class AllocationsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This

 	 * implementation returns null; returning a non-null result will terminate

 	 * the switch. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Allocate Activity Partition</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -104,9 +104,9 @@ public class AllocationsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Allocated</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -120,9 +120,9 @@ public class AllocationsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch, but this is

 	 * the last case anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -136,35 +136,35 @@ public class AllocationsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case AllocationsPackage.ALLOCATE:

-		{

-			Allocate allocate = (Allocate)theEObject;

+		switch (classifierID) {

+		case AllocationsPackage.ALLOCATE: {

+			Allocate allocate = (Allocate) theEObject;

 			T result = caseAllocate(allocate);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case AllocationsPackage.ALLOCATED:

-		{

-			Allocated allocated = (Allocated)theEObject;

+		case AllocationsPackage.ALLOCATED: {

+			Allocated allocated = (Allocated) theEObject;

 			T result = caseAllocated(allocated);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION:

-		{

-			AllocateActivityPartition allocateActivityPartition = (AllocateActivityPartition)theEObject;

+		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION: {

+			AllocateActivityPartition allocateActivityPartition = (AllocateActivityPartition) theEObject;

 			T result = caseAllocateActivityPartition(allocateActivityPartition);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

 		default:

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsXMLProcessor.java
index 98874a0dd26..a50ca0dbcf6 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class AllocationsXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class AllocationsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public AllocationsXMLProcessor() {

@@ -44,12 +44,12 @@ public class AllocationsXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the AllocationsResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new AllocationsResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new AllocationsResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BindingConnector.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BindingConnector.java
index 1d6cbbc5f4f..2ae1df4e74b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BindingConnector.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BindingConnector.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Connector;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Binding Connector</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.blocks.BindingConnector#getBase_Connector <em>Base Connector</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getBindingConnector()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface BindingConnector extends EObject {
 	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Connector</em>' reference.

 	 * @see #setBase_Connector(Connector)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getBindingConnector_Base_Connector()

@@ -52,9 +52,9 @@ public interface BindingConnector extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.BindingConnector#getBase_Connector <em>Base Connector</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Connector</em>' reference.

+	 *            the new value of the '<em>Base Connector</em>' reference.

 	 * @see #getBase_Connector()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Block.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Block.java
index e9ea9da52d4..9ec48fafda5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Block.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Block.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EObject;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Block</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.Block#getBase_Class <em>Base Class</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getBlock()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface Block extends EObject {
 	 * If the meaning of the '<em>Is Encapsulated</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Is Encapsulated</em>' attribute.

 	 * @see #setIsEncapsulated(boolean)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getBlock_IsEncapsulated()

@@ -55,7 +55,7 @@ public interface Block extends EObject {
 	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getBlock_Base_Class()

@@ -68,9 +68,9 @@ public interface Block extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.Block#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Class</em>' reference.

+	 *            the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

 	 * @generated

 	 */

@@ -80,9 +80,9 @@ public interface Block extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.Block#isEncapsulated <em>Is Encapsulated</em>}' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Is Encapsulated</em>' attribute.

+	 *            the new value of the '<em>Is Encapsulated</em>' attribute.

 	 * @see #isEncapsulated()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksFactory.java
index b6e85307f0e..a93df4215a6 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface BlocksFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	BlocksFactory eINSTANCE = org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksFactoryImpl.init();

@@ -36,7 +36,7 @@ public interface BlocksFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Binding Connector</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Binding Connector</em>'.

 	 * @generated

 	 */

@@ -46,7 +46,7 @@ public interface BlocksFactory extends EFactory {
 	 * Returns a new object of class '<em>Block</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Block</em>'.

 	 * @generated

 	 */

@@ -55,7 +55,7 @@ public interface BlocksFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Connector Property</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Connector Property</em>'.

 	 * @generated

 	 */

@@ -65,7 +65,7 @@ public interface BlocksFactory extends EFactory {
 	 * Returns a new object of class '<em>Dimension</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Dimension</em>'.

 	 * @generated

 	 */

@@ -74,7 +74,7 @@ public interface BlocksFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Distributed Property</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Distributed Property</em>'.

 	 * @generated

 	 */

@@ -83,7 +83,7 @@ public interface BlocksFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Nested Connector End</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Nested Connector End</em>'.

 	 * @generated

 	 */

@@ -92,7 +92,7 @@ public interface BlocksFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Participant Property</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Participant Property</em>'.

 	 * @generated

 	 */

@@ -101,7 +101,7 @@ public interface BlocksFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Property Specific Type</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Property Specific Type</em>'.

 	 * @generated

 	 */

@@ -111,7 +111,7 @@ public interface BlocksFactory extends EFactory {
 	 * Returns a new object of class '<em>Unit</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Unit</em>'.

 	 * @generated

 	 */

@@ -121,7 +121,7 @@ public interface BlocksFactory extends EFactory {
 	 * Returns a new object of class '<em>Value Type</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Value Type</em>'.

 	 * @generated

 	 */

@@ -131,7 +131,7 @@ public interface BlocksFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksPackage.java
index 5e066407d82..614b71481b8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksFactory

  * @model kind="package"

  * @generated

@@ -45,7 +45,7 @@ public interface BlocksPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -53,7 +53,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl <em>Block</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getBlock()

 		 * @generated

@@ -63,7 +63,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Is Encapsulated</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute BLOCK__IS_ENCAPSULATED = eINSTANCE.getBlock_IsEncapsulated();

@@ -71,7 +71,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference BLOCK__BASE_CLASS = eINSTANCE.getBlock_Base_Class();

@@ -81,7 +81,7 @@ public interface BlocksPackage extends EPackage {
 		 * <em>Distributed Property</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.DistributedPropertyImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getDistributedProperty()

 		 * @generated

@@ -91,7 +91,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference DISTRIBUTED_PROPERTY__BASE_PROPERTY = eINSTANCE.getDistributedProperty_Base_Property();

@@ -100,7 +100,7 @@ public interface BlocksPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl

 		 * <em>Dimension</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getDimension()

 		 * @generated

@@ -110,7 +110,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the ' <em><b>Base Instance Specification</b></em>' reference feature. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference DIMENSION__BASE_INSTANCE_SPECIFICATION = eINSTANCE.getDimension_Base_InstanceSpecification();

@@ -118,7 +118,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl <em>Unit</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getUnit()

 		 * @generated

@@ -128,7 +128,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the ' <em><b>Base Instance Specification</b></em>' reference feature. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference UNIT__BASE_INSTANCE_SPECIFICATION = eINSTANCE.getUnit_Base_InstanceSpecification();

@@ -136,7 +136,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Dimension</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference UNIT__DIMENSION = eINSTANCE.getUnit_Dimension();

@@ -145,7 +145,7 @@ public interface BlocksPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl <em>Value Type</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getValueType()

 		 * @generated

@@ -155,7 +155,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Data Type</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference VALUE_TYPE__BASE_DATA_TYPE = eINSTANCE.getValueType_Base_DataType();

@@ -163,7 +163,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Unit</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference VALUE_TYPE__UNIT = eINSTANCE.getValueType_Unit();

@@ -171,7 +171,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Dimension</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference VALUE_TYPE__DIMENSION = eINSTANCE.getValueType_Dimension();

@@ -181,7 +181,7 @@ public interface BlocksPackage extends EPackage {
 		 * <em>Nested Connector End</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getNestedConnectorEnd()

 		 * @generated

@@ -191,7 +191,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Property Path</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference NESTED_CONNECTOR_END__PROPERTY_PATH = eINSTANCE.getNestedConnectorEnd_PropertyPath();

@@ -199,7 +199,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Connector End</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference NESTED_CONNECTOR_END__BASE_CONNECTOR_END = eINSTANCE.getNestedConnectorEnd_Base_ConnectorEnd();

@@ -209,7 +209,7 @@ public interface BlocksPackage extends EPackage {
 		 * <em>Participant Property</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ParticipantPropertyImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getParticipantProperty()

 		 * @generated

@@ -219,7 +219,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference PARTICIPANT_PROPERTY__BASE_PROPERTY = eINSTANCE.getParticipantProperty_Base_Property();

@@ -227,7 +227,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>End</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference PARTICIPANT_PROPERTY__END = eINSTANCE.getParticipantProperty_End();

@@ -237,7 +237,7 @@ public interface BlocksPackage extends EPackage {
 		 * class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getConnectorProperty()

 		 * @generated

@@ -247,7 +247,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference CONNECTOR_PROPERTY__BASE_PROPERTY = eINSTANCE.getConnectorProperty_Base_Property();

@@ -255,7 +255,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Connector</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference CONNECTOR_PROPERTY__CONNECTOR = eINSTANCE.getConnectorProperty_Connector();

@@ -265,7 +265,7 @@ public interface BlocksPackage extends EPackage {
 		 * class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BindingConnectorImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getBindingConnector()

 		 * @generated

@@ -275,7 +275,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Connector</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference BINDING_CONNECTOR__BASE_CONNECTOR = eINSTANCE.getBindingConnector_Base_Connector();

@@ -285,7 +285,7 @@ public interface BlocksPackage extends EPackage {
 		 * <em>Property Specific Type</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.PropertySpecificTypeImpl

 		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getPropertySpecificType()

 		 * @generated

@@ -295,7 +295,7 @@ public interface BlocksPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Classifier</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER = eINSTANCE.getPropertySpecificType_Base_Classifier();

@@ -305,7 +305,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "blocks";

@@ -313,7 +313,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks";

@@ -321,7 +321,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "Blocks";

@@ -330,7 +330,7 @@ public interface BlocksPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	BlocksPackage eINSTANCE = org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl.init();

@@ -338,7 +338,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl <em>Block</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getBlock()

 	 * @generated

@@ -348,7 +348,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -357,7 +357,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Class</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -366,7 +366,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Block</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -376,7 +376,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Block</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -387,7 +387,7 @@ public interface BlocksPackage extends EPackage {
 	 * class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.DistributedPropertyImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getDistributedProperty()

 	 * @generated

@@ -397,7 +397,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -406,7 +406,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Distributed Property</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -416,7 +416,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Distributed Property</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -425,7 +425,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl <em>Dimension</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getDimension()

 	 * @generated

@@ -435,7 +435,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Instance Specification</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -444,7 +444,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Dimension</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -454,7 +454,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Dimension</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -463,7 +463,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl <em>Unit</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getUnit()

 	 * @generated

@@ -473,7 +473,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Instance Specification</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -482,7 +482,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Dimension</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -491,7 +491,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Unit</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -501,7 +501,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Unit</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -511,7 +511,7 @@ public interface BlocksPackage extends EPackage {
 	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl

 	 * <em>Value Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getValueType()

 	 * @generated

@@ -521,7 +521,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -530,7 +530,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Unit</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -539,7 +539,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Dimension</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -548,7 +548,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Value Type</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -558,7 +558,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Value Type</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -568,7 +568,7 @@ public interface BlocksPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl <em>Nested Connector End</em>}' class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getNestedConnectorEnd()

 	 * @generated

@@ -578,7 +578,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Property Path</b></em>' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -587,7 +587,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Connector End</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -596,7 +596,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Nested Connector End</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -606,7 +606,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Nested Connector End</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -617,7 +617,7 @@ public interface BlocksPackage extends EPackage {
 	 * class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ParticipantPropertyImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getParticipantProperty()

 	 * @generated

@@ -627,7 +627,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -636,7 +636,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>End</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -645,7 +645,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Participant Property</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -655,7 +655,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Participant Property</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -665,7 +665,7 @@ public interface BlocksPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl <em>Connector Property</em>}' class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getConnectorProperty()

 	 * @generated

@@ -675,7 +675,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -684,7 +684,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Connector</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -693,7 +693,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Connector Property</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -703,7 +703,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Connector Property</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -713,7 +713,7 @@ public interface BlocksPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BindingConnectorImpl <em>Binding Connector</em>}' class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BindingConnectorImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getBindingConnector()

 	 * @generated

@@ -723,7 +723,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Connector</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -732,7 +732,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Binding Connector</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -742,7 +742,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Binding Connector</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -753,7 +753,7 @@ public interface BlocksPackage extends EPackage {
 	 * class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.PropertySpecificTypeImpl

 	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getPropertySpecificType()

 	 * @generated

@@ -763,7 +763,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Classifier</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -772,7 +772,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Property Specific Type</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -782,7 +782,7 @@ public interface BlocksPackage extends EPackage {
 	 * The number of operations of the '<em>Property Specific Type</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -792,7 +792,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.blocks.BindingConnector

 	 * <em>Binding Connector</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Binding Connector</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.BindingConnector

 	 * @generated

@@ -800,10 +800,9 @@ public interface BlocksPackage extends EPackage {
 	EClass getBindingConnector();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.BindingConnector#getBase_Connector <em>Base Connector</em>}

-	 * '.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.BindingConnector#getBase_Connector <em>Base Connector</em>} '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Connector</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.BindingConnector#getBase_Connector()

 	 * @see #getBindingConnector()

@@ -814,7 +813,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.blocks.Block <em>Block</em>}'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Block</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.Block

 	 * @generated

@@ -824,7 +823,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.Block#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.Block#getBase_Class()

 	 * @see #getBlock()

@@ -835,7 +834,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.blocks.Block#isEncapsulated <em>Is Encapsulated</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Is Encapsulated</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.Block#isEncapsulated()

 	 * @see #getBlock()

@@ -846,7 +845,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -856,7 +855,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty

 	 * <em>Connector Property</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Connector Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ConnectorProperty

 	 * @generated

@@ -866,7 +865,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getBase_Property <em>Base Property</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getBase_Property()

 	 * @see #getConnectorProperty()

@@ -877,7 +876,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getConnector <em>Connector</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Connector</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getConnector()

 	 * @see #getConnectorProperty()

@@ -888,7 +887,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.Dimension <em>Dimension</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Dimension</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.Dimension

 	 * @generated

@@ -900,7 +899,7 @@ public interface BlocksPackage extends EPackage {
 	 * <em>Base Instance Specification</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Instance Specification</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.Dimension#getBase_InstanceSpecification()

 	 * @see #getDimension()

@@ -912,7 +911,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty <em>Distributed Property</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Distributed Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.DistributedProperty

 	 * @generated

@@ -920,10 +919,9 @@ public interface BlocksPackage extends EPackage {
 	EClass getDistributedProperty();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty#getBase_Property <em>Base Property</em>}

-	 * '.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty#getBase_Property <em>Base Property</em>} '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.DistributedProperty#getBase_Property()

 	 * @see #getDistributedProperty()

@@ -935,7 +933,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd <em>Nested Connector End</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Nested Connector End</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd

 	 * @generated

@@ -946,7 +944,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getBase_ConnectorEnd

 	 * <em>Base Connector End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Connector End</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getBase_ConnectorEnd()

 	 * @see #getNestedConnectorEnd()

@@ -958,7 +956,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getPropertyPath

 	 * <em>Property Path</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Property Path</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getPropertyPath()

 	 * @see #getNestedConnectorEnd()

@@ -970,7 +968,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty <em>Participant Property</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Participant Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ParticipantProperty

 	 * @generated

@@ -978,10 +976,9 @@ public interface BlocksPackage extends EPackage {
 	EClass getParticipantProperty();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getBase_Property <em>Base Property</em>}

-	 * '.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getBase_Property <em>Base Property</em>} '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getBase_Property()

 	 * @see #getParticipantProperty()

@@ -992,7 +989,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getEnd <em>End</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>End</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getEnd()

 	 * @see #getParticipantProperty()

@@ -1004,7 +1001,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType <em>Property Specific Type</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Property Specific Type</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.PropertySpecificType

 	 * @generated

@@ -1015,7 +1012,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType#getBase_Classifier

 	 * <em>Base Classifier</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Classifier</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.PropertySpecificType#getBase_Classifier()

 	 * @see #getPropertySpecificType()

@@ -1026,7 +1023,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.blocks.Unit <em>Unit</em>}'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Unit</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.Unit

 	 * @generated

@@ -1038,7 +1035,7 @@ public interface BlocksPackage extends EPackage {
 	 * <em>Base Instance Specification</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Instance Specification</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.Unit#getBase_InstanceSpecification()

 	 * @see #getUnit()

@@ -1049,7 +1046,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.Unit#getDimension <em>Dimension</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Dimension</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.Unit#getDimension()

 	 * @see #getUnit()

@@ -1060,7 +1057,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.ValueType <em>Value Type</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Value Type</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ValueType

 	 * @generated

@@ -1070,7 +1067,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getBase_DataType <em>Base Data Type</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Data Type</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ValueType#getBase_DataType()

 	 * @see #getValueType()

@@ -1081,7 +1078,7 @@ public interface BlocksPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getDimension <em>Dimension</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Dimension</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ValueType#getDimension()

 	 * @see #getValueType()

@@ -1093,7 +1090,7 @@ public interface BlocksPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getUnit <em>Unit</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Unit</em>'.

 	 * @see org.eclipse.papyrus.sysml.blocks.ValueType#getUnit()

 	 * @see #getValueType()

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ConnectorProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ConnectorProperty.java
index c6b5b1f279b..254d67bffe0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ConnectorProperty.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ConnectorProperty.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.uml2.uml.Property;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Connector Property</b></em> '. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -27,7 +27,7 @@ import org.eclipse.uml2.uml.Property;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getConnector <em>Connector</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getConnectorProperty()

  * @model

  * @generated

@@ -41,7 +41,7 @@ public interface ConnectorProperty extends EObject {
 	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Property</em>' reference.

 	 * @see #setBase_Property(Property)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getConnectorProperty_Base_Property()

@@ -57,7 +57,7 @@ public interface ConnectorProperty extends EObject {
 	 * If the meaning of the '<em>Connector</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Connector</em>' reference.

 	 * @see #setConnector(Connector)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getConnectorProperty_Connector()

@@ -70,9 +70,9 @@ public interface ConnectorProperty extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getBase_Property <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Property</em>' reference.

+	 *            the new value of the '<em>Base Property</em>' reference.

 	 * @see #getBase_Property()

 	 * @generated

 	 */

@@ -82,9 +82,9 @@ public interface ConnectorProperty extends EObject {
 	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getConnector

 	 * <em>Connector</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Connector</em>' reference.

+	 *            the new value of the '<em>Connector</em>' reference.

 	 * @see #getConnector()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Dimension.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Dimension.java
index 7da0e7376d6..e736af5ab84 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Dimension.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Dimension.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.InstanceSpecification;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Dimension</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.blocks.Dimension#getBase_InstanceSpecification <em>Base Instance Specification</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getDimension()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface Dimension extends EObject {
 	 * If the meaning of the '<em>Base Instance Specification</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Instance Specification</em>' reference.

 	 * @see #setBase_InstanceSpecification(InstanceSpecification)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getDimension_Base_InstanceSpecification()

@@ -53,9 +53,9 @@ public interface Dimension extends EObject {
 	 * reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Instance Specification</em>' reference.

+	 *            the new value of the '<em>Base Instance Specification</em>' reference.

 	 * @see #getBase_InstanceSpecification()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/DistributedProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/DistributedProperty.java
index 1ef062f82e5..362b393e8fc 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/DistributedProperty.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/DistributedProperty.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Property;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Distributed Property</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty#getBase_Property <em>Base Property</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getDistributedProperty()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface DistributedProperty extends EObject {
 	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Property</em>' reference.

 	 * @see #setBase_Property(Property)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getDistributedProperty_Base_Property()

@@ -52,9 +52,9 @@ public interface DistributedProperty extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty#getBase_Property <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Property</em>' reference.

+	 *            the new value of the '<em>Base Property</em>' reference.

 	 * @see #getBase_Property()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/NestedConnectorEnd.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/NestedConnectorEnd.java
index 830a1d92c1f..3b3576d1d8b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/NestedConnectorEnd.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/NestedConnectorEnd.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -22,7 +22,7 @@ import org.eclipse.uml2.uml.Type;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Nested Connector End</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Type;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getBase_ConnectorEnd <em>Base Connector End</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getNestedConnectorEnd()

  * @model

  * @generated

@@ -44,7 +44,7 @@ public interface NestedConnectorEnd extends EObject {
 	 * If the meaning of the '<em>Base Connector End</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Connector End</em>' reference.

 	 * @see #setBase_ConnectorEnd(ConnectorEnd)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getNestedConnectorEnd_Base_ConnectorEnd()

@@ -61,7 +61,7 @@ public interface NestedConnectorEnd extends EObject {
 	 * If the meaning of the '<em>Property Path</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Property Path</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getNestedConnectorEnd_PropertyPath()

 	 * @model required="true"

@@ -70,38 +70,34 @@ public interface NestedConnectorEnd extends EObject {
 	EList<Property> getPropertyPath();

 

 	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>' from the '

-	 * <em><b>Property Path</b></em>' reference list.

+	 * Retrieves the first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>' from the ' <em><b>Property Path</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

 	 * @param type

-	 *        The '<em><b>Type</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>', or

-	 *         <code>null</code>.

+	 *            The '<em><b>Type</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

+	 * @return The first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>', or <code>null</code>.

 	 * @see #getPropertyPath()

 	 * @generated

 	 */

 	Property getPropertyPath(String name, Type type);

 

 	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>' from the '

-	 * <em><b>Property Path</b></em>' reference list.

+	 * Retrieves the first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>' from the ' <em><b>Property Path</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

 	 * @param type

-	 *        The '<em><b>Type</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Type</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

 	 * @param ignoreCase

-	 *        Whether to ignore case in {@link java.lang.String} comparisons.

+	 *            Whether to ignore case in {@link java.lang.String} comparisons.

 	 * @param eClass

-	 *        The Ecore class of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>', or

-	 *         <code>null</code>.

+	 *            The Ecore class of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

+	 * @return The first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>', or <code>null</code>.

 	 * @see #getPropertyPath()

 	 * @generated

 	 */

@@ -111,9 +107,9 @@ public interface NestedConnectorEnd extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getBase_ConnectorEnd <em>Base Connector End</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Connector End</em>' reference.

+	 *            the new value of the '<em>Base Connector End</em>' reference.

 	 * @see #getBase_ConnectorEnd()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ParticipantProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ParticipantProperty.java
index ec53bb28cf0..83106a96421 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ParticipantProperty.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ParticipantProperty.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.uml2.uml.Property;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Participant Property</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -26,7 +26,7 @@ import org.eclipse.uml2.uml.Property;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getEnd <em>End</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getParticipantProperty()

  * @model

  * @generated

@@ -40,7 +40,7 @@ public interface ParticipantProperty extends EObject {
 	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Property</em>' reference.

 	 * @see #setBase_Property(Property)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getParticipantProperty_Base_Property()

@@ -56,7 +56,7 @@ public interface ParticipantProperty extends EObject {
 	 * If the meaning of the '<em>End</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>End</em>' reference.

 	 * @see #setEnd(Property)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getParticipantProperty_End()

@@ -69,9 +69,9 @@ public interface ParticipantProperty extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getBase_Property <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Property</em>' reference.

+	 *            the new value of the '<em>Base Property</em>' reference.

 	 * @see #getBase_Property()

 	 * @generated

 	 */

@@ -80,9 +80,9 @@ public interface ParticipantProperty extends EObject {
 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getEnd <em>End</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>End</em>' reference.

+	 *            the new value of the '<em>End</em>' reference.

 	 * @see #getEnd()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/PropertySpecificType.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/PropertySpecificType.java
index 82ad62a7624..6d1959b02e1 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/PropertySpecificType.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/PropertySpecificType.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Classifier;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Property Specific Type</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType#getBase_Classifier <em>Base Classifier</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getPropertySpecificType()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface PropertySpecificType extends EObject {
 	 * If the meaning of the '<em>Base Classifier</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Classifier</em>' reference.

 	 * @see #setBase_Classifier(Classifier)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getPropertySpecificType_Base_Classifier()

@@ -52,9 +52,9 @@ public interface PropertySpecificType extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType#getBase_Classifier <em>Base Classifier</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Classifier</em>' reference.

+	 *            the new value of the '<em>Base Classifier</em>' reference.

 	 * @see #getBase_Classifier()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Unit.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Unit.java
index fed4d775427..b2188b60077 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Unit.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Unit.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.uml2.uml.InstanceSpecification;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Unit</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -26,7 +26,7 @@ import org.eclipse.uml2.uml.InstanceSpecification;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.Unit#getDimension <em>Dimension</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getUnit()

  * @model

  * @generated

@@ -40,7 +40,7 @@ public interface Unit extends EObject {
 	 * If the meaning of the '<em>Base Instance Specification</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Instance Specification</em>' reference.

 	 * @see #setBase_InstanceSpecification(InstanceSpecification)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getUnit_Base_InstanceSpecification()

@@ -56,7 +56,7 @@ public interface Unit extends EObject {
 	 * If the meaning of the '<em>Dimension</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Dimension</em>' reference.

 	 * @see #setDimension(Dimension)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getUnit_Dimension()

@@ -70,9 +70,9 @@ public interface Unit extends EObject {
 	 * reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Instance Specification</em>' reference.

+	 *            the new value of the '<em>Base Instance Specification</em>' reference.

 	 * @see #getBase_InstanceSpecification()

 	 * @generated

 	 */

@@ -82,9 +82,9 @@ public interface Unit extends EObject {
 	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.blocks.Unit#getDimension

 	 * <em>Dimension</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Dimension</em>' reference.

+	 *            the new value of the '<em>Dimension</em>' reference.

 	 * @see #getDimension()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ValueType.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ValueType.java
index 1760ee0d4ce..aeaecc594da 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ValueType.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ValueType.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.uml2.uml.DataType;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Value Type</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -27,7 +27,7 @@ import org.eclipse.uml2.uml.DataType;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.ValueType#getDimension <em>Dimension</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getValueType()

  * @model

  * @generated

@@ -41,7 +41,7 @@ public interface ValueType extends EObject {
 	 * If the meaning of the '<em>Base Data Type</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Data Type</em>' reference.

 	 * @see #setBase_DataType(DataType)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getValueType_Base_DataType()

@@ -57,7 +57,7 @@ public interface ValueType extends EObject {
 	 * If the meaning of the '<em>Dimension</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Dimension</em>' reference.

 	 * @see #setDimension(Dimension)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getValueType_Dimension()

@@ -73,7 +73,7 @@ public interface ValueType extends EObject {
 	 * If the meaning of the '<em>Unit</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Unit</em>' reference.

 	 * @see #setUnit(Unit)

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getValueType_Unit()

@@ -86,9 +86,9 @@ public interface ValueType extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getBase_DataType <em>Base Data Type</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Data Type</em>' reference.

+	 *            the new value of the '<em>Base Data Type</em>' reference.

 	 * @see #getBase_DataType()

 	 * @generated

 	 */

@@ -98,9 +98,9 @@ public interface ValueType extends EObject {
 	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.blocks.ValueType#getDimension

 	 * <em>Dimension</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Dimension</em>' reference.

+	 *            the new value of the '<em>Dimension</em>' reference.

 	 * @see #getDimension()

 	 * @generated

 	 */

@@ -109,9 +109,9 @@ public interface ValueType extends EObject {
 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getUnit <em>Unit</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Unit</em>' reference.

+	 *            the new value of the '<em>Unit</em>' reference.

 	 * @see #getUnit()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BindingConnectorImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BindingConnectorImpl.java
index 99b4df720c0..52b19f83dad 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BindingConnectorImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BindingConnectorImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Connector;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BindingConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class BindingConnectorImpl extends MinimalEObjectImpl.Container implements BindingConnector {

@@ -39,7 +39,7 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 	 * The cached value of the '{@link #getBase_Connector() <em>Base Connector</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Connector()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected BindingConnectorImpl() {

@@ -57,7 +57,7 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Connector basicGetBase_Connector() {

@@ -66,15 +66,16 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR:

-			if(resolve)

+			if (resolve) {

 				return getBase_Connector();

+			}

 			return basicGetBase_Connector();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR:

 			return base_Connector != null;

 		}

@@ -96,14 +97,14 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR:

-			setBase_Connector((Connector)newValue);

+			setBase_Connector((Connector) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR:

-			setBase_Connector((Connector)null);

+			setBase_Connector((Connector) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Connector getBase_Connector() {

-		if(base_Connector != null && base_Connector.eIsProxy()) {

-			InternalEObject oldBase_Connector = (InternalEObject)base_Connector;

-			base_Connector = (Connector)eResolveProxy(oldBase_Connector);

-			if(base_Connector != oldBase_Connector) {

-				if(eNotificationRequired())

+		if (base_Connector != null && base_Connector.eIsProxy()) {

+			InternalEObject oldBase_Connector = (InternalEObject) base_Connector;

+			base_Connector = (Connector) eResolveProxy(oldBase_Connector);

+			if (base_Connector != oldBase_Connector) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));

+				}

 			}

 		}

 		return base_Connector;

@@ -153,14 +155,15 @@ public class BindingConnectorImpl extends MinimalEObjectImpl.Container implement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Connector(Connector newBase_Connector) {

 		Connector oldBase_Connector = base_Connector;

 		base_Connector = newBase_Connector;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));

+		}

 	}

 

 } // BindingConnectorImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlockImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlockImpl.java
index d8b046ecab6..5d8bf8c6844 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlockImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlockImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl#getBase_Class <em>Base Class</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class BlockImpl extends MinimalEObjectImpl.Container implements Block {

@@ -39,7 +39,7 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 	 * The default value of the '{@link #isEncapsulated() <em>Is Encapsulated</em>}' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #isEncapsulated()

 	 * @generated

 	 * @ordered

@@ -50,7 +50,7 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 	 * The cached value of the '{@link #isEncapsulated() <em>Is Encapsulated</em>}' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #isEncapsulated()

 	 * @generated

 	 * @ordered

@@ -60,7 +60,7 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 	/**

 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Class()

 	 * @generated

 	 * @ordered

@@ -69,7 +69,7 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected BlockImpl() {

@@ -78,7 +78,7 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

@@ -87,17 +87,18 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

 			return isEncapsulated();

 		case BlocksPackage.BLOCK__BASE_CLASS:

-			if(resolve)

+			if (resolve) {

 				return getBase_Class();

+			}

 			return basicGetBase_Class();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -105,12 +106,12 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

 			return isEncapsulated != IS_ENCAPSULATED_EDEFAULT;

 		case BlocksPackage.BLOCK__BASE_CLASS:

@@ -121,17 +122,17 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

-			setIsEncapsulated((Boolean)newValue);

+			setIsEncapsulated((Boolean) newValue);

 			return;

 		case BlocksPackage.BLOCK__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class)newValue);

+			setBase_Class((org.eclipse.uml2.uml.Class) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -139,7 +140,7 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -150,7 +151,7 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public boolean isEncapsulated() {

@@ -159,17 +160,17 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

 			setIsEncapsulated(IS_ENCAPSULATED_EDEFAULT);

 			return;

 		case BlocksPackage.BLOCK__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class)null);

+			setBase_Class((org.eclipse.uml2.uml.Class) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -177,16 +178,17 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class getBase_Class() {

-		if(base_Class != null && base_Class.eIsProxy()) {

-			InternalEObject oldBase_Class = (InternalEObject)base_Class;

-			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);

-			if(base_Class != oldBase_Class) {

-				if(eNotificationRequired())

+		if (base_Class != null && base_Class.eIsProxy()) {

+			InternalEObject oldBase_Class = (InternalEObject) base_Class;

+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);

+			if (base_Class != oldBase_Class) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.BLOCK__BASE_CLASS, oldBase_Class, base_Class));

+				}

 			}

 		}

 		return base_Class;

@@ -194,37 +196,40 @@ public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {

 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;

 		base_Class = newBase_Class;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.BLOCK__BASE_CLASS, oldBase_Class, base_Class));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setIsEncapsulated(boolean newIsEncapsulated) {

 		boolean oldIsEncapsulated = isEncapsulated;

 		isEncapsulated = newIsEncapsulated;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.BLOCK__IS_ENCAPSULATED, oldIsEncapsulated, isEncapsulated));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy())

+		if (eIsProxy()) {

 			return super.toString();

+		}

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (isEncapsulated: ");

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksFactoryImpl.java
index 3d6edf6d041..71cdc735789 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -34,14 +34,14 @@ import org.eclipse.papyrus.sysml.blocks.ValueType;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -54,13 +54,13 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static BlocksFactory init() {

 		try {

-			BlocksFactory theBlocksFactory = (BlocksFactory)EPackage.Registry.INSTANCE.getEFactory(BlocksPackage.eNS_URI);

-			if(theBlocksFactory != null) {

+			BlocksFactory theBlocksFactory = (BlocksFactory) EPackage.Registry.INSTANCE.getEFactory(BlocksPackage.eNS_URI);

+			if (theBlocksFactory != null) {

 				return theBlocksFactory;

 			}

 		} catch (Exception exception) {

@@ -73,7 +73,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BlocksFactoryImpl() {

@@ -82,12 +82,12 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		case BlocksPackage.BLOCK:

 			return createBlock();

 		case BlocksPackage.DISTRIBUTED_PROPERTY:

@@ -115,7 +115,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BindingConnector createBindingConnector() {

@@ -125,7 +125,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Block createBlock() {

@@ -135,7 +135,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConnectorProperty createConnectorProperty() {

@@ -145,7 +145,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Dimension createDimension() {

@@ -155,7 +155,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public DistributedProperty createDistributedProperty() {

@@ -165,7 +165,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NestedConnectorEnd createNestedConnectorEnd() {

@@ -175,7 +175,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ParticipantProperty createParticipantProperty() {

@@ -185,7 +185,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PropertySpecificType createPropertySpecificType() {

@@ -195,7 +195,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Unit createUnit() {

@@ -205,7 +205,7 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ValueType createValueType() {

@@ -215,11 +215,11 @@ public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BlocksPackage getBlocksPackage() {

-		return (BlocksPackage)getEPackage();

+		return (BlocksPackage) getEPackage();

 	}

 

 } // BlocksFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksPackageImpl.java
index ef1b80076b2..fb3f74fecdd 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -57,36 +57,36 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link BlocksPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead,

-	 * they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link BlocksPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static BlocksPackage init() {

-		if(isInited)

-			return (BlocksPackage)EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);

+		if (isInited) {

+			return (BlocksPackage) EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BlocksPackageImpl());

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BlocksPackageImpl());

 

 		isInited = true;

 

@@ -94,16 +94,25 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theBlocksPackage.createPackageContents();

@@ -142,84 +151,84 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass blockEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass distributedPropertyEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass dimensionEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass unitEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass valueTypeEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass nestedConnectorEndEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass participantPropertyEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass connectorPropertyEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass bindingConnectorEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass propertySpecificTypeEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -229,9 +238,8 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#eNS_URI

 	 * @see #init()

@@ -246,12 +254,13 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create classes and their features

@@ -295,7 +304,7 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getBindingConnector() {

@@ -304,16 +313,16 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getBindingConnector_Base_Connector() {

-		return (EReference)bindingConnectorEClass.getEStructuralFeatures().get(0);

+		return (EReference) bindingConnectorEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getBlock() {

@@ -322,34 +331,34 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getBlock_Base_Class() {

-		return (EReference)blockEClass.getEStructuralFeatures().get(1);

+		return (EReference) blockEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getBlock_IsEncapsulated() {

-		return (EAttribute)blockEClass.getEStructuralFeatures().get(0);

+		return (EAttribute) blockEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BlocksFactory getBlocksFactory() {

-		return (BlocksFactory)getEFactoryInstance();

+		return (BlocksFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getConnectorProperty() {

@@ -358,25 +367,25 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getConnectorProperty_Base_Property() {

-		return (EReference)connectorPropertyEClass.getEStructuralFeatures().get(0);

+		return (EReference) connectorPropertyEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getConnectorProperty_Connector() {

-		return (EReference)connectorPropertyEClass.getEStructuralFeatures().get(1);

+		return (EReference) connectorPropertyEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getDimension() {

@@ -385,16 +394,16 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getDimension_Base_InstanceSpecification() {

-		return (EReference)dimensionEClass.getEStructuralFeatures().get(0);

+		return (EReference) dimensionEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getDistributedProperty() {

@@ -403,16 +412,16 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getDistributedProperty_Base_Property() {

-		return (EReference)distributedPropertyEClass.getEStructuralFeatures().get(0);

+		return (EReference) distributedPropertyEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getNestedConnectorEnd() {

@@ -421,25 +430,25 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getNestedConnectorEnd_Base_ConnectorEnd() {

-		return (EReference)nestedConnectorEndEClass.getEStructuralFeatures().get(1);

+		return (EReference) nestedConnectorEndEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getNestedConnectorEnd_PropertyPath() {

-		return (EReference)nestedConnectorEndEClass.getEStructuralFeatures().get(0);

+		return (EReference) nestedConnectorEndEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getParticipantProperty() {

@@ -448,25 +457,25 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getParticipantProperty_Base_Property() {

-		return (EReference)participantPropertyEClass.getEStructuralFeatures().get(0);

+		return (EReference) participantPropertyEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getParticipantProperty_End() {

-		return (EReference)participantPropertyEClass.getEStructuralFeatures().get(1);

+		return (EReference) participantPropertyEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getPropertySpecificType() {

@@ -475,16 +484,16 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getPropertySpecificType_Base_Classifier() {

-		return (EReference)propertySpecificTypeEClass.getEStructuralFeatures().get(0);

+		return (EReference) propertySpecificTypeEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getUnit() {

@@ -493,25 +502,25 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getUnit_Base_InstanceSpecification() {

-		return (EReference)unitEClass.getEStructuralFeatures().get(0);

+		return (EReference) unitEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getUnit_Dimension() {

-		return (EReference)unitEClass.getEStructuralFeatures().get(1);

+		return (EReference) unitEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getValueType() {

@@ -520,41 +529,42 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getValueType_Base_DataType() {

-		return (EReference)valueTypeEClass.getEStructuralFeatures().get(0);

+		return (EReference) valueTypeEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getValueType_Dimension() {

-		return (EReference)valueTypeEClass.getEStructuralFeatures().get(2);

+		return (EReference) valueTypeEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getValueType_Unit() {

-		return (EReference)valueTypeEClass.getEStructuralFeatures().get(1);

+		return (EReference) valueTypeEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

@@ -563,8 +573,8 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 		setNsURI(eNS_URI);

 

 		// Obtain other dependent packages

-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		TypesPackage theTypesPackage = (TypesPackage) EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

 

 		// Create type parameters

 

@@ -578,37 +588,49 @@ public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {
 		initEReference(getBlock_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(distributedPropertyEClass, DistributedProperty.class, "DistributedProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getDistributedProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, DistributedProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getDistributedProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, DistributedProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(dimensionEClass, Dimension.class, "Dimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getDimension_Base_InstanceSpecification(), theUMLPackage.getInstanceSpecification(), null, "base_InstanceSpecification", null, 1, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getDimension_Base_InstanceSpecification(), theUMLPackage.getInstanceSpecification(), null, "base_InstanceSpecification", null, 1, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

+				!IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(unitEClass, Unit.class, "Unit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getUnit_Base_InstanceSpecification(), theUMLPackage.getInstanceSpecification(), null, "base_InstanceSpecification", null, 1, 1, Unit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getUnit_Base_InstanceSpecification(), theUMLPackage.getInstanceSpecification(), null, "base_InstanceSpecification", null, 1, 1, Unit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getUnit_Dimension(), this.getDimension(), null, "dimension", null, 0, 1, Unit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(valueTypeEClass, ValueType.class, "ValueType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getValueType_Base_DataType(), theUMLPackage.getDataType(), null, "base_DataType", null, 1, 1, ValueType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getValueType_Base_DataType(), theUMLPackage.getDataType(), null, "base_DataType", null, 1, 1, ValueType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 		initEReference(getValueType_Unit(), this.getUnit(), null, "unit", null, 0, 1, ValueType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getValueType_Dimension(), this.getDimension(), null, "dimension", null, 0, 1, ValueType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(nestedConnectorEndEClass, NestedConnectorEnd.class, "NestedConnectorEnd", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getNestedConnectorEnd_PropertyPath(), theUMLPackage.getProperty(), null, "propertyPath", null, 1, -1, NestedConnectorEnd.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getNestedConnectorEnd_Base_ConnectorEnd(), theUMLPackage.getConnectorEnd(), null, "base_ConnectorEnd", null, 1, 1, NestedConnectorEnd.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getNestedConnectorEnd_PropertyPath(), theUMLPackage.getProperty(), null, "propertyPath", null, 1, -1, NestedConnectorEnd.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, IS_ORDERED);

+		initEReference(getNestedConnectorEnd_Base_ConnectorEnd(), theUMLPackage.getConnectorEnd(), null, "base_ConnectorEnd", null, 1, 1, NestedConnectorEnd.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(participantPropertyEClass, ParticipantProperty.class, "ParticipantProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getParticipantProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ParticipantProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getParticipantProperty_End(), theUMLPackage.getProperty(), null, "end", null, 1, 1, ParticipantProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getParticipantProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ParticipantProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getParticipantProperty_End(), theUMLPackage.getProperty(), null, "end", null, 1, 1, ParticipantProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 

 		initEClass(connectorPropertyEClass, ConnectorProperty.class, "ConnectorProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConnectorProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ConnectorProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getConnectorProperty_Connector(), theUMLPackage.getConnector(), null, "connector", null, 1, 1, ConnectorProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getConnectorProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ConnectorProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

+		initEReference(getConnectorProperty_Connector(), theUMLPackage.getConnector(), null, "connector", null, 1, 1, ConnectorProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

 

 		initEClass(bindingConnectorEClass, BindingConnector.class, "BindingConnector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getBindingConnector_Base_Connector(), theUMLPackage.getConnector(), null, "base_Connector", null, 1, 1, BindingConnector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getBindingConnector_Base_Connector(), theUMLPackage.getConnector(), null, "base_Connector", null, 1, 1, BindingConnector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

 

 		initEClass(propertySpecificTypeEClass, PropertySpecificType.class, "PropertySpecificType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getPropertySpecificType_Base_Classifier(), theUMLPackage.getClassifier(), null, "base_Classifier", null, 1, 1, PropertySpecificType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getPropertySpecificType_Base_Classifier(), theUMLPackage.getClassifier(), null, "base_Classifier", null, 1, 1, PropertySpecificType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 	}

 

 } // BlocksPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ConnectorPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ConnectorPropertyImpl.java
index 9a6d5e815de..7dfd7ba0db9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ConnectorPropertyImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ConnectorPropertyImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -32,7 +32,7 @@ import org.eclipse.uml2.uml.Property;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl#getConnector <em>Connector</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implements ConnectorProperty {

@@ -41,7 +41,7 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Property()

 	 * @generated

 	 * @ordered

@@ -51,7 +51,7 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * The cached value of the '{@link #getConnector() <em>Connector</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getConnector()

 	 * @generated

 	 * @ordered

@@ -60,7 +60,7 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ConnectorPropertyImpl() {

@@ -69,7 +69,7 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property basicGetBase_Property() {

@@ -78,7 +78,7 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Connector basicGetConnector() {

@@ -87,19 +87,21 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY:

-			if(resolve)

+			if (resolve) {

 				return getBase_Property();

+			}

 			return basicGetBase_Property();

 		case BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR:

-			if(resolve)

+			if (resolve) {

 				return getConnector();

+			}

 			return basicGetConnector();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -107,12 +109,12 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY:

 			return base_Property != null;

 		case BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR:

@@ -123,17 +125,17 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)newValue);

+			setBase_Property((Property) newValue);

 			return;

 		case BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR:

-			setConnector((Connector)newValue);

+			setConnector((Connector) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -141,7 +143,7 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -151,17 +153,17 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)null);

+			setBase_Property((Property) null);

 			return;

 		case BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR:

-			setConnector((Connector)null);

+			setConnector((Connector) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -169,16 +171,17 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property getBase_Property() {

-		if(base_Property != null && base_Property.eIsProxy()) {

-			InternalEObject oldBase_Property = (InternalEObject)base_Property;

-			base_Property = (Property)eResolveProxy(oldBase_Property);

-			if(base_Property != oldBase_Property) {

-				if(eNotificationRequired())

+		if (base_Property != null && base_Property.eIsProxy()) {

+			InternalEObject oldBase_Property = (InternalEObject) base_Property;

+			base_Property = (Property) eResolveProxy(oldBase_Property);

+			if (base_Property != oldBase_Property) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+				}

 			}

 		}

 		return base_Property;

@@ -186,16 +189,17 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Connector getConnector() {

-		if(connector != null && connector.eIsProxy()) {

-			InternalEObject oldConnector = (InternalEObject)connector;

-			connector = (Connector)eResolveProxy(oldConnector);

-			if(connector != oldConnector) {

-				if(eNotificationRequired())

+		if (connector != null && connector.eIsProxy()) {

+			InternalEObject oldConnector = (InternalEObject) connector;

+			connector = (Connector) eResolveProxy(oldConnector);

+			if (connector != oldConnector) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR, oldConnector, connector));

+				}

 			}

 		}

 		return connector;

@@ -203,26 +207,28 @@ public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Property(Property newBase_Property) {

 		Property oldBase_Property = base_Property;

 		base_Property = newBase_Property;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setConnector(Connector newConnector) {

 		Connector oldConnector = connector;

 		connector = newConnector;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR, oldConnector, connector));

+		}

 	}

 

 } // ConnectorPropertyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DimensionImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DimensionImpl.java
index 2222a37cb05..a4a5a84cf33 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DimensionImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DimensionImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.InstanceSpecification;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl#getBase_InstanceSpecification <em>Base Instance Specification</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimension {

@@ -39,7 +39,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 	 * The cached value of the '{@link #getBase_InstanceSpecification() <em>Base Instance Specification</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_InstanceSpecification()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected DimensionImpl() {

@@ -57,7 +57,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InstanceSpecification basicGetBase_InstanceSpecification() {

@@ -66,15 +66,16 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION:

-			if(resolve)

+			if (resolve) {

 				return getBase_InstanceSpecification();

+			}

 			return basicGetBase_InstanceSpecification();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION:

 			return base_InstanceSpecification != null;

 		}

@@ -96,14 +97,14 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION:

-			setBase_InstanceSpecification((InstanceSpecification)newValue);

+			setBase_InstanceSpecification((InstanceSpecification) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION:

-			setBase_InstanceSpecification((InstanceSpecification)null);

+			setBase_InstanceSpecification((InstanceSpecification) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InstanceSpecification getBase_InstanceSpecification() {

-		if(base_InstanceSpecification != null && base_InstanceSpecification.eIsProxy()) {

-			InternalEObject oldBase_InstanceSpecification = (InternalEObject)base_InstanceSpecification;

-			base_InstanceSpecification = (InstanceSpecification)eResolveProxy(oldBase_InstanceSpecification);

-			if(base_InstanceSpecification != oldBase_InstanceSpecification) {

-				if(eNotificationRequired())

+		if (base_InstanceSpecification != null && base_InstanceSpecification.eIsProxy()) {

+			InternalEObject oldBase_InstanceSpecification = (InternalEObject) base_InstanceSpecification;

+			base_InstanceSpecification = (InstanceSpecification) eResolveProxy(oldBase_InstanceSpecification);

+			if (base_InstanceSpecification != oldBase_InstanceSpecification) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION, oldBase_InstanceSpecification, base_InstanceSpecification));

+				}

 			}

 		}

 		return base_InstanceSpecification;

@@ -153,14 +155,15 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_InstanceSpecification(InstanceSpecification newBase_InstanceSpecification) {

 		InstanceSpecification oldBase_InstanceSpecification = base_InstanceSpecification;

 		base_InstanceSpecification = newBase_InstanceSpecification;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION, oldBase_InstanceSpecification, base_InstanceSpecification));

+		}

 	}

 

 } // DimensionImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DistributedPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DistributedPropertyImpl.java
index b7da9b7ba73..249b81bf907 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DistributedPropertyImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DistributedPropertyImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Property;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.DistributedPropertyImpl#getBase_Property <em>Base Property</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implements DistributedProperty {

@@ -39,7 +39,7 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Property()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected DistributedPropertyImpl() {

@@ -57,7 +57,7 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property basicGetBase_Property() {

@@ -66,15 +66,16 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY:

-			if(resolve)

+			if (resolve) {

 				return getBase_Property();

+			}

 			return basicGetBase_Property();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY:

 			return base_Property != null;

 		}

@@ -96,14 +97,14 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)newValue);

+			setBase_Property((Property) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)null);

+			setBase_Property((Property) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property getBase_Property() {

-		if(base_Property != null && base_Property.eIsProxy()) {

-			InternalEObject oldBase_Property = (InternalEObject)base_Property;

-			base_Property = (Property)eResolveProxy(oldBase_Property);

-			if(base_Property != oldBase_Property) {

-				if(eNotificationRequired())

+		if (base_Property != null && base_Property.eIsProxy()) {

+			InternalEObject oldBase_Property = (InternalEObject) base_Property;

+			base_Property = (Property) eResolveProxy(oldBase_Property);

+			if (base_Property != oldBase_Property) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+				}

 			}

 		}

 		return base_Property;

@@ -153,14 +155,15 @@ public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Property(Property newBase_Property) {

 		Property oldBase_Property = base_Property;

 		base_Property = newBase_Property;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+		}

 	}

 

 } // DistributedPropertyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/NestedConnectorEndImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/NestedConnectorEndImpl.java
index a22c9087f6a..45d4f71aadf 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/NestedConnectorEndImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/NestedConnectorEndImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.uml2.uml.Type;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl#getBase_ConnectorEnd <em>Base Connector End</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container implements NestedConnectorEnd {

@@ -45,7 +45,7 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 	 * The cached value of the '{@link #getPropertyPath() <em>Property Path</em>}' reference list.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getPropertyPath()

 	 * @generated

 	 * @ordered

@@ -56,7 +56,7 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 	 * The cached value of the '{@link #getBase_ConnectorEnd() <em>Base Connector End</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_ConnectorEnd()

 	 * @generated

 	 * @ordered

@@ -65,7 +65,7 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected NestedConnectorEndImpl() {

@@ -74,7 +74,7 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConnectorEnd basicGetBase_ConnectorEnd() {

@@ -83,17 +83,18 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH:

 			return getPropertyPath();

 		case BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END:

-			if(resolve)

+			if (resolve) {

 				return getBase_ConnectorEnd();

+			}

 			return basicGetBase_ConnectorEnd();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -101,12 +102,12 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH:

 			return propertyPath != null && !propertyPath.isEmpty();

 		case BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END:

@@ -117,19 +118,19 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH:

 			getPropertyPath().clear();

-			getPropertyPath().addAll((Collection<? extends Property>)newValue);

+			getPropertyPath().addAll((Collection<? extends Property>) newValue);

 			return;

 		case BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END:

-			setBase_ConnectorEnd((ConnectorEnd)newValue);

+			setBase_ConnectorEnd((ConnectorEnd) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -137,7 +138,7 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -147,17 +148,17 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH:

 			getPropertyPath().clear();

 			return;

 		case BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END:

-			setBase_ConnectorEnd((ConnectorEnd)null);

+			setBase_ConnectorEnd((ConnectorEnd) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -165,16 +166,17 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConnectorEnd getBase_ConnectorEnd() {

-		if(base_ConnectorEnd != null && base_ConnectorEnd.eIsProxy()) {

-			InternalEObject oldBase_ConnectorEnd = (InternalEObject)base_ConnectorEnd;

-			base_ConnectorEnd = (ConnectorEnd)eResolveProxy(oldBase_ConnectorEnd);

-			if(base_ConnectorEnd != oldBase_ConnectorEnd) {

-				if(eNotificationRequired())

+		if (base_ConnectorEnd != null && base_ConnectorEnd.eIsProxy()) {

+			InternalEObject oldBase_ConnectorEnd = (InternalEObject) base_ConnectorEnd;

+			base_ConnectorEnd = (ConnectorEnd) eResolveProxy(oldBase_ConnectorEnd);

+			if (base_ConnectorEnd != oldBase_ConnectorEnd) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END, oldBase_ConnectorEnd, base_ConnectorEnd));

+				}

 			}

 		}

 		return base_ConnectorEnd;

@@ -182,11 +184,11 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EList<Property> getPropertyPath() {

-		if(propertyPath == null) {

+		if (propertyPath == null) {

 			propertyPath = new EObjectResolvingEList<Property>(Property.class, this, BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH);

 		}

 		return propertyPath;

@@ -195,7 +197,7 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property getPropertyPath(String name, Type type) {

@@ -205,17 +207,20 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property getPropertyPath(String name, Type type, boolean ignoreCase, EClass eClass) {

-		propertyPathLoop: for(Property propertyPath : getPropertyPath()) {

-			if(eClass != null && !eClass.isInstance(propertyPath))

+		propertyPathLoop: for (Property propertyPath : getPropertyPath()) {

+			if (eClass != null && !eClass.isInstance(propertyPath)) {

 				continue propertyPathLoop;

-			if(name != null && !(ignoreCase ? name.equalsIgnoreCase(propertyPath.getName()) : name.equals(propertyPath.getName())))

+			}

+			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(propertyPath.getName()) : name.equals(propertyPath.getName()))) {

 				continue propertyPathLoop;

-			if(type != null && !type.equals(propertyPath.getType()))

+			}

+			if (type != null && !type.equals(propertyPath.getType())) {

 				continue propertyPathLoop;

+			}

 			return propertyPath;

 		}

 		return null;

@@ -223,14 +228,15 @@ public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_ConnectorEnd(ConnectorEnd newBase_ConnectorEnd) {

 		ConnectorEnd oldBase_ConnectorEnd = base_ConnectorEnd;

 		base_ConnectorEnd = newBase_ConnectorEnd;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END, oldBase_ConnectorEnd, base_ConnectorEnd));

+		}

 	}

 

 } // NestedConnectorEndImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ParticipantPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ParticipantPropertyImpl.java
index 042598360d7..7301290b477 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ParticipantPropertyImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ParticipantPropertyImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -31,7 +31,7 @@ import org.eclipse.uml2.uml.Property;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ParticipantPropertyImpl#getEnd <em>End</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implements ParticipantProperty {

@@ -40,7 +40,7 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Property()

 	 * @generated

 	 * @ordered

@@ -50,7 +50,7 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 	/**

 	 * The cached value of the '{@link #getEnd() <em>End</em>}' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getEnd()

 	 * @generated

 	 * @ordered

@@ -59,7 +59,7 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ParticipantPropertyImpl() {

@@ -68,7 +68,7 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property basicGetBase_Property() {

@@ -77,7 +77,7 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property basicGetEnd() {

@@ -86,19 +86,21 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY:

-			if(resolve)

+			if (resolve) {

 				return getBase_Property();

+			}

 			return basicGetBase_Property();

 		case BlocksPackage.PARTICIPANT_PROPERTY__END:

-			if(resolve)

+			if (resolve) {

 				return getEnd();

+			}

 			return basicGetEnd();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -106,12 +108,12 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY:

 			return base_Property != null;

 		case BlocksPackage.PARTICIPANT_PROPERTY__END:

@@ -122,17 +124,17 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)newValue);

+			setBase_Property((Property) newValue);

 			return;

 		case BlocksPackage.PARTICIPANT_PROPERTY__END:

-			setEnd((Property)newValue);

+			setEnd((Property) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -140,7 +142,7 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -150,17 +152,17 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)null);

+			setBase_Property((Property) null);

 			return;

 		case BlocksPackage.PARTICIPANT_PROPERTY__END:

-			setEnd((Property)null);

+			setEnd((Property) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -168,16 +170,17 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property getBase_Property() {

-		if(base_Property != null && base_Property.eIsProxy()) {

-			InternalEObject oldBase_Property = (InternalEObject)base_Property;

-			base_Property = (Property)eResolveProxy(oldBase_Property);

-			if(base_Property != oldBase_Property) {

-				if(eNotificationRequired())

+		if (base_Property != null && base_Property.eIsProxy()) {

+			InternalEObject oldBase_Property = (InternalEObject) base_Property;

+			base_Property = (Property) eResolveProxy(oldBase_Property);

+			if (base_Property != oldBase_Property) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+				}

 			}

 		}

 		return base_Property;

@@ -185,16 +188,17 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property getEnd() {

-		if(end != null && end.eIsProxy()) {

-			InternalEObject oldEnd = (InternalEObject)end;

-			end = (Property)eResolveProxy(oldEnd);

-			if(end != oldEnd) {

-				if(eNotificationRequired())

+		if (end != null && end.eIsProxy()) {

+			InternalEObject oldEnd = (InternalEObject) end;

+			end = (Property) eResolveProxy(oldEnd);

+			if (end != oldEnd) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.PARTICIPANT_PROPERTY__END, oldEnd, end));

+				}

 			}

 		}

 		return end;

@@ -202,26 +206,28 @@ public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Property(Property newBase_Property) {

 		Property oldBase_Property = base_Property;

 		base_Property = newBase_Property;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setEnd(Property newEnd) {

 		Property oldEnd = end;

 		end = newEnd;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.PARTICIPANT_PROPERTY__END, oldEnd, end));

+		}

 	}

 

 } // ParticipantPropertyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/PropertySpecificTypeImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/PropertySpecificTypeImpl.java
index 0f993f80b9f..b8d9adb4683 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/PropertySpecificTypeImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/PropertySpecificTypeImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Classifier;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.PropertySpecificTypeImpl#getBase_Classifier <em>Base Classifier</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container implements PropertySpecificType {

@@ -39,7 +39,7 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 	 * The cached value of the '{@link #getBase_Classifier() <em>Base Classifier</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Classifier()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected PropertySpecificTypeImpl() {

@@ -57,7 +57,7 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Classifier basicGetBase_Classifier() {

@@ -66,15 +66,16 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER:

-			if(resolve)

+			if (resolve) {

 				return getBase_Classifier();

+			}

 			return basicGetBase_Classifier();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER:

 			return base_Classifier != null;

 		}

@@ -96,14 +97,14 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER:

-			setBase_Classifier((Classifier)newValue);

+			setBase_Classifier((Classifier) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER:

-			setBase_Classifier((Classifier)null);

+			setBase_Classifier((Classifier) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Classifier getBase_Classifier() {

-		if(base_Classifier != null && base_Classifier.eIsProxy()) {

-			InternalEObject oldBase_Classifier = (InternalEObject)base_Classifier;

-			base_Classifier = (Classifier)eResolveProxy(oldBase_Classifier);

-			if(base_Classifier != oldBase_Classifier) {

-				if(eNotificationRequired())

+		if (base_Classifier != null && base_Classifier.eIsProxy()) {

+			InternalEObject oldBase_Classifier = (InternalEObject) base_Classifier;

+			base_Classifier = (Classifier) eResolveProxy(oldBase_Classifier);

+			if (base_Classifier != oldBase_Classifier) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER, oldBase_Classifier, base_Classifier));

+				}

 			}

 		}

 		return base_Classifier;

@@ -153,14 +155,15 @@ public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container imple
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Classifier(Classifier newBase_Classifier) {

 		Classifier oldBase_Classifier = base_Classifier;

 		base_Classifier = newBase_Classifier;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER, oldBase_Classifier, base_Classifier));

+		}

 	}

 

 } // PropertySpecificTypeImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/UnitImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/UnitImpl.java
index aea627046b7..71961f77080 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/UnitImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/UnitImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -32,7 +32,7 @@ import org.eclipse.uml2.uml.InstanceSpecification;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl#getDimension <em>Dimension</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {

@@ -41,7 +41,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 	 * The cached value of the '{@link #getBase_InstanceSpecification() <em>Base Instance Specification</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_InstanceSpecification()

 	 * @generated

 	 * @ordered

@@ -51,7 +51,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 	/**

 	 * The cached value of the '{@link #getDimension() <em>Dimension</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getDimension()

 	 * @generated

 	 * @ordered

@@ -60,7 +60,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected UnitImpl() {

@@ -69,7 +69,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InstanceSpecification basicGetBase_InstanceSpecification() {

@@ -78,7 +78,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Dimension basicGetDimension() {

@@ -87,19 +87,21 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION:

-			if(resolve)

+			if (resolve) {

 				return getBase_InstanceSpecification();

+			}

 			return basicGetBase_InstanceSpecification();

 		case BlocksPackage.UNIT__DIMENSION:

-			if(resolve)

+			if (resolve) {

 				return getDimension();

+			}

 			return basicGetDimension();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -107,12 +109,12 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION:

 			return base_InstanceSpecification != null;

 		case BlocksPackage.UNIT__DIMENSION:

@@ -123,17 +125,17 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION:

-			setBase_InstanceSpecification((InstanceSpecification)newValue);

+			setBase_InstanceSpecification((InstanceSpecification) newValue);

 			return;

 		case BlocksPackage.UNIT__DIMENSION:

-			setDimension((Dimension)newValue);

+			setDimension((Dimension) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -141,7 +143,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -151,17 +153,17 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION:

-			setBase_InstanceSpecification((InstanceSpecification)null);

+			setBase_InstanceSpecification((InstanceSpecification) null);

 			return;

 		case BlocksPackage.UNIT__DIMENSION:

-			setDimension((Dimension)null);

+			setDimension((Dimension) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -169,16 +171,17 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InstanceSpecification getBase_InstanceSpecification() {

-		if(base_InstanceSpecification != null && base_InstanceSpecification.eIsProxy()) {

-			InternalEObject oldBase_InstanceSpecification = (InternalEObject)base_InstanceSpecification;

-			base_InstanceSpecification = (InstanceSpecification)eResolveProxy(oldBase_InstanceSpecification);

-			if(base_InstanceSpecification != oldBase_InstanceSpecification) {

-				if(eNotificationRequired())

+		if (base_InstanceSpecification != null && base_InstanceSpecification.eIsProxy()) {

+			InternalEObject oldBase_InstanceSpecification = (InternalEObject) base_InstanceSpecification;

+			base_InstanceSpecification = (InstanceSpecification) eResolveProxy(oldBase_InstanceSpecification);

+			if (base_InstanceSpecification != oldBase_InstanceSpecification) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION, oldBase_InstanceSpecification, base_InstanceSpecification));

+				}

 			}

 		}

 		return base_InstanceSpecification;

@@ -186,16 +189,17 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Dimension getDimension() {

-		if(dimension != null && dimension.eIsProxy()) {

-			InternalEObject oldDimension = (InternalEObject)dimension;

-			dimension = (Dimension)eResolveProxy(oldDimension);

-			if(dimension != oldDimension) {

-				if(eNotificationRequired())

+		if (dimension != null && dimension.eIsProxy()) {

+			InternalEObject oldDimension = (InternalEObject) dimension;

+			dimension = (Dimension) eResolveProxy(oldDimension);

+			if (dimension != oldDimension) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.UNIT__DIMENSION, oldDimension, dimension));

+				}

 			}

 		}

 		return dimension;

@@ -203,26 +207,28 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_InstanceSpecification(InstanceSpecification newBase_InstanceSpecification) {

 		InstanceSpecification oldBase_InstanceSpecification = base_InstanceSpecification;

 		base_InstanceSpecification = newBase_InstanceSpecification;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION, oldBase_InstanceSpecification, base_InstanceSpecification));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setDimension(Dimension newDimension) {

 		Dimension oldDimension = dimension;

 		dimension = newDimension;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.UNIT__DIMENSION, oldDimension, dimension));

+		}

 	}

 

 } // UnitImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ValueTypeImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ValueTypeImpl.java
index a0419b89f89..4843cab3122 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ValueTypeImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ValueTypeImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -34,7 +34,7 @@ import org.eclipse.uml2.uml.DataType;
  * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl#getDimension <em>Dimension</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ValueTypeImpl extends MinimalEObjectImpl.Container implements ValueType {

@@ -43,7 +43,7 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 	 * The cached value of the '{@link #getBase_DataType() <em>Base Data Type</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_DataType()

 	 * @generated

 	 * @ordered

@@ -53,7 +53,7 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 	/**

 	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getUnit()

 	 * @generated

 	 * @ordered

@@ -63,7 +63,7 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 	/**

 	 * The cached value of the '{@link #getDimension() <em>Dimension</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getDimension()

 	 * @generated

 	 * @ordered

@@ -72,7 +72,7 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ValueTypeImpl() {

@@ -81,7 +81,7 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public DataType basicGetBase_DataType() {

@@ -90,7 +90,7 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Dimension basicGetDimension() {

@@ -99,7 +99,7 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Unit basicGetUnit() {

@@ -108,23 +108,26 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE:

-			if(resolve)

+			if (resolve) {

 				return getBase_DataType();

+			}

 			return basicGetBase_DataType();

 		case BlocksPackage.VALUE_TYPE__UNIT:

-			if(resolve)

+			if (resolve) {

 				return getUnit();

+			}

 			return basicGetUnit();

 		case BlocksPackage.VALUE_TYPE__DIMENSION:

-			if(resolve)

+			if (resolve) {

 				return getDimension();

+			}

 			return basicGetDimension();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -132,12 +135,12 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE:

 			return base_DataType != null;

 		case BlocksPackage.VALUE_TYPE__UNIT:

@@ -150,20 +153,20 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE:

-			setBase_DataType((DataType)newValue);

+			setBase_DataType((DataType) newValue);

 			return;

 		case BlocksPackage.VALUE_TYPE__UNIT:

-			setUnit((Unit)newValue);

+			setUnit((Unit) newValue);

 			return;

 		case BlocksPackage.VALUE_TYPE__DIMENSION:

-			setDimension((Dimension)newValue);

+			setDimension((Dimension) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -171,7 +174,7 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -181,20 +184,20 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE:

-			setBase_DataType((DataType)null);

+			setBase_DataType((DataType) null);

 			return;

 		case BlocksPackage.VALUE_TYPE__UNIT:

-			setUnit((Unit)null);

+			setUnit((Unit) null);

 			return;

 		case BlocksPackage.VALUE_TYPE__DIMENSION:

-			setDimension((Dimension)null);

+			setDimension((Dimension) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -202,16 +205,17 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public DataType getBase_DataType() {

-		if(base_DataType != null && base_DataType.eIsProxy()) {

-			InternalEObject oldBase_DataType = (InternalEObject)base_DataType;

-			base_DataType = (DataType)eResolveProxy(oldBase_DataType);

-			if(base_DataType != oldBase_DataType) {

-				if(eNotificationRequired())

+		if (base_DataType != null && base_DataType.eIsProxy()) {

+			InternalEObject oldBase_DataType = (InternalEObject) base_DataType;

+			base_DataType = (DataType) eResolveProxy(oldBase_DataType);

+			if (base_DataType != oldBase_DataType) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE, oldBase_DataType, base_DataType));

+				}

 			}

 		}

 		return base_DataType;

@@ -219,16 +223,17 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Dimension getDimension() {

-		if(dimension != null && dimension.eIsProxy()) {

-			InternalEObject oldDimension = (InternalEObject)dimension;

-			dimension = (Dimension)eResolveProxy(oldDimension);

-			if(dimension != oldDimension) {

-				if(eNotificationRequired())

+		if (dimension != null && dimension.eIsProxy()) {

+			InternalEObject oldDimension = (InternalEObject) dimension;

+			dimension = (Dimension) eResolveProxy(oldDimension);

+			if (dimension != oldDimension) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.VALUE_TYPE__DIMENSION, oldDimension, dimension));

+				}

 			}

 		}

 		return dimension;

@@ -236,16 +241,17 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Unit getUnit() {

-		if(unit != null && unit.eIsProxy()) {

-			InternalEObject oldUnit = (InternalEObject)unit;

-			unit = (Unit)eResolveProxy(oldUnit);

-			if(unit != oldUnit) {

-				if(eNotificationRequired())

+		if (unit != null && unit.eIsProxy()) {

+			InternalEObject oldUnit = (InternalEObject) unit;

+			unit = (Unit) eResolveProxy(oldUnit);

+			if (unit != oldUnit) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.VALUE_TYPE__UNIT, oldUnit, unit));

+				}

 			}

 		}

 		return unit;

@@ -253,38 +259,41 @@ public class ValueTypeImpl extends MinimalEObjectImpl.Container implements Value
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_DataType(DataType newBase_DataType) {

 		DataType oldBase_DataType = base_DataType;

 		base_DataType = newBase_DataType;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE, oldBase_DataType, base_DataType));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setDimension(Dimension newDimension) {

 		Dimension oldDimension = dimension;

 		dimension = newDimension;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.VALUE_TYPE__DIMENSION, oldDimension, dimension));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setUnit(Unit newUnit) {

 		Unit oldUnit = unit;

 		unit = newUnit;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.VALUE_TYPE__UNIT, oldUnit, unit));

+		}

 	}

 

 } // ValueTypeImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksAdapterFactory.java
index fce41dd0bb9..6ae8cdf0bc0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.sysml.blocks.ValueType;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides

  * an adapter <code>createXXX</code> method for each class of the model. <!--

  * end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage

  * @generated

  */

@@ -42,7 +42,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static BlocksPackage modelPackage;

@@ -50,7 +50,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The switch that delegates to the <code>createXXX</code> methods. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected BlocksSwitch<Adapter> modelSwitch = new BlocksSwitch<Adapter>() {

@@ -115,11 +115,11 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BlocksAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = BlocksPackage.eINSTANCE;

 		}

 	}

@@ -128,15 +128,15 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param target

-	 *        the object to adapt.

+	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

 	@Override

 	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

+		return modelSwitch.doSwitch((EObject) target);

 	}

 

 	/**

@@ -145,7 +145,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.BindingConnector

 	 * @generated

@@ -159,7 +159,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * begin-user-doc --> This default implementation returns null so that we

 	 * can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.Block

 	 * @generated

@@ -174,7 +174,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.ConnectorProperty

 	 * @generated

@@ -188,7 +188,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.Dimension

 	 * @generated

@@ -203,7 +203,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.DistributedProperty

 	 * @generated

@@ -216,7 +216,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This

 	 * default implementation returns null. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -230,7 +230,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd

 	 * @generated

@@ -245,7 +245,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.ParticipantProperty

 	 * @generated

@@ -260,7 +260,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.PropertySpecificType

 	 * @generated

@@ -274,7 +274,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * begin-user-doc --> This default implementation returns null so that we

 	 * can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.Unit

 	 * @generated

@@ -288,7 +288,7 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.ValueType

 	 * @generated

@@ -302,17 +302,17 @@ public class BlocksAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if

 	 * the object is either the model's package or is an instance object of the

 	 * model. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

 	}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceFactoryImpl.java
index 47e0371f3e3..5a962900af0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.util.BlocksResourceImpl

  * @generated

  */

@@ -31,7 +31,7 @@ public class BlocksResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BlocksResourceFactoryImpl() {

@@ -42,7 +42,7 @@ public class BlocksResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceImpl.java
index c8345f8ec1f..87abe63419f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.util.BlocksResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class BlocksResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public BlocksResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksSwitch.java
index 42a4d1f0d6a..156cdb357f5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksSwitch.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksSwitch.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -34,7 +34,7 @@ import org.eclipse.papyrus.sysml.blocks.ValueType;
  * starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the

  * result of the switch. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage

  * @generated

  */

@@ -43,7 +43,7 @@ public class BlocksSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static BlocksPackage modelPackage;

@@ -52,11 +52,11 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BlocksSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = BlocksPackage.eINSTANCE;

 		}

 	}

@@ -64,7 +64,7 @@ public class BlocksSwitch<T> extends Switch<T> {
 	/**

 	 * Checks whether this is a switch for the given package. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -79,9 +79,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation

 	 * returns null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Binding Connector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -95,9 +95,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Block</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -111,9 +111,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation

 	 * returns null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Connector Property</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -127,9 +127,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Dimension</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -143,9 +143,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This

 	 * implementation returns null; returning a non-null result will terminate

 	 * the switch. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Distributed Property</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -159,9 +159,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This

 	 * implementation returns null; returning a non-null result will terminate

 	 * the switch. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Nested Connector End</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -175,9 +175,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This

 	 * implementation returns null; returning a non-null result will terminate

 	 * the switch. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Participant Property</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -191,9 +191,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This

 	 * implementation returns null; returning a non-null result will terminate

 	 * the switch. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Property Specific Type</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -206,9 +206,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of ' <em>Unit</em>'. <!-- begin-user-doc --> This implementation returns null;

 	 * returning a non-null result will terminate the switch. <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of ' <em>Unit</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -222,9 +222,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Value Type</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -238,9 +238,9 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch, but this is

 	 * the last case anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -254,91 +254,91 @@ public class BlocksSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case BlocksPackage.BLOCK:

-		{

-			Block block = (Block)theEObject;

+		switch (classifierID) {

+		case BlocksPackage.BLOCK: {

+			Block block = (Block) theEObject;

 			T result = caseBlock(block);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case BlocksPackage.DISTRIBUTED_PROPERTY:

-		{

-			DistributedProperty distributedProperty = (DistributedProperty)theEObject;

+		case BlocksPackage.DISTRIBUTED_PROPERTY: {

+			DistributedProperty distributedProperty = (DistributedProperty) theEObject;

 			T result = caseDistributedProperty(distributedProperty);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case BlocksPackage.DIMENSION:

-		{

-			Dimension dimension = (Dimension)theEObject;

+		case BlocksPackage.DIMENSION: {

+			Dimension dimension = (Dimension) theEObject;

 			T result = caseDimension(dimension);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case BlocksPackage.UNIT:

-		{

-			Unit unit = (Unit)theEObject;

+		case BlocksPackage.UNIT: {

+			Unit unit = (Unit) theEObject;

 			T result = caseUnit(unit);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case BlocksPackage.VALUE_TYPE:

-		{

-			ValueType valueType = (ValueType)theEObject;

+		case BlocksPackage.VALUE_TYPE: {

+			ValueType valueType = (ValueType) theEObject;

 			T result = caseValueType(valueType);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case BlocksPackage.NESTED_CONNECTOR_END:

-		{

-			NestedConnectorEnd nestedConnectorEnd = (NestedConnectorEnd)theEObject;

+		case BlocksPackage.NESTED_CONNECTOR_END: {

+			NestedConnectorEnd nestedConnectorEnd = (NestedConnectorEnd) theEObject;

 			T result = caseNestedConnectorEnd(nestedConnectorEnd);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case BlocksPackage.PARTICIPANT_PROPERTY:

-		{

-			ParticipantProperty participantProperty = (ParticipantProperty)theEObject;

+		case BlocksPackage.PARTICIPANT_PROPERTY: {

+			ParticipantProperty participantProperty = (ParticipantProperty) theEObject;

 			T result = caseParticipantProperty(participantProperty);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case BlocksPackage.CONNECTOR_PROPERTY:

-		{

-			ConnectorProperty connectorProperty = (ConnectorProperty)theEObject;

+		case BlocksPackage.CONNECTOR_PROPERTY: {

+			ConnectorProperty connectorProperty = (ConnectorProperty) theEObject;

 			T result = caseConnectorProperty(connectorProperty);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case BlocksPackage.BINDING_CONNECTOR:

-		{

-			BindingConnector bindingConnector = (BindingConnector)theEObject;

+		case BlocksPackage.BINDING_CONNECTOR: {

+			BindingConnector bindingConnector = (BindingConnector) theEObject;

 			T result = caseBindingConnector(bindingConnector);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case BlocksPackage.PROPERTY_SPECIFIC_TYPE:

-		{

-			PropertySpecificType propertySpecificType = (PropertySpecificType)theEObject;

+		case BlocksPackage.PROPERTY_SPECIFIC_TYPE: {

+			PropertySpecificType propertySpecificType = (PropertySpecificType) theEObject;

 			T result = casePropertySpecificType(propertySpecificType);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

 		default:

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksXMLProcessor.java
index 4d0672a5ad0..eb30b3fa200 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class BlocksXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class BlocksXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public BlocksXMLProcessor() {

@@ -43,12 +43,12 @@ public class BlocksXMLProcessor extends XMLProcessor {
 	/**

 	 * Register for "*" and "xml" file extensions the BlocksResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new BlocksResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new BlocksResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintBlock.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintBlock.java
index 22cdf1639da..d9c75fac405 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintBlock.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintBlock.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -17,8 +17,8 @@ import org.eclipse.papyrus.sysml.blocks.Block;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Constraint Block</b></em>'. <!-- end-user-doc -->

- * 

- * 

+ *

+ *

  * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage#getConstraintBlock()

  * @model

  * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintProperty.java
index 4a121dc3c72..350d0190078 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintProperty.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintProperty.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Property;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Constraint Property</b></em> '. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty#getBase_Property <em>Base Property</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage#getConstraintProperty()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface ConstraintProperty extends EObject {
 	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Property</em>' reference.

 	 * @see #setBase_Property(Property)

 	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage#getConstraintProperty_Base_Property()

@@ -52,9 +52,9 @@ public interface ConstraintProperty extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty#getBase_Property <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Property</em>' reference.

+	 *            the new value of the '<em>Base Property</em>' reference.

 	 * @see #getBase_Property()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsFactory.java
index a3a05aea711..73abc20d691 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface ConstraintsFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	ConstraintsFactory eINSTANCE = org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsFactoryImpl.init();

@@ -36,7 +36,7 @@ public interface ConstraintsFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Constraint Block</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Constraint Block</em>'.

 	 * @generated

 	 */

@@ -45,7 +45,7 @@ public interface ConstraintsFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Constraint Property</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Constraint Property</em>'.

 	 * @generated

 	 */

@@ -55,7 +55,7 @@ public interface ConstraintsFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsPackage.java
index 261c4f090c6..4691bc26b0b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -28,7 +28,7 @@ import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.constraints.ConstraintsFactory

  * @model kind="package"

  * @generated

@@ -45,7 +45,7 @@ public interface ConstraintsPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -55,7 +55,7 @@ public interface ConstraintsPackage extends EPackage {
 		 * class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintBlockImpl

 		 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl#getConstraintBlock()

 		 * @generated

@@ -67,7 +67,7 @@ public interface ConstraintsPackage extends EPackage {
 		 * <em>Constraint Property</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintPropertyImpl

 		 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl#getConstraintProperty()

 		 * @generated

@@ -77,7 +77,7 @@ public interface ConstraintsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference CONSTRAINT_PROPERTY__BASE_PROPERTY = eINSTANCE.getConstraintProperty_Base_Property();

@@ -87,7 +87,7 @@ public interface ConstraintsPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "constraints";

@@ -95,7 +95,7 @@ public interface ConstraintsPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints";

@@ -103,7 +103,7 @@ public interface ConstraintsPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "Constraints";

@@ -112,7 +112,7 @@ public interface ConstraintsPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	ConstraintsPackage eINSTANCE = org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl.init();

@@ -121,7 +121,7 @@ public interface ConstraintsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintBlockImpl <em>Constraint Block</em>}' class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintBlockImpl

 	 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl#getConstraintBlock()

 	 * @generated

@@ -131,7 +131,7 @@ public interface ConstraintsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -140,7 +140,7 @@ public interface ConstraintsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Class</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -149,7 +149,7 @@ public interface ConstraintsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Constraint Block</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -159,7 +159,7 @@ public interface ConstraintsPackage extends EPackage {
 	 * The number of operations of the '<em>Constraint Block</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -170,7 +170,7 @@ public interface ConstraintsPackage extends EPackage {
 	 * class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintPropertyImpl

 	 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl#getConstraintProperty()

 	 * @generated

@@ -180,7 +180,7 @@ public interface ConstraintsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -189,7 +189,7 @@ public interface ConstraintsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Constraint Property</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -199,7 +199,7 @@ public interface ConstraintsPackage extends EPackage {
 	 * The number of operations of the '<em>Constraint Property</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -209,7 +209,7 @@ public interface ConstraintsPackage extends EPackage {
 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock

 	 * <em>Constraint Block</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Constraint Block</em>'.

 	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintBlock

 	 * @generated

@@ -220,7 +220,7 @@ public interface ConstraintsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty <em>Constraint Property</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Constraint Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintProperty

 	 * @generated

@@ -231,7 +231,7 @@ public interface ConstraintsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty#getBase_Property

 	 * <em>Base Property</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintProperty#getBase_Property()

 	 * @see #getConstraintProperty()

@@ -242,7 +242,7 @@ public interface ConstraintsPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintBlockImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintBlockImpl.java
index a3eafe5ab31..0188057f884 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintBlockImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintBlockImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -22,14 +22,14 @@ import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Constraint Block</b></em>'. <!-- end-user-doc -->

  * <p>

  * </p>

- * 

+ *

  * @generated

  */

 public class ConstraintBlockImpl extends BlockImpl implements ConstraintBlock {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ConstraintBlockImpl() {

@@ -38,7 +38,7 @@ public class ConstraintBlockImpl extends BlockImpl implements ConstraintBlock {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintPropertyImpl.java
index 5db8fdeeb53..0aa5cc418ba 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintPropertyImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintPropertyImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Property;
  * <li>{@link org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintPropertyImpl#getBase_Property <em>Base Property</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container implements ConstraintProperty {

@@ -39,7 +39,7 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Property()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ConstraintPropertyImpl() {

@@ -57,7 +57,7 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property basicGetBase_Property() {

@@ -66,15 +66,16 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY:

-			if(resolve)

+			if (resolve) {

 				return getBase_Property();

+			}

 			return basicGetBase_Property();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY:

 			return base_Property != null;

 		}

@@ -96,14 +97,14 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)newValue);

+			setBase_Property((Property) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)null);

+			setBase_Property((Property) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property getBase_Property() {

-		if(base_Property != null && base_Property.eIsProxy()) {

-			InternalEObject oldBase_Property = (InternalEObject)base_Property;

-			base_Property = (Property)eResolveProxy(oldBase_Property);

-			if(base_Property != oldBase_Property) {

-				if(eNotificationRequired())

+		if (base_Property != null && base_Property.eIsProxy()) {

+			InternalEObject oldBase_Property = (InternalEObject) base_Property;

+			base_Property = (Property) eResolveProxy(oldBase_Property);

+			if (base_Property != oldBase_Property) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+				}

 			}

 		}

 		return base_Property;

@@ -153,14 +155,15 @@ public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Property(Property newBase_Property) {

 		Property oldBase_Property = base_Property;

 		base_Property = newBase_Property;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+		}

 	}

 

 } // ConstraintPropertyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsFactoryImpl.java
index 567f3c5a70d..68cbd0f1be1 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,14 +26,14 @@ import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -46,13 +46,13 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static ConstraintsFactory init() {

 		try {

-			ConstraintsFactory theConstraintsFactory = (ConstraintsFactory)EPackage.Registry.INSTANCE.getEFactory(ConstraintsPackage.eNS_URI);

-			if(theConstraintsFactory != null) {

+			ConstraintsFactory theConstraintsFactory = (ConstraintsFactory) EPackage.Registry.INSTANCE.getEFactory(ConstraintsPackage.eNS_URI);

+			if (theConstraintsFactory != null) {

 				return theConstraintsFactory;

 			}

 		} catch (Exception exception) {

@@ -65,7 +65,7 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintsFactoryImpl() {

@@ -74,12 +74,12 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		case ConstraintsPackage.CONSTRAINT_BLOCK:

 			return createConstraintBlock();

 		case ConstraintsPackage.CONSTRAINT_PROPERTY:

@@ -91,7 +91,7 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintBlock createConstraintBlock() {

@@ -101,7 +101,7 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintProperty createConstraintProperty() {

@@ -111,11 +111,11 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintsPackage getConstraintsPackage() {

-		return (ConstraintsPackage)getEPackage();

+		return (ConstraintsPackage) getEPackage();

 	}

 

 } // ConstraintsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsPackageImpl.java
index 11d28de59e2..89a8f9ea5f0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -47,36 +47,36 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link ConstraintsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link ConstraintsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static ConstraintsPackage init() {

-		if(isInited)

-			return (ConstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);

+		if (isInited) {

+			return (ConstraintsPackage) EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ConstraintsPackageImpl());

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ConstraintsPackageImpl());

 

 		isInited = true;

 

@@ -84,16 +84,24 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theConstraintsPackage.createPackageContents();

@@ -132,28 +140,28 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass constraintBlockEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass constraintPropertyEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -163,9 +171,8 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage#eNS_URI

 	 * @see #init()

@@ -180,12 +187,13 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create classes and their features

@@ -197,7 +205,7 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getConstraintBlock() {

@@ -206,7 +214,7 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getConstraintProperty() {

@@ -215,32 +223,33 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getConstraintProperty_Base_Property() {

-		return (EReference)constraintPropertyEClass.getEStructuralFeatures().get(0);

+		return (EReference) constraintPropertyEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintsFactory getConstraintsFactory() {

-		return (ConstraintsFactory)getEFactoryInstance();

+		return (ConstraintsFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

@@ -249,8 +258,8 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
 		setNsURI(eNS_URI);

 

 		// Obtain other dependent packages

-		BlocksPackage theBlocksPackage = (BlocksPackage)EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);

-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		BlocksPackage theBlocksPackage = (BlocksPackage) EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);

+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

 

 		// Create type parameters

 

@@ -263,7 +272,8 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
 		initEClass(constraintBlockEClass, ConstraintBlock.class, "ConstraintBlock", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

 		initEClass(constraintPropertyEClass, ConstraintProperty.class, "ConstraintProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConstraintProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ConstraintProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getConstraintProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ConstraintProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

 	}

 

 } // ConstraintsPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsAdapterFactory.java
index 507fa6012ff..84356821915 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,7 +26,7 @@ import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides

  * an adapter <code>createXXX</code> method for each class of the model. <!--

  * end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage

  * @generated

  */

@@ -35,7 +35,7 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static ConstraintsPackage modelPackage;

@@ -43,7 +43,7 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The switch that delegates to the <code>createXXX</code> methods. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ConstraintsSwitch<Adapter> modelSwitch = new ConstraintsSwitch<Adapter>() {

@@ -73,11 +73,11 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintsAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = ConstraintsPackage.eINSTANCE;

 		}

 	}

@@ -86,15 +86,15 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param target

-	 *        the object to adapt.

+	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

 	@Override

 	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

+		return modelSwitch.doSwitch((EObject) target);

 	}

 

 	/**

@@ -102,7 +102,7 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * begin-user-doc --> This default implementation returns null so that we

 	 * can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.Block

 	 * @generated

@@ -117,7 +117,7 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintBlock

 	 * @generated

@@ -132,7 +132,7 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintProperty

 	 * @generated

@@ -145,7 +145,7 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This

 	 * default implementation returns null. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -158,17 +158,17 @@ public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if

 	 * the object is either the model's package or is an instance object of the

 	 * model. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

 	}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceFactoryImpl.java
index d4f12ed1071..687fd9c276c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.constraints.util.ConstraintsResourceImpl

  * @generated

  */

@@ -31,7 +31,7 @@ public class ConstraintsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintsResourceFactoryImpl() {

@@ -42,7 +42,7 @@ public class ConstraintsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceImpl.java
index 5d08f636249..0e9be1f291e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.constraints.util.ConstraintsResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class ConstraintsResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public ConstraintsResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsSwitch.java
index 727f49c681f..2dc10fca777 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsSwitch.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsSwitch.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,7 +27,7 @@ import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
  * starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the

  * result of the switch. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage

  * @generated

  */

@@ -36,7 +36,7 @@ public class ConstraintsSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static ConstraintsPackage modelPackage;

@@ -45,11 +45,11 @@ public class ConstraintsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintsSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = ConstraintsPackage.eINSTANCE;

 		}

 	}

@@ -57,7 +57,7 @@ public class ConstraintsSwitch<T> extends Switch<T> {
 	/**

 	 * Checks whether this is a switch for the given package. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -72,9 +72,9 @@ public class ConstraintsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Block</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -88,9 +88,9 @@ public class ConstraintsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation

 	 * returns null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Constraint Block</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -104,9 +104,9 @@ public class ConstraintsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This

 	 * implementation returns null; returning a non-null result will terminate

 	 * the switch. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Constraint Property</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -120,9 +120,9 @@ public class ConstraintsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch, but this is

 	 * the last case anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -136,29 +136,30 @@ public class ConstraintsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case ConstraintsPackage.CONSTRAINT_BLOCK:

-		{

-			ConstraintBlock constraintBlock = (ConstraintBlock)theEObject;

+		switch (classifierID) {

+		case ConstraintsPackage.CONSTRAINT_BLOCK: {

+			ConstraintBlock constraintBlock = (ConstraintBlock) theEObject;

 			T result = caseConstraintBlock(constraintBlock);

-			if(result == null)

+			if (result == null) {

 				result = caseBlock(constraintBlock);

-			if(result == null)

+			}

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ConstraintsPackage.CONSTRAINT_PROPERTY:

-		{

-			ConstraintProperty constraintProperty = (ConstraintProperty)theEObject;

+		case ConstraintsPackage.CONSTRAINT_PROPERTY: {

+			ConstraintProperty constraintProperty = (ConstraintProperty) theEObject;

 			T result = caseConstraintProperty(constraintProperty);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

 		default:

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsXMLProcessor.java
index b57b06a1cf9..966f70fe144 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ConstraintsXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class ConstraintsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ConstraintsXMLProcessor() {

@@ -44,12 +44,12 @@ public class ConstraintsXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the ConstraintsResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new ConstraintsResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new ConstraintsResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsFactory.java
index c0ac5a918d3..eb7f89c17e6 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.interactions.InteractionsPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface InteractionsFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	InteractionsFactory eINSTANCE = org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsFactoryImpl.init();

@@ -37,7 +37,7 @@ public interface InteractionsFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsPackage.java
index c2b2b6e138b..8c787838c94 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EPackage;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.interactions.InteractionsFactory

  * @model kind="package"

  * @generated

@@ -43,7 +43,7 @@ public interface InteractionsPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -51,7 +51,7 @@ public interface InteractionsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em>Dummy</em>' data type. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see java.lang.String

 		 * @see org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl#getDummy()

 		 * @generated

@@ -63,7 +63,7 @@ public interface InteractionsPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "interactions";

@@ -71,7 +71,7 @@ public interface InteractionsPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Interactions";

@@ -79,7 +79,7 @@ public interface InteractionsPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "Interactions";

@@ -88,7 +88,7 @@ public interface InteractionsPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	InteractionsPackage eINSTANCE = org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl.init();

@@ -96,7 +96,7 @@ public interface InteractionsPackage extends EPackage {
 	/**

 	 * The meta object id for the '<em>Dummy</em>' data type. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see java.lang.String

 	 * @see org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl#getDummy()

 	 * @generated

@@ -106,7 +106,7 @@ public interface InteractionsPackage extends EPackage {
 	/**

 	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for data type '<em>Dummy</em>'.

 	 * @see java.lang.String

 	 * @model instanceClass="java.lang.String"

@@ -117,7 +117,7 @@ public interface InteractionsPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsFactoryImpl.java
index acea8aa2a03..ead420c56aa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -25,14 +25,14 @@ import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class InteractionsFactoryImpl extends EFactoryImpl implements InteractionsFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -45,13 +45,13 @@ public class InteractionsFactoryImpl extends EFactoryImpl implements Interaction
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static InteractionsFactory init() {

 		try {

-			InteractionsFactory theInteractionsFactory = (InteractionsFactory)EPackage.Registry.INSTANCE.getEFactory(InteractionsPackage.eNS_URI);

-			if(theInteractionsFactory != null) {

+			InteractionsFactory theInteractionsFactory = (InteractionsFactory) EPackage.Registry.INSTANCE.getEFactory(InteractionsPackage.eNS_URI);

+			if (theInteractionsFactory != null) {

 				return theInteractionsFactory;

 			}

 		} catch (Exception exception) {

@@ -64,7 +64,7 @@ public class InteractionsFactoryImpl extends EFactoryImpl implements Interaction
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InteractionsFactoryImpl() {

@@ -73,7 +73,7 @@ public class InteractionsFactoryImpl extends EFactoryImpl implements Interaction
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String convertDummyToString(EDataType eDataType, Object instanceValue) {

@@ -82,12 +82,12 @@ public class InteractionsFactoryImpl extends EFactoryImpl implements Interaction
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case InteractionsPackage.DUMMY:

 			return convertDummyToString(eDataType, instanceValue);

 		default:

@@ -97,12 +97,12 @@ public class InteractionsFactoryImpl extends EFactoryImpl implements Interaction
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		default:

 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

@@ -110,21 +110,21 @@ public class InteractionsFactoryImpl extends EFactoryImpl implements Interaction
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String createDummyFromString(EDataType eDataType, String initialValue) {

-		return (String)super.createFromString(eDataType, initialValue);

+		return (String) super.createFromString(eDataType, initialValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case InteractionsPackage.DUMMY:

 			return createDummyFromString(eDataType, initialValue);

 		default:

@@ -134,11 +134,11 @@ public class InteractionsFactoryImpl extends EFactoryImpl implements Interaction
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InteractionsPackage getInteractionsPackage() {

-		return (InteractionsPackage)getEPackage();

+		return (InteractionsPackage) getEPackage();

 	}

 

 } // InteractionsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsPackageImpl.java
index 05978f562b2..7ba7936d676 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -43,36 +43,37 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class InteractionsPackageImpl extends EPackageImpl implements InteractionsPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link InteractionsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link InteractionsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc

+	 * -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static InteractionsPackage init() {

-		if(isInited)

-			return (InteractionsPackage)EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI);

+		if (isInited) {

+			return (InteractionsPackage) EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InteractionsPackageImpl());

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InteractionsPackageImpl());

 

 		isInited = true;

 

@@ -80,16 +81,24 @@ public class InteractionsPackageImpl extends EPackageImpl implements Interaction
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theInteractionsPackage.createPackageContents();

@@ -128,21 +137,21 @@ public class InteractionsPackageImpl extends EPackageImpl implements Interaction
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EDataType dummyEDataType = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -152,9 +161,8 @@ public class InteractionsPackageImpl extends EPackageImpl implements Interaction
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.interactions.InteractionsPackage#eNS_URI

 	 * @see #init()

@@ -169,12 +177,13 @@ public class InteractionsPackageImpl extends EPackageImpl implements Interaction
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create data types

@@ -183,7 +192,7 @@ public class InteractionsPackageImpl extends EPackageImpl implements Interaction
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EDataType getDummy() {

@@ -192,23 +201,24 @@ public class InteractionsPackageImpl extends EPackageImpl implements Interaction
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InteractionsFactory getInteractionsFactory() {

-		return (InteractionsFactory)getEFactoryInstance();

+		return (InteractionsFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceFactoryImpl.java
index c21580c26ad..91ed3d5fe5b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.interactions.util.InteractionsResourceImpl

  * @generated

  */

@@ -30,7 +30,7 @@ public class InteractionsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InteractionsResourceFactoryImpl() {

@@ -41,7 +41,7 @@ public class InteractionsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceImpl.java
index aa1aebf56c3..431b9d01bad 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.interactions.util.InteractionsResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class InteractionsResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public InteractionsResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsXMLProcessor.java
index 32b2ff0735d..39a48567ccb 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class InteractionsXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class InteractionsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InteractionsXMLProcessor() {

@@ -44,12 +44,12 @@ public class InteractionsXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the InteractionsResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new InteractionsResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new InteractionsResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlFactoryImpl.java
index f45ec114368..2eabd4fe430 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -25,14 +25,14 @@ import org.eclipse.papyrus.sysml.SysmlPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class SysmlFactoryImpl extends EFactoryImpl implements SysmlFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -45,13 +45,13 @@ public class SysmlFactoryImpl extends EFactoryImpl implements SysmlFactory {
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static SysmlFactory init() {

 		try {

-			SysmlFactory theSysmlFactory = (SysmlFactory)EPackage.Registry.INSTANCE.getEFactory(SysmlPackage.eNS_URI);

-			if(theSysmlFactory != null) {

+			SysmlFactory theSysmlFactory = (SysmlFactory) EPackage.Registry.INSTANCE.getEFactory(SysmlPackage.eNS_URI);

+			if (theSysmlFactory != null) {

 				return theSysmlFactory;

 			}

 		} catch (Exception exception) {

@@ -64,7 +64,7 @@ public class SysmlFactoryImpl extends EFactoryImpl implements SysmlFactory {
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public SysmlFactoryImpl() {

@@ -73,7 +73,7 @@ public class SysmlFactoryImpl extends EFactoryImpl implements SysmlFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String convertDummyToString(EDataType eDataType, Object instanceValue) {

@@ -82,12 +82,12 @@ public class SysmlFactoryImpl extends EFactoryImpl implements SysmlFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case SysmlPackage.DUMMY:

 			return convertDummyToString(eDataType, instanceValue);

 		default:

@@ -97,12 +97,12 @@ public class SysmlFactoryImpl extends EFactoryImpl implements SysmlFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		default:

 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

@@ -110,21 +110,21 @@ public class SysmlFactoryImpl extends EFactoryImpl implements SysmlFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String createDummyFromString(EDataType eDataType, String initialValue) {

-		return (String)super.createFromString(eDataType, initialValue);

+		return (String) super.createFromString(eDataType, initialValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case SysmlPackage.DUMMY:

 			return createDummyFromString(eDataType, initialValue);

 		default:

@@ -134,11 +134,11 @@ public class SysmlFactoryImpl extends EFactoryImpl implements SysmlFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public SysmlPackage getSysmlPackage() {

-		return (SysmlPackage)getEPackage();

+		return (SysmlPackage) getEPackage();

 	}

 

 } // SysmlFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlPackageImpl.java
index 2cf1284d562..999835470a5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -43,36 +43,36 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class SysmlPackageImpl extends EPackageImpl implements SysmlPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link SysmlPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead,

-	 * they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link SysmlPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static SysmlPackage init() {

-		if(isInited)

-			return (SysmlPackage)EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI);

+		if (isInited) {

+			return (SysmlPackage) EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SysmlPackageImpl());

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SysmlPackageImpl());

 

 		isInited = true;

 

@@ -80,16 +80,25 @@ public class SysmlPackageImpl extends EPackageImpl implements SysmlPackage {
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theSysmlPackage.createPackageContents();

@@ -128,21 +137,21 @@ public class SysmlPackageImpl extends EPackageImpl implements SysmlPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EDataType dummyEDataType = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -152,9 +161,8 @@ public class SysmlPackageImpl extends EPackageImpl implements SysmlPackage {
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.SysmlPackage#eNS_URI

 	 * @see #init()

@@ -169,12 +177,13 @@ public class SysmlPackageImpl extends EPackageImpl implements SysmlPackage {
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create data types

@@ -183,7 +192,7 @@ public class SysmlPackageImpl extends EPackageImpl implements SysmlPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EDataType getDummy() {

@@ -192,23 +201,24 @@ public class SysmlPackageImpl extends EPackageImpl implements SysmlPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public SysmlFactory getSysmlFactory() {

-		return (SysmlFactory)getEFactoryInstance();

+		return (SysmlFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

@@ -217,16 +227,16 @@ public class SysmlPackageImpl extends EPackageImpl implements SysmlPackage {
 		setNsURI(eNS_URI);

 

 		// Obtain other dependent packages

-		ModelelementsPackage theModelelementsPackage = (ModelelementsPackage)EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI);

-		BlocksPackage theBlocksPackage = (BlocksPackage)EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);

-		PortandflowsPackage thePortandflowsPackage = (PortandflowsPackage)EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI);

-		ConstraintsPackage theConstraintsPackage = (ConstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);

-		ActivitiesPackage theActivitiesPackage = (ActivitiesPackage)EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI);

-		AllocationsPackage theAllocationsPackage = (AllocationsPackage)EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI);

-		RequirementsPackage theRequirementsPackage = (RequirementsPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);

-		InteractionsPackage theInteractionsPackage = (InteractionsPackage)EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI);

-		StatemachinesPackage theStatemachinesPackage = (StatemachinesPackage)EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI);

-		UsecasesPackage theUsecasesPackage = (UsecasesPackage)EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI);

+		ModelelementsPackage theModelelementsPackage = (ModelelementsPackage) EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI);

+		BlocksPackage theBlocksPackage = (BlocksPackage) EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);

+		PortandflowsPackage thePortandflowsPackage = (PortandflowsPackage) EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI);

+		ConstraintsPackage theConstraintsPackage = (ConstraintsPackage) EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);

+		ActivitiesPackage theActivitiesPackage = (ActivitiesPackage) EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI);

+		AllocationsPackage theAllocationsPackage = (AllocationsPackage) EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI);

+		RequirementsPackage theRequirementsPackage = (RequirementsPackage) EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);

+		InteractionsPackage theInteractionsPackage = (InteractionsPackage) EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI);

+		StatemachinesPackage theStatemachinesPackage = (StatemachinesPackage) EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI);

+		UsecasesPackage theUsecasesPackage = (UsecasesPackage) EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI);

 

 		// Add subpackages

 		getESubpackages().add(theModelelementsPackage);

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Conform.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Conform.java
index f1868f714d4..d3f2074e506 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Conform.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Conform.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Dependency;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Conform</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.modelelements.Conform#getBase_Dependency <em>Base Dependency</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getConform()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface Conform extends EObject {
 	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Dependency</em>' reference.

 	 * @see #setBase_Dependency(Dependency)

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getConform_Base_Dependency()

@@ -52,9 +52,9 @@ public interface Conform extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.Conform#getBase_Dependency <em>Base Dependency</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Dependency</em>' reference.

+	 *            the new value of the '<em>Base Dependency</em>' reference.

 	 * @see #getBase_Dependency()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsFactory.java
index 97e2245e61f..8e788985acc 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface ModelelementsFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	ModelelementsFactory eINSTANCE = org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsFactoryImpl.init();

@@ -37,7 +37,7 @@ public interface ModelelementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Conform</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Conform</em>'.

 	 * @generated

 	 */

@@ -47,7 +47,7 @@ public interface ModelelementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Problem</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Problem</em>'.

 	 * @generated

 	 */

@@ -57,7 +57,7 @@ public interface ModelelementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Rationale</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Rationale</em>'.

 	 * @generated

 	 */

@@ -67,7 +67,7 @@ public interface ModelelementsFactory extends EFactory {
 	 * Returns a new object of class '<em>View</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>View</em>'.

 	 * @generated

 	 */

@@ -77,7 +77,7 @@ public interface ModelelementsFactory extends EFactory {
 	 * Returns a new object of class '<em>View Point</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>View Point</em>'.

 	 * @generated

 	 */

@@ -87,7 +87,7 @@ public interface ModelelementsFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsPackage.java
index 4e7af151416..37f068ce5f5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.EReference;
  * <!-- end-user-doc --> <!-- begin-model-doc --> The supplier/target must be an

  * element stereotyped by <<ViewPoint>> The client/source must be an element

  * stereotyped by <<View>> <!-- end-model-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsFactory

  * @model kind="package"

  * @generated

@@ -47,7 +47,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -56,7 +56,7 @@ public interface ModelelementsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ConformImpl

 		 * <em>Conform</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ConformImpl

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getConform()

 		 * @generated

@@ -66,7 +66,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Dependency</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference CONFORM__BASE_DEPENDENCY = eINSTANCE.getConform_Base_Dependency();

@@ -74,7 +74,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl <em>View</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getView()

 		 * @generated

@@ -84,7 +84,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>View Point</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference VIEW__VIEW_POINT = eINSTANCE.getView_ViewPoint();

@@ -92,7 +92,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference VIEW__BASE_PACKAGE = eINSTANCE.getView_Base_Package();

@@ -101,7 +101,7 @@ public interface ModelelementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl <em>View Point</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getViewPoint()

 		 * @generated

@@ -111,7 +111,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference VIEW_POINT__BASE_CLASS = eINSTANCE.getViewPoint_Base_Class();

@@ -119,7 +119,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Stake Holders</b></em>' attribute list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute VIEW_POINT__STAKE_HOLDERS = eINSTANCE.getViewPoint_StakeHolders();

@@ -127,7 +127,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Purpose</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute VIEW_POINT__PURPOSE = eINSTANCE.getViewPoint_Purpose();

@@ -135,7 +135,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Concerns</b></em>' attribute list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute VIEW_POINT__CONCERNS = eINSTANCE.getViewPoint_Concerns();

@@ -143,7 +143,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Languages</b></em>' attribute list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute VIEW_POINT__LANGUAGES = eINSTANCE.getViewPoint_Languages();

@@ -151,7 +151,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Methods</b></em>' attribute list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute VIEW_POINT__METHODS = eINSTANCE.getViewPoint_Methods();

@@ -160,7 +160,7 @@ public interface ModelelementsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl

 		 * <em>Rationale</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getRationale()

 		 * @generated

@@ -170,7 +170,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Comment</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RATIONALE__BASE_COMMENT = eINSTANCE.getRationale_Base_Comment();

@@ -179,7 +179,7 @@ public interface ModelelementsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl

 		 * <em>Problem</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl

 		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getProblem()

 		 * @generated

@@ -189,7 +189,7 @@ public interface ModelelementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Comment</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference PROBLEM__BASE_COMMENT = eINSTANCE.getProblem_Base_Comment();

@@ -199,7 +199,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "modelelements";

@@ -207,7 +207,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements";

@@ -215,7 +215,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "ModelElements";

@@ -224,7 +224,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	ModelelementsPackage eINSTANCE = org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl.init();

@@ -232,7 +232,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ConformImpl <em>Conform</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ConformImpl

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getConform()

 	 * @generated

@@ -242,7 +242,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Dependency</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -251,7 +251,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Conform</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -261,7 +261,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * The number of operations of the '<em>Conform</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -270,7 +270,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl <em>View</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getView()

 	 * @generated

@@ -280,7 +280,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>View Point</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -289,7 +289,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Package</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -298,7 +298,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>View</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -308,7 +308,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * The number of operations of the '<em>View</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -318,7 +318,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl

 	 * <em>View Point</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getViewPoint()

 	 * @generated

@@ -328,7 +328,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Class</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -337,7 +337,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Stake Holders</b></em>' attribute list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -346,7 +346,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Purpose</b></em>' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -355,7 +355,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Concerns</b></em>' attribute list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -364,7 +364,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Languages</b></em>' attribute list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -373,7 +373,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Methods</b></em>' attribute list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -382,7 +382,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>View Point</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -392,7 +392,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * The number of operations of the '<em>View Point</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -401,7 +401,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl <em>Rationale</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getRationale()

 	 * @generated

@@ -411,7 +411,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Comment</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -420,7 +420,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Rationale</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -430,7 +430,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * The number of operations of the '<em>Rationale</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -439,7 +439,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl <em>Problem</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl

 	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getProblem()

 	 * @generated

@@ -449,7 +449,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Comment</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -458,7 +458,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Problem</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -468,7 +468,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * The number of operations of the '<em>Problem</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -478,7 +478,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.modelelements.Conform <em>Conform</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Conform</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.Conform

 	 * @generated

@@ -486,10 +486,9 @@ public interface ModelelementsPackage extends EPackage {
 	EClass getConform();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.Conform#getBase_Dependency <em>Base Dependency</em>}

-	 * '.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.Conform#getBase_Dependency <em>Base Dependency</em>} '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Dependency</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.Conform#getBase_Dependency()

 	 * @see #getConform()

@@ -500,7 +499,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -510,7 +509,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.modelelements.Problem <em>Problem</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Problem</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.Problem

 	 * @generated

@@ -520,7 +519,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.Problem#getBase_Comment <em>Base Comment</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Comment</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.Problem#getBase_Comment()

 	 * @see #getProblem()

@@ -531,7 +530,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.modelelements.Rationale <em>Rationale</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Rationale</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.Rationale

 	 * @generated

@@ -541,7 +540,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.Rationale#getBase_Comment <em>Base Comment</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Comment</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.Rationale#getBase_Comment()

 	 * @see #getRationale()

@@ -552,7 +551,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.modelelements.View <em>View</em>}'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>View</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.View

 	 * @generated

@@ -562,7 +561,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.View#getBase_Package <em>Base Package</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.View#getBase_Package()

 	 * @see #getView()

@@ -573,7 +572,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.View#getViewPoint <em>View Point</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>View Point</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.View#getViewPoint()

 	 * @see #getView()

@@ -584,7 +583,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint <em>View Point</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>View Point</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint

 	 * @generated

@@ -594,7 +593,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getBase_Class()

 	 * @see #getViewPoint()

@@ -605,7 +604,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getConcerns <em>Concerns</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute list '<em>Concerns</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getConcerns()

 	 * @see #getViewPoint()

@@ -616,7 +615,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getLanguages <em>Languages</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute list '<em>Languages</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getLanguages()

 	 * @see #getViewPoint()

@@ -627,7 +626,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getMethods <em>Methods</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute list '<em>Methods</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getMethods()

 	 * @see #getViewPoint()

@@ -638,7 +637,7 @@ public interface ModelelementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getPurpose <em>Purpose</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Purpose</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getPurpose()

 	 * @see #getViewPoint()

@@ -650,7 +649,7 @@ public interface ModelelementsPackage extends EPackage {
 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getStakeHolders

 	 * <em>Stake Holders</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute list '<em>Stake Holders</em>'.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getStakeHolders()

 	 * @see #getViewPoint()

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Problem.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Problem.java
index 2031655b3f2..0886b22403b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Problem.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Problem.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Comment;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Problem</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.modelelements.Problem#getBase_Comment <em>Base Comment</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getProblem()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface Problem extends EObject {
 	 * If the meaning of the '<em>Base Comment</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Comment</em>' reference.

 	 * @see #setBase_Comment(Comment)

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getProblem_Base_Comment()

@@ -52,9 +52,9 @@ public interface Problem extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.Problem#getBase_Comment <em>Base Comment</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Comment</em>' reference.

+	 *            the new value of the '<em>Base Comment</em>' reference.

 	 * @see #getBase_Comment()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Rationale.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Rationale.java
index 76d927720c8..89fc1d29931 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Rationale.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Rationale.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Comment;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Rationale</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.modelelements.Rationale#getBase_Comment <em>Base Comment</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getRationale()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface Rationale extends EObject {
 	 * If the meaning of the '<em>Base Comment</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Comment</em>' reference.

 	 * @see #setBase_Comment(Comment)

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getRationale_Base_Comment()

@@ -52,9 +52,9 @@ public interface Rationale extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.Rationale#getBase_Comment <em>Base Comment</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Comment</em>' reference.

+	 *            the new value of the '<em>Base Comment</em>' reference.

 	 * @see #getBase_Comment()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/View.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/View.java
index 7c013ec2e1c..88aab4c1f40 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/View.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/View.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EObject;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>View</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.papyrus.sysml.modelelements.View#getBase_Package <em>Base Package</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getView()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface View extends EObject {
 	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Package</em>' reference.

 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getView_Base_Package()

@@ -55,7 +55,7 @@ public interface View extends EObject {
 	 * If the meaning of the '<em>View Point</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>View Point</em>' reference.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getView_ViewPoint()

 	 * @model required="true" transient="true" changeable="false"

@@ -68,9 +68,9 @@ public interface View extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.View#getBase_Package <em>Base Package</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Package</em>' reference.

+	 *            the new value of the '<em>Base Package</em>' reference.

 	 * @see #getBase_Package()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ViewPoint.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ViewPoint.java
index 2100e03f488..a6793404a0a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ViewPoint.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ViewPoint.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EObject;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>View Point</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getMethods <em>Methods</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint()

  * @model

  * @generated

@@ -44,7 +44,7 @@ public interface ViewPoint extends EObject {
 	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_Base_Class()

@@ -62,7 +62,7 @@ public interface ViewPoint extends EObject {
 	 * If the meaning of the '<em>Concerns</em>' attribute list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Concerns</em>' attribute list.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_Concerns()

 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" ordered="false"

@@ -79,7 +79,7 @@ public interface ViewPoint extends EObject {
 	 * If the meaning of the '<em>Languages</em>' attribute list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Languages</em>' attribute list.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_Languages()

 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" ordered="false"

@@ -96,7 +96,7 @@ public interface ViewPoint extends EObject {
 	 * If the meaning of the '<em>Methods</em>' attribute list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Methods</em>' attribute list.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_Methods()

 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" ordered="false"

@@ -111,7 +111,7 @@ public interface ViewPoint extends EObject {
 	 * If the meaning of the '<em>Purpose</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Purpose</em>' attribute.

 	 * @see #setPurpose(String)

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_Purpose()

@@ -128,7 +128,7 @@ public interface ViewPoint extends EObject {
 	 * If the meaning of the '<em>Stake Holders</em>' attribute list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Stake Holders</em>' attribute list.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_StakeHolders()

 	 * @model unique="false" ordered="false"

@@ -140,9 +140,9 @@ public interface ViewPoint extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Class</em>' reference.

+	 *            the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

 	 * @generated

 	 */

@@ -152,9 +152,9 @@ public interface ViewPoint extends EObject {
 	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getPurpose

 	 * <em>Purpose</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Purpose</em>' attribute.

+	 *            the new value of the '<em>Purpose</em>' attribute.

 	 * @see #getPurpose()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ConformImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ConformImpl.java
index 11f95059bb9..6983c98d0ff 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ConformImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ConformImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Dependency;
  * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ConformImpl#getBase_Dependency <em>Base Dependency</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ConformImpl extends MinimalEObjectImpl.Container implements Conform {

@@ -39,7 +39,7 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 	 * The cached value of the '{@link #getBase_Dependency() <em>Base Dependency</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Dependency()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ConformImpl() {

@@ -57,7 +57,7 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Dependency basicGetBase_Dependency() {

@@ -66,15 +66,16 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.CONFORM__BASE_DEPENDENCY:

-			if(resolve)

+			if (resolve) {

 				return getBase_Dependency();

+			}

 			return basicGetBase_Dependency();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.CONFORM__BASE_DEPENDENCY:

 			return base_Dependency != null;

 		}

@@ -96,14 +97,14 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.CONFORM__BASE_DEPENDENCY:

-			setBase_Dependency((Dependency)newValue);

+			setBase_Dependency((Dependency) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.CONFORM__BASE_DEPENDENCY:

-			setBase_Dependency((Dependency)null);

+			setBase_Dependency((Dependency) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Dependency getBase_Dependency() {

-		if(base_Dependency != null && base_Dependency.eIsProxy()) {

-			InternalEObject oldBase_Dependency = (InternalEObject)base_Dependency;

-			base_Dependency = (Dependency)eResolveProxy(oldBase_Dependency);

-			if(base_Dependency != oldBase_Dependency) {

-				if(eNotificationRequired())

+		if (base_Dependency != null && base_Dependency.eIsProxy()) {

+			InternalEObject oldBase_Dependency = (InternalEObject) base_Dependency;

+			base_Dependency = (Dependency) eResolveProxy(oldBase_Dependency);

+			if (base_Dependency != oldBase_Dependency) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelelementsPackage.CONFORM__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

+				}

 			}

 		}

 		return base_Dependency;

@@ -153,14 +155,15 @@ public class ConformImpl extends MinimalEObjectImpl.Container implements Conform
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Dependency(Dependency newBase_Dependency) {

 		Dependency oldBase_Dependency = base_Dependency;

 		base_Dependency = newBase_Dependency;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.CONFORM__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

+		}

 	}

 

 } // ConformImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsFactoryImpl.java
index d2cd199a2e2..891d877f9fa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -29,14 +29,14 @@ import org.eclipse.papyrus.sysml.modelelements.ViewPoint;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ModelelementsFactoryImpl extends EFactoryImpl implements ModelelementsFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -49,13 +49,13 @@ public class ModelelementsFactoryImpl extends EFactoryImpl implements Modeleleme
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static ModelelementsFactory init() {

 		try {

-			ModelelementsFactory theModelelementsFactory = (ModelelementsFactory)EPackage.Registry.INSTANCE.getEFactory(ModelelementsPackage.eNS_URI);

-			if(theModelelementsFactory != null) {

+			ModelelementsFactory theModelelementsFactory = (ModelelementsFactory) EPackage.Registry.INSTANCE.getEFactory(ModelelementsPackage.eNS_URI);

+			if (theModelelementsFactory != null) {

 				return theModelelementsFactory;

 			}

 		} catch (Exception exception) {

@@ -68,7 +68,7 @@ public class ModelelementsFactoryImpl extends EFactoryImpl implements Modeleleme
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ModelelementsFactoryImpl() {

@@ -77,12 +77,12 @@ public class ModelelementsFactoryImpl extends EFactoryImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		case ModelelementsPackage.CONFORM:

 			return createConform();

 		case ModelelementsPackage.VIEW:

@@ -100,7 +100,7 @@ public class ModelelementsFactoryImpl extends EFactoryImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Conform createConform() {

@@ -110,7 +110,7 @@ public class ModelelementsFactoryImpl extends EFactoryImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Problem createProblem() {

@@ -120,7 +120,7 @@ public class ModelelementsFactoryImpl extends EFactoryImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Rationale createRationale() {

@@ -130,7 +130,7 @@ public class ModelelementsFactoryImpl extends EFactoryImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public View createView() {

@@ -140,7 +140,7 @@ public class ModelelementsFactoryImpl extends EFactoryImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ViewPoint createViewPoint() {

@@ -150,11 +150,11 @@ public class ModelelementsFactoryImpl extends EFactoryImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ModelelementsPackage getModelelementsPackage() {

-		return (ModelelementsPackage)getEPackage();

+		return (ModelelementsPackage) getEPackage();

 	}

 

 } // ModelelementsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsPackageImpl.java
index add64cbf6bc..336383b9b4b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -52,36 +52,37 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ModelelementsPackageImpl extends EPackageImpl implements ModelelementsPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link ModelelementsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link ModelelementsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc

+	 * -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static ModelelementsPackage init() {

-		if(isInited)

-			return (ModelelementsPackage)EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI);

+		if (isInited) {

+			return (ModelelementsPackage) EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ModelelementsPackageImpl());

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ModelelementsPackageImpl());

 

 		isInited = true;

 

@@ -89,16 +90,24 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theModelelementsPackage.createPackageContents();

@@ -137,49 +146,49 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass conformEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass viewEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass viewPointEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rationaleEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass problemEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -189,9 +198,8 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#eNS_URI

 	 * @see #init()

@@ -206,12 +214,13 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create classes and their features

@@ -239,7 +248,7 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getConform() {

@@ -248,25 +257,25 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getConform_Base_Dependency() {

-		return (EReference)conformEClass.getEStructuralFeatures().get(0);

+		return (EReference) conformEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ModelelementsFactory getModelelementsFactory() {

-		return (ModelelementsFactory)getEFactoryInstance();

+		return (ModelelementsFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getProblem() {

@@ -275,16 +284,16 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getProblem_Base_Comment() {

-		return (EReference)problemEClass.getEStructuralFeatures().get(0);

+		return (EReference) problemEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getRationale() {

@@ -293,16 +302,16 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRationale_Base_Comment() {

-		return (EReference)rationaleEClass.getEStructuralFeatures().get(0);

+		return (EReference) rationaleEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getView() {

@@ -311,25 +320,25 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getView_Base_Package() {

-		return (EReference)viewEClass.getEStructuralFeatures().get(1);

+		return (EReference) viewEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getView_ViewPoint() {

-		return (EReference)viewEClass.getEStructuralFeatures().get(0);

+		return (EReference) viewEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getViewPoint() {

@@ -338,68 +347,69 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getViewPoint_Base_Class() {

-		return (EReference)viewPointEClass.getEStructuralFeatures().get(0);

+		return (EReference) viewPointEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getViewPoint_Concerns() {

-		return (EAttribute)viewPointEClass.getEStructuralFeatures().get(3);

+		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(3);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getViewPoint_Languages() {

-		return (EAttribute)viewPointEClass.getEStructuralFeatures().get(4);

+		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(4);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getViewPoint_Methods() {

-		return (EAttribute)viewPointEClass.getEStructuralFeatures().get(5);

+		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(5);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getViewPoint_Purpose() {

-		return (EAttribute)viewPointEClass.getEStructuralFeatures().get(2);

+		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getViewPoint_StakeHolders() {

-		return (EAttribute)viewPointEClass.getEStructuralFeatures().get(1);

+		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

@@ -408,8 +418,8 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 		setNsURI(eNS_URI);

 

 		// Obtain other dependent packages

-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		TypesPackage theTypesPackage = (TypesPackage) EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

 

 		// Create type parameters

 

@@ -419,7 +429,8 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 

 		// Initialize classes, features, and operations; add parameters

 		initEClass(conformEClass, Conform.class, "Conform", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConform_Base_Dependency(), theUMLPackage.getDependency(), null, "base_Dependency", null, 1, 1, Conform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getConform_Base_Dependency(), theUMLPackage.getDependency(), null, "base_Dependency", null, 1, 1, Conform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 

 		initEClass(viewEClass, View.class, "View", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEReference(getView_ViewPoint(), this.getViewPoint(), null, "viewPoint", null, 1, 1, View.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

@@ -434,7 +445,8 @@ public class ModelelementsPackageImpl extends EPackageImpl implements Modeleleme
 		initEAttribute(getViewPoint_Methods(), theTypesPackage.getString(), "methods", null, 0, -1, ViewPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(rationaleEClass, Rationale.class, "Rationale", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRationale_Base_Comment(), theUMLPackage.getComment(), null, "base_Comment", null, 1, 1, Rationale.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getRationale_Base_Comment(), theUMLPackage.getComment(), null, "base_Comment", null, 1, 1, Rationale.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 

 		initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEReference(getProblem_Base_Comment(), theUMLPackage.getComment(), null, "base_Comment", null, 1, 1, Problem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ProblemImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ProblemImpl.java
index b8bd1727d0d..c395b57ab58 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ProblemImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ProblemImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Comment;
  * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl#getBase_Comment <em>Base Comment</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem {

@@ -38,7 +38,7 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 	/**

 	 * The cached value of the '{@link #getBase_Comment() <em>Base Comment</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Comment()

 	 * @generated

 	 * @ordered

@@ -47,7 +47,7 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ProblemImpl() {

@@ -56,7 +56,7 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Comment basicGetBase_Comment() {

@@ -65,15 +65,16 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.PROBLEM__BASE_COMMENT:

-			if(resolve)

+			if (resolve) {

 				return getBase_Comment();

+			}

 			return basicGetBase_Comment();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -81,12 +82,12 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.PROBLEM__BASE_COMMENT:

 			return base_Comment != null;

 		}

@@ -95,14 +96,14 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.PROBLEM__BASE_COMMENT:

-			setBase_Comment((Comment)newValue);

+			setBase_Comment((Comment) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -110,7 +111,7 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -120,14 +121,14 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.PROBLEM__BASE_COMMENT:

-			setBase_Comment((Comment)null);

+			setBase_Comment((Comment) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -135,16 +136,17 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Comment getBase_Comment() {

-		if(base_Comment != null && base_Comment.eIsProxy()) {

-			InternalEObject oldBase_Comment = (InternalEObject)base_Comment;

-			base_Comment = (Comment)eResolveProxy(oldBase_Comment);

-			if(base_Comment != oldBase_Comment) {

-				if(eNotificationRequired())

+		if (base_Comment != null && base_Comment.eIsProxy()) {

+			InternalEObject oldBase_Comment = (InternalEObject) base_Comment;

+			base_Comment = (Comment) eResolveProxy(oldBase_Comment);

+			if (base_Comment != oldBase_Comment) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelelementsPackage.PROBLEM__BASE_COMMENT, oldBase_Comment, base_Comment));

+				}

 			}

 		}

 		return base_Comment;

@@ -152,14 +154,15 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Comment(Comment newBase_Comment) {

 		Comment oldBase_Comment = base_Comment;

 		base_Comment = newBase_Comment;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.PROBLEM__BASE_COMMENT, oldBase_Comment, base_Comment));

+		}

 	}

 

 } // ProblemImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/RationaleImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/RationaleImpl.java
index a0751f5d7f5..0264a46e5cc 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/RationaleImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/RationaleImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Comment;
  * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl#getBase_Comment <em>Base Comment</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class RationaleImpl extends MinimalEObjectImpl.Container implements Rationale {

@@ -38,7 +38,7 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 	/**

 	 * The cached value of the '{@link #getBase_Comment() <em>Base Comment</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Comment()

 	 * @generated

 	 * @ordered

@@ -47,7 +47,7 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RationaleImpl() {

@@ -56,7 +56,7 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Comment basicGetBase_Comment() {

@@ -65,15 +65,16 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.RATIONALE__BASE_COMMENT:

-			if(resolve)

+			if (resolve) {

 				return getBase_Comment();

+			}

 			return basicGetBase_Comment();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -81,12 +82,12 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.RATIONALE__BASE_COMMENT:

 			return base_Comment != null;

 		}

@@ -95,14 +96,14 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.RATIONALE__BASE_COMMENT:

-			setBase_Comment((Comment)newValue);

+			setBase_Comment((Comment) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -110,7 +111,7 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -120,14 +121,14 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.RATIONALE__BASE_COMMENT:

-			setBase_Comment((Comment)null);

+			setBase_Comment((Comment) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -135,16 +136,17 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Comment getBase_Comment() {

-		if(base_Comment != null && base_Comment.eIsProxy()) {

-			InternalEObject oldBase_Comment = (InternalEObject)base_Comment;

-			base_Comment = (Comment)eResolveProxy(oldBase_Comment);

-			if(base_Comment != oldBase_Comment) {

-				if(eNotificationRequired())

+		if (base_Comment != null && base_Comment.eIsProxy()) {

+			InternalEObject oldBase_Comment = (InternalEObject) base_Comment;

+			base_Comment = (Comment) eResolveProxy(oldBase_Comment);

+			if (base_Comment != oldBase_Comment) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelelementsPackage.RATIONALE__BASE_COMMENT, oldBase_Comment, base_Comment));

+				}

 			}

 		}

 		return base_Comment;

@@ -152,14 +154,15 @@ public class RationaleImpl extends MinimalEObjectImpl.Container implements Ratio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Comment(Comment newBase_Comment) {

 		Comment oldBase_Comment = base_Comment;

 		base_Comment = newBase_Comment;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.RATIONALE__BASE_COMMENT, oldBase_Comment, base_Comment));

+		}

 	}

 

 } // RationaleImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewImpl.java
index 17459a7bc1f..0f8a5371af7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,7 +36,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl#getBase_Package <em>Base Package</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ViewImpl extends MinimalEObjectImpl.Container implements View {

@@ -44,7 +44,7 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 	/**

 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Package()

 	 * @generated

 	 * @ordered

@@ -53,7 +53,7 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ViewImpl() {

@@ -62,7 +62,7 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {

@@ -71,7 +71,7 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public ViewPoint basicGetViewPoint() {

@@ -79,18 +79,18 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 		ViewPoint viewPoint = null;

 		Conform conform = null;

 

-		if(getBase_Package() != null) {

+		if (getBase_Package() != null) {

 			// Find Conform link

 			Iterator<Dependency> itDep = getBase_Package().getClientDependencies().iterator();

-			while(itDep.hasNext() && (conform == null)) {

+			while (itDep.hasNext() && (conform == null)) {

 				Dependency currentDependency = itDep.next();

 				conform = UMLUtil.getStereotypeApplication(currentDependency, Conform.class);

 			}

 

 			// Find ViewPoint

-			if(conform != null) {

+			if (conform != null) {

 				Iterator<Element> itElt = conform.getBase_Dependency().getTargets().iterator();

-				while(itElt.hasNext()) {

+				while (itElt.hasNext()) {

 					Element currentElt = itElt.next();

 					viewPoint = UMLUtil.getStereotypeApplication(currentElt, ViewPoint.class);

 				}

@@ -101,19 +101,21 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.VIEW__VIEW_POINT:

-			if(resolve)

+			if (resolve) {

 				return getViewPoint();

+			}

 			return basicGetViewPoint();

 		case ModelelementsPackage.VIEW__BASE_PACKAGE:

-			if(resolve)

+			if (resolve) {

 				return getBase_Package();

+			}

 			return basicGetBase_Package();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -121,12 +123,12 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.VIEW__VIEW_POINT:

 			return basicGetViewPoint() != null;

 		case ModelelementsPackage.VIEW__BASE_PACKAGE:

@@ -137,14 +139,14 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.VIEW__BASE_PACKAGE:

-			setBase_Package((org.eclipse.uml2.uml.Package)newValue);

+			setBase_Package((org.eclipse.uml2.uml.Package) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -152,7 +154,7 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -162,14 +164,14 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.VIEW__BASE_PACKAGE:

-			setBase_Package((org.eclipse.uml2.uml.Package)null);

+			setBase_Package((org.eclipse.uml2.uml.Package) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -177,16 +179,17 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Package getBase_Package() {

-		if(base_Package != null && base_Package.eIsProxy()) {

-			InternalEObject oldBase_Package = (InternalEObject)base_Package;

-			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);

-			if(base_Package != oldBase_Package) {

-				if(eNotificationRequired())

+		if (base_Package != null && base_Package.eIsProxy()) {

+			InternalEObject oldBase_Package = (InternalEObject) base_Package;

+			base_Package = (org.eclipse.uml2.uml.Package) eResolveProxy(oldBase_Package);

+			if (base_Package != oldBase_Package) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelelementsPackage.VIEW__BASE_PACKAGE, oldBase_Package, base_Package));

+				}

 			}

 		}

 		return base_Package;

@@ -194,29 +197,30 @@ public class ViewImpl extends MinimalEObjectImpl.Container implements View {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ViewPoint getViewPoint() {

 		ViewPoint viewPoint = basicGetViewPoint();

-		return viewPoint != null && viewPoint.eIsProxy() ? (ViewPoint)eResolveProxy((InternalEObject)viewPoint) : viewPoint;

+		return viewPoint != null && viewPoint.eIsProxy() ? (ViewPoint) eResolveProxy((InternalEObject) viewPoint) : viewPoint;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {

 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;

 		base_Package = newBase_Package;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.VIEW__BASE_PACKAGE, oldBase_Package, base_Package));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public void setViewPoint(ViewPoint newViewPoint) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewPointImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewPointImpl.java
index b82897b4720..2057e8e0a67 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewPointImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewPointImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -37,7 +37,7 @@ import org.eclipse.papyrus.sysml.modelelements.ViewPoint;
  * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl#getMethods <em>Methods</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewPoint {

@@ -45,7 +45,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 	/**

 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Class()

 	 * @generated

 	 * @ordered

@@ -56,7 +56,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 	 * The cached value of the '{@link #getStakeHolders() <em>Stake Holders</em>}' attribute list.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getStakeHolders()

 	 * @generated

 	 * @ordered

@@ -66,7 +66,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 	/**

 	 * The default value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getPurpose()

 	 * @generated

 	 * @ordered

@@ -76,7 +76,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 	/**

 	 * The cached value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getPurpose()

 	 * @generated

 	 * @ordered

@@ -86,7 +86,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 	/**

 	 * The cached value of the '{@link #getConcerns() <em>Concerns</em>}' attribute list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getConcerns()

 	 * @generated

 	 * @ordered

@@ -96,7 +96,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 	/**

 	 * The cached value of the '{@link #getLanguages() <em>Languages</em>}' attribute list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getLanguages()

 	 * @generated

 	 * @ordered

@@ -106,7 +106,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 	/**

 	 * The cached value of the '{@link #getMethods() <em>Methods</em>}' attribute list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getMethods()

 	 * @generated

 	 * @ordered

@@ -115,7 +115,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ViewPointImpl() {

@@ -124,7 +124,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

@@ -133,15 +133,16 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.VIEW_POINT__BASE_CLASS:

-			if(resolve)

+			if (resolve) {

 				return getBase_Class();

+			}

 			return basicGetBase_Class();

 		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

 			return getStakeHolders();

@@ -159,12 +160,12 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.VIEW_POINT__BASE_CLASS:

 			return base_Class != null;

 		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

@@ -183,34 +184,34 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.VIEW_POINT__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class)newValue);

+			setBase_Class((org.eclipse.uml2.uml.Class) newValue);

 			return;

 		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

 			getStakeHolders().clear();

-			getStakeHolders().addAll((Collection<? extends String>)newValue);

+			getStakeHolders().addAll((Collection<? extends String>) newValue);

 			return;

 		case ModelelementsPackage.VIEW_POINT__PURPOSE:

-			setPurpose((String)newValue);

+			setPurpose((String) newValue);

 			return;

 		case ModelelementsPackage.VIEW_POINT__CONCERNS:

 			getConcerns().clear();

-			getConcerns().addAll((Collection<? extends String>)newValue);

+			getConcerns().addAll((Collection<? extends String>) newValue);

 			return;

 		case ModelelementsPackage.VIEW_POINT__LANGUAGES:

 			getLanguages().clear();

-			getLanguages().addAll((Collection<? extends String>)newValue);

+			getLanguages().addAll((Collection<? extends String>) newValue);

 			return;

 		case ModelelementsPackage.VIEW_POINT__METHODS:

 			getMethods().clear();

-			getMethods().addAll((Collection<? extends String>)newValue);

+			getMethods().addAll((Collection<? extends String>) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -218,7 +219,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -228,14 +229,14 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case ModelelementsPackage.VIEW_POINT__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class)null);

+			setBase_Class((org.eclipse.uml2.uml.Class) null);

 			return;

 		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

 			getStakeHolders().clear();

@@ -258,16 +259,17 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class getBase_Class() {

-		if(base_Class != null && base_Class.eIsProxy()) {

-			InternalEObject oldBase_Class = (InternalEObject)base_Class;

-			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);

-			if(base_Class != oldBase_Class) {

-				if(eNotificationRequired())

+		if (base_Class != null && base_Class.eIsProxy()) {

+			InternalEObject oldBase_Class = (InternalEObject) base_Class;

+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);

+			if (base_Class != oldBase_Class) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelelementsPackage.VIEW_POINT__BASE_CLASS, oldBase_Class, base_Class));

+				}

 			}

 		}

 		return base_Class;

@@ -275,11 +277,11 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EList<String> getConcerns() {

-		if(concerns == null) {

+		if (concerns == null) {

 			concerns = new EDataTypeEList<String>(String.class, this, ModelelementsPackage.VIEW_POINT__CONCERNS);

 		}

 		return concerns;

@@ -287,11 +289,11 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EList<String> getLanguages() {

-		if(languages == null) {

+		if (languages == null) {

 			languages = new EDataTypeEList<String>(String.class, this, ModelelementsPackage.VIEW_POINT__LANGUAGES);

 		}

 		return languages;

@@ -299,11 +301,11 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EList<String> getMethods() {

-		if(methods == null) {

+		if (methods == null) {

 			methods = new EDataTypeEList<String>(String.class, this, ModelelementsPackage.VIEW_POINT__METHODS);

 		}

 		return methods;

@@ -311,7 +313,7 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String getPurpose() {

@@ -320,11 +322,11 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EList<String> getStakeHolders() {

-		if(stakeHolders == null) {

+		if (stakeHolders == null) {

 			stakeHolders = new EDataTypeEList<String>(String.class, this, ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS);

 		}

 		return stakeHolders;

@@ -332,37 +334,40 @@ public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {

 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;

 		base_Class = newBase_Class;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.VIEW_POINT__BASE_CLASS, oldBase_Class, base_Class));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setPurpose(String newPurpose) {

 		String oldPurpose = purpose;

 		purpose = newPurpose;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.VIEW_POINT__PURPOSE, oldPurpose, purpose));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy())

+		if (eIsProxy()) {

 			return super.toString();

+		}

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (stakeHolders: ");

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsAdapterFactory.java
index eb1b95c678e..db3de31f6d9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -28,7 +28,7 @@ import org.eclipse.papyrus.sysml.modelelements.ViewPoint;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides

  * an adapter <code>createXXX</code> method for each class of the model. <!--

  * end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage

  * @generated

  */

@@ -37,7 +37,7 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static ModelelementsPackage modelPackage;

@@ -45,7 +45,7 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The switch that delegates to the <code>createXXX</code> methods. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ModelelementsSwitch<Adapter> modelSwitch = new ModelelementsSwitch<Adapter>() {

@@ -85,11 +85,11 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ModelelementsAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = ModelelementsPackage.eINSTANCE;

 		}

 	}

@@ -98,15 +98,15 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param target

-	 *        the object to adapt.

+	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

 	@Override

 	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

+		return modelSwitch.doSwitch((EObject) target);

 	}

 

 	/**

@@ -115,7 +115,7 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	 * --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.modelelements.Conform

 	 * @generated

@@ -128,7 +128,7 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This

 	 * default implementation returns null. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -142,7 +142,7 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	 * --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.modelelements.Problem

 	 * @generated

@@ -157,7 +157,7 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	 * returns null so that we can easily ignore cases; it's useful to ignore a

 	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.modelelements.Rationale

 	 * @generated

@@ -171,7 +171,7 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	 * begin-user-doc --> This default implementation returns null so that we

 	 * can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.modelelements.View

 	 * @generated

@@ -186,7 +186,7 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint

 	 * @generated

@@ -200,17 +200,17 @@ public class ModelelementsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if

 	 * the object is either the model's package or is an instance object of the

 	 * model. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

 	}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceFactoryImpl.java
index 1eeb106da6d..b6c4b0176fa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.util.ModelelementsResourceImpl

  * @generated

  */

@@ -31,7 +31,7 @@ public class ModelelementsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ModelelementsResourceFactoryImpl() {

@@ -42,7 +42,7 @@ public class ModelelementsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceImpl.java
index 34275f936f1..c2aa7e2addc 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.util.ModelelementsResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class ModelelementsResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public ModelelementsResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsSwitch.java
index ab6b52dfad6..96d7f1e23c0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsSwitch.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsSwitch.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -29,7 +29,7 @@ import org.eclipse.papyrus.sysml.modelelements.ViewPoint;
  * starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the

  * result of the switch. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage

  * @generated

  */

@@ -38,7 +38,7 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static ModelelementsPackage modelPackage;

@@ -47,11 +47,11 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ModelelementsSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = ModelelementsPackage.eINSTANCE;

 		}

 	}

@@ -59,7 +59,7 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	/**

 	 * Checks whether this is a switch for the given package. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -74,9 +74,9 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Conform</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -90,9 +90,9 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Problem</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -106,9 +106,9 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Rationale</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -121,9 +121,9 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of ' <em>View</em>'. <!-- begin-user-doc --> This implementation returns null;

 	 * returning a non-null result will terminate the switch. <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of ' <em>View</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -137,9 +137,9 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>View Point</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -153,9 +153,9 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch, but this is

 	 * the last case anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -169,51 +169,51 @@ public class ModelelementsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case ModelelementsPackage.CONFORM:

-		{

-			Conform conform = (Conform)theEObject;

+		switch (classifierID) {

+		case ModelelementsPackage.CONFORM: {

+			Conform conform = (Conform) theEObject;

 			T result = caseConform(conform);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ModelelementsPackage.VIEW:

-		{

-			View view = (View)theEObject;

+		case ModelelementsPackage.VIEW: {

+			View view = (View) theEObject;

 			T result = caseView(view);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ModelelementsPackage.VIEW_POINT:

-		{

-			ViewPoint viewPoint = (ViewPoint)theEObject;

+		case ModelelementsPackage.VIEW_POINT: {

+			ViewPoint viewPoint = (ViewPoint) theEObject;

 			T result = caseViewPoint(viewPoint);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ModelelementsPackage.RATIONALE:

-		{

-			Rationale rationale = (Rationale)theEObject;

+		case ModelelementsPackage.RATIONALE: {

+			Rationale rationale = (Rationale) theEObject;

 			T result = caseRationale(rationale);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case ModelelementsPackage.PROBLEM:

-		{

-			Problem problem = (Problem)theEObject;

+		case ModelelementsPackage.PROBLEM: {

+			Problem problem = (Problem) theEObject;

 			T result = caseProblem(problem);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

 		default:

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsXMLProcessor.java
index d78abccf7ff..c16786068d9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class ModelelementsXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class ModelelementsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ModelelementsXMLProcessor() {

@@ -44,12 +44,12 @@ public class ModelelementsXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the ModelelementsResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new ModelelementsResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new ModelelementsResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowDirection.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowDirection.java
index 7ebb5b819ad..2d76ba31686 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowDirection.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowDirection.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-user-doc --> A representation of the literals of the enumeration ' <em><b>Flow Direction</b></em>', and utility methods for working with

  * them.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowDirection()

  * @model

  * @generated

@@ -33,7 +33,7 @@ public enum FlowDirection implements Enumerator {
 	 * The '<em><b>In</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #IN_VALUE

 	 * @generated

 	 * @ordered

@@ -44,7 +44,7 @@ public enum FlowDirection implements Enumerator {
 	 * The '<em><b>Out</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #OUT_VALUE

 	 * @generated

 	 * @ordered

@@ -55,7 +55,7 @@ public enum FlowDirection implements Enumerator {
 	 * The '<em><b>Inout</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #INOUT_VALUE

 	 * @generated

 	 * @ordered

@@ -69,7 +69,7 @@ public enum FlowDirection implements Enumerator {
 	 * If the meaning of '<em><b>In</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #IN

 	 * @model name="in"

 	 * @generated

@@ -84,7 +84,7 @@ public enum FlowDirection implements Enumerator {
 	 * If the meaning of '<em><b>Out</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #OUT

 	 * @model name="out"

 	 * @generated

@@ -99,7 +99,7 @@ public enum FlowDirection implements Enumerator {
 	 * If the meaning of '<em><b>Inout</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #INOUT

 	 * @model name="inout"

 	 * @generated

@@ -110,15 +110,15 @@ public enum FlowDirection implements Enumerator {
 	/**

 	 * An array of all the '<em><b>Flow Direction</b></em>' enumerators. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

-	private static final FlowDirection[] VALUES_ARRAY = new FlowDirection[]{ IN, OUT, INOUT, };

+	private static final FlowDirection[] VALUES_ARRAY = new FlowDirection[] { IN, OUT, INOUT, };

 

 	/**

 	 * A public read-only list of all the '<em><b>Flow Direction</b></em>' enumerators.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static final List<FlowDirection> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -126,11 +126,11 @@ public enum FlowDirection implements Enumerator {
 	/**

 	 * Returns the '<em><b>Flow Direction</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static FlowDirection get(int value) {

-		switch(value) {

+		switch (value) {

 		case IN_VALUE:

 			return IN;

 		case OUT_VALUE:

@@ -144,13 +144,13 @@ public enum FlowDirection implements Enumerator {
 	/**

 	 * Returns the '<em><b>Flow Direction</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static FlowDirection get(String literal) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			FlowDirection result = VALUES_ARRAY[i];

-			if(result.toString().equals(literal)) {

+			if (result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -160,13 +160,13 @@ public enum FlowDirection implements Enumerator {
 	/**

 	 * Returns the '<em><b>Flow Direction</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static FlowDirection getByName(String name) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			FlowDirection result = VALUES_ARRAY[i];

-			if(result.getName().equals(name)) {

+			if (result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -175,21 +175,21 @@ public enum FlowDirection implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final int value;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final String name;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final String literal;

@@ -198,7 +198,7 @@ public enum FlowDirection implements Enumerator {
 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private FlowDirection(int value, String name, String literal) {

@@ -209,7 +209,7 @@ public enum FlowDirection implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String getLiteral() {

@@ -218,7 +218,7 @@ public enum FlowDirection implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String getName() {

@@ -227,7 +227,7 @@ public enum FlowDirection implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public int getValue() {

@@ -237,7 +237,7 @@ public enum FlowDirection implements Enumerator {
 	/**

 	 * Returns the literal value of the enumerator, which is its string representation.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowPort.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowPort.java
index 7325121dbf6..7b4591eef14 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowPort.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowPort.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.uml2.uml.Port;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Flow Port</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.Port;
  * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getDirection <em>Direction</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowPort()

  * @model

  * @generated

@@ -43,7 +43,7 @@ public interface FlowPort extends EObject {
 	 * If the meaning of the '<em>Base Port</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Port</em>' reference.

 	 * @see #setBase_Port(Port)

 	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowPort_Base_Port()

@@ -61,7 +61,7 @@ public interface FlowPort extends EObject {
 	 * If the meaning of the '<em>Direction</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Direction</em>' attribute.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

 	 * @see #setDirection(FlowDirection)

@@ -73,7 +73,7 @@ public interface FlowPort extends EObject {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @model kind="operation" required="true" ordered="false"

 	 * @generated

 	 */

@@ -83,9 +83,9 @@ public interface FlowPort extends EObject {
 	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getBase_Port

 	 * <em>Base Port</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Port</em>' reference.

+	 *            the new value of the '<em>Base Port</em>' reference.

 	 * @see #getBase_Port()

 	 * @generated

 	 */

@@ -99,7 +99,7 @@ public interface FlowPort extends EObject {
 	 * If the meaning of the '<em>Is Atomic</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Is Atomic</em>' attribute.

 	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowPort_IsAtomic()

 	 * @model default="false" unique="false" dataType="org.eclipse.uml2.types.Boolean" required="true" transient="true" changeable="false"

@@ -115,7 +115,7 @@ public interface FlowPort extends EObject {
 	 * If the meaning of the '<em>Is Conjugated</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Is Conjugated</em>' attribute.

 	 * @see #setIsConjugated(boolean)

 	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowPort_IsConjugated()

@@ -128,9 +128,9 @@ public interface FlowPort extends EObject {
 	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getDirection

 	 * <em>Direction</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Direction</em>' attribute.

+	 *            the new value of the '<em>Direction</em>' attribute.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

 	 * @see #getDirection()

 	 * @generated

@@ -141,9 +141,9 @@ public interface FlowPort extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isConjugated <em>Is Conjugated</em>}' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Is Conjugated</em>' attribute.

+	 *            the new value of the '<em>Is Conjugated</em>' attribute.

 	 * @see #isConjugated()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowProperty.java
index efbd5454ce6..84d7aec942b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowProperty.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowProperty.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.uml2.uml.Property;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Flow Property</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -27,7 +27,7 @@ import org.eclipse.uml2.uml.Property;
  * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getDirection <em>Direction</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowProperty()

  * @model

  * @generated

@@ -41,7 +41,7 @@ public interface FlowProperty extends EObject {
 	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Property</em>' reference.

 	 * @see #setBase_Property(Property)

 	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowProperty_Base_Property()

@@ -59,7 +59,7 @@ public interface FlowProperty extends EObject {
 	 * If the meaning of the '<em>Direction</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Direction</em>' attribute.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

 	 * @see #setDirection(FlowDirection)

@@ -71,7 +71,7 @@ public interface FlowProperty extends EObject {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @model kind="operation" required="true" ordered="false"

 	 * @generated

 	 */

@@ -81,9 +81,9 @@ public interface FlowProperty extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getBase_Property <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Property</em>' reference.

+	 *            the new value of the '<em>Base Property</em>' reference.

 	 * @see #getBase_Property()

 	 * @generated

 	 */

@@ -93,9 +93,9 @@ public interface FlowProperty extends EObject {
 	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getDirection

 	 * <em>Direction</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Direction</em>' attribute.

+	 *            the new value of the '<em>Direction</em>' attribute.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

 	 * @see #getDirection()

 	 * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowSpecification.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowSpecification.java
index a0d53305539..1981161ce02 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowSpecification.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowSpecification.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,14 +18,14 @@ import org.eclipse.uml2.uml.Interface;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Flow Specification</b></em> '. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification#getBase_Interface <em>Base Interface</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowSpecification()

  * @model

  * @generated

@@ -39,7 +39,7 @@ public interface FlowSpecification extends EObject {
 	 * If the meaning of the '<em>Base Interface</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Interface</em>' reference.

 	 * @see #setBase_Interface(Interface)

 	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowSpecification_Base_Interface()

@@ -52,9 +52,9 @@ public interface FlowSpecification extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification#getBase_Interface <em>Base Interface</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Interface</em>' reference.

+	 *            the new value of the '<em>Base Interface</em>' reference.

 	 * @see #getBase_Interface()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/ItemFlow.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/ItemFlow.java
index e8413b8c734..57f95deb6fc 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/ItemFlow.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/ItemFlow.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.uml2.uml.Property;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Item Flow</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -27,7 +27,7 @@ import org.eclipse.uml2.uml.Property;
  * <li>{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow#getItemProperty <em>Item Property</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getItemFlow()

  * @model

  * @generated

@@ -41,7 +41,7 @@ public interface ItemFlow extends EObject {
 	 * If the meaning of the '<em>Base Information Flow</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Information Flow</em>' reference.

 	 * @see #setBase_InformationFlow(InformationFlow)

 	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getItemFlow_Base_InformationFlow()

@@ -57,7 +57,7 @@ public interface ItemFlow extends EObject {
 	 * If the meaning of the '<em>Item Property</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Item Property</em>' reference.

 	 * @see #setItemProperty(Property)

 	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getItemFlow_ItemProperty()

@@ -71,9 +71,9 @@ public interface ItemFlow extends EObject {
 	 * reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Information Flow</em>' reference.

+	 *            the new value of the '<em>Base Information Flow</em>' reference.

 	 * @see #getBase_InformationFlow()

 	 * @generated

 	 */

@@ -83,9 +83,9 @@ public interface ItemFlow extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow#getItemProperty <em>Item Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Item Property</em>' reference.

+	 *            the new value of the '<em>Item Property</em>' reference.

 	 * @see #getItemProperty()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsFactory.java
index 495fa940158..1e5bd0e8f54 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface PortandflowsFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	PortandflowsFactory eINSTANCE = org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsFactoryImpl.init();

@@ -37,7 +37,7 @@ public interface PortandflowsFactory extends EFactory {
 	 * Returns a new object of class '<em>Flow Port</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Flow Port</em>'.

 	 * @generated

 	 */

@@ -46,7 +46,7 @@ public interface PortandflowsFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Flow Property</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Flow Property</em>'.

 	 * @generated

 	 */

@@ -55,7 +55,7 @@ public interface PortandflowsFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Flow Specification</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Flow Specification</em>'.

 	 * @generated

 	 */

@@ -65,7 +65,7 @@ public interface PortandflowsFactory extends EFactory {
 	 * Returns a new object of class '<em>Item Flow</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Item Flow</em>'.

 	 * @generated

 	 */

@@ -75,7 +75,7 @@ public interface PortandflowsFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsPackage.java
index 2b862368d4b..74bb4c28ec0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsFactory

  * @model kind="package"

  * @generated

@@ -47,7 +47,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -56,7 +56,7 @@ public interface PortandflowsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl

 		 * <em>Flow Port</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl

 		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowPort()

 		 * @generated

@@ -66,7 +66,7 @@ public interface PortandflowsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference FLOW_PORT__BASE_PORT = eINSTANCE.getFlowPort_Base_Port();

@@ -74,7 +74,7 @@ public interface PortandflowsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Is Atomic</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute FLOW_PORT__IS_ATOMIC = eINSTANCE.getFlowPort_IsAtomic();

@@ -82,7 +82,7 @@ public interface PortandflowsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Is Conjugated</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute FLOW_PORT__IS_CONJUGATED = eINSTANCE.getFlowPort_IsConjugated();

@@ -90,7 +90,7 @@ public interface PortandflowsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Direction</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute FLOW_PORT__DIRECTION = eINSTANCE.getFlowPort_Direction();

@@ -99,7 +99,7 @@ public interface PortandflowsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Get Icon</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EOperation FLOW_PORT___GET_ICON = eINSTANCE.getFlowPort__GetIcon();

@@ -109,7 +109,7 @@ public interface PortandflowsPackage extends EPackage {
 		 * class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl

 		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowProperty()

 		 * @generated

@@ -119,7 +119,7 @@ public interface PortandflowsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference FLOW_PROPERTY__BASE_PROPERTY = eINSTANCE.getFlowProperty_Base_Property();

@@ -127,7 +127,7 @@ public interface PortandflowsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Direction</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute FLOW_PROPERTY__DIRECTION = eINSTANCE.getFlowProperty_Direction();

@@ -136,7 +136,7 @@ public interface PortandflowsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Get Icon</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EOperation FLOW_PROPERTY___GET_ICON = eINSTANCE.getFlowProperty__GetIcon();

@@ -146,7 +146,7 @@ public interface PortandflowsPackage extends EPackage {
 		 * <em>Flow Specification</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowSpecificationImpl

 		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowSpecification()

 		 * @generated

@@ -156,7 +156,7 @@ public interface PortandflowsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Interface</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference FLOW_SPECIFICATION__BASE_INTERFACE = eINSTANCE.getFlowSpecification_Base_Interface();

@@ -165,7 +165,7 @@ public interface PortandflowsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl

 		 * <em>Item Flow</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl

 		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getItemFlow()

 		 * @generated

@@ -175,7 +175,7 @@ public interface PortandflowsPackage extends EPackage {
 		/**

 		 * The meta object literal for the ' <em><b>Base Information Flow</b></em>' reference feature. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference ITEM_FLOW__BASE_INFORMATION_FLOW = eINSTANCE.getItemFlow_Base_InformationFlow();

@@ -183,7 +183,7 @@ public interface PortandflowsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Item Property</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference ITEM_FLOW__ITEM_PROPERTY = eINSTANCE.getItemFlow_ItemProperty();

@@ -192,7 +192,7 @@ public interface PortandflowsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.portandflows.FlowDirection <em>Flow Direction</em>}' enum.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

 		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowDirection()

 		 * @generated

@@ -204,7 +204,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "portandflows";

@@ -212,7 +212,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows";

@@ -220,7 +220,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "PortAndFlows";

@@ -229,7 +229,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	PortandflowsPackage eINSTANCE = org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl.init();

@@ -237,7 +237,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl <em>Flow Port</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl

 	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowPort()

 	 * @generated

@@ -247,7 +247,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Port</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -256,7 +256,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Is Atomic</b></em>' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -265,7 +265,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Is Conjugated</b></em>' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -274,7 +274,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Direction</b></em>' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -283,7 +283,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Flow Port</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -293,7 +293,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * The operation id for the '<em>Get Icon</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -303,7 +303,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * The number of operations of the '<em>Flow Port</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -313,7 +313,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl

 	 * <em>Flow Property</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl

 	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowProperty()

 	 * @generated

@@ -323,7 +323,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -332,7 +332,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Direction</b></em>' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -341,7 +341,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Flow Property</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -351,7 +351,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * The operation id for the '<em>Get Icon</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -361,7 +361,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * The number of operations of the '<em>Flow Property</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -372,7 +372,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowSpecificationImpl

 	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowSpecification()

 	 * @generated

@@ -382,7 +382,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Interface</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -391,7 +391,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Flow Specification</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -401,7 +401,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * The number of operations of the '<em>Flow Specification</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -410,7 +410,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl <em>Item Flow</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl

 	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getItemFlow()

 	 * @generated

@@ -420,7 +420,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Information Flow</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -429,7 +429,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Item Property</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -438,7 +438,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Item Flow</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -448,7 +448,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * The number of operations of the '<em>Item Flow</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -458,7 +458,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.portandflows.FlowDirection

 	 * <em>Flow Direction</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

 	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowDirection()

 	 * @generated

@@ -468,7 +468,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.sysml.portandflows.FlowDirection <em>Flow Direction</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for enum '<em>Flow Direction</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

 	 * @generated

@@ -478,7 +478,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort <em>Flow Port</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Flow Port</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort

 	 * @generated

@@ -488,7 +488,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getBase_Port <em>Base Port</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Port</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#getBase_Port()

 	 * @see #getFlowPort()

@@ -499,7 +499,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getDirection <em>Direction</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Direction</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#getDirection()

 	 * @see #getFlowPort()

@@ -511,7 +511,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon() <em>Get Icon</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the '<em>Get Icon</em>' operation.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon()

 	 * @generated

@@ -521,7 +521,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic <em>Is Atomic</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Is Atomic</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic()

 	 * @see #getFlowPort()

@@ -532,7 +532,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isConjugated <em>Is Conjugated</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Is Conjugated</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#isConjugated()

 	 * @see #getFlowPort()

@@ -543,7 +543,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty <em>Flow Property</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Flow Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty

 	 * @generated

@@ -551,10 +551,9 @@ public interface PortandflowsPackage extends EPackage {
 	EClass getFlowProperty();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getBase_Property <em>Base Property</em>}

-	 * '.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getBase_Property <em>Base Property</em>} '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty#getBase_Property()

 	 * @see #getFlowProperty()

@@ -565,7 +564,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getDirection <em>Direction</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Direction</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty#getDirection()

 	 * @see #getFlowProperty()

@@ -577,7 +576,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon() <em>Get Icon</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the '<em>Get Icon</em>' operation.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon()

 	 * @generated

@@ -588,7 +587,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification

 	 * <em>Flow Specification</em>} '. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Flow Specification</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowSpecification

 	 * @generated

@@ -599,7 +598,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification#getBase_Interface

 	 * <em>Base Interface</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Interface</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowSpecification#getBase_Interface()

 	 * @see #getFlowSpecification()

@@ -610,7 +609,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow <em>Item Flow</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Item Flow</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.ItemFlow

 	 * @generated

@@ -622,7 +621,7 @@ public interface PortandflowsPackage extends EPackage {
 	 * <em>Base Information Flow</em>}'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Information Flow</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.ItemFlow#getBase_InformationFlow()

 	 * @see #getItemFlow()

@@ -633,7 +632,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow#getItemProperty <em>Item Property</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Item Property</em>'.

 	 * @see org.eclipse.papyrus.sysml.portandflows.ItemFlow#getItemProperty()

 	 * @see #getItemFlow()

@@ -644,7 +643,7 @@ public interface PortandflowsPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPortImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPortImpl.java
index 0758e4443ef..059619436d0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPortImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPortImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -42,7 +42,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl#getDirection <em>Direction</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPort {

@@ -50,7 +50,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 	/**

 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Port()

 	 * @generated

 	 * @ordered

@@ -60,7 +60,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 	/**

 	 * The default value of the '{@link #isAtomic() <em>Is Atomic</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isAtomic()

 	 * @generated

 	 * @ordered

@@ -71,7 +71,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 	 * The default value of the '{@link #isConjugated() <em>Is Conjugated</em>}' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #isConjugated()

 	 * @generated

 	 * @ordered

@@ -81,7 +81,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 	/**

 	 * The cached value of the '{@link #isConjugated() <em>Is Conjugated</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isConjugated()

 	 * @generated

 	 * @ordered

@@ -91,7 +91,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 	/**

 	 * The default value of the '{@link #getDirection() <em>Direction</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getDirection()

 	 * @generated

 	 * @ordered

@@ -101,7 +101,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 	/**

 	 * The cached value of the '{@link #getDirection() <em>Direction</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getDirection()

 	 * @generated

 	 * @ordered

@@ -110,7 +110,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected FlowPortImpl() {

@@ -119,7 +119,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Port basicGetBase_Port() {

@@ -128,15 +128,16 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_PORT__BASE_PORT:

-			if(resolve)

+			if (resolve) {

 				return getBase_Port();

+			}

 			return basicGetBase_Port();

 		case PortandflowsPackage.FLOW_PORT__IS_ATOMIC:

 			return isAtomic();

@@ -150,12 +151,12 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_PORT__BASE_PORT:

 			return base_Port != null;

 		case PortandflowsPackage.FLOW_PORT__IS_ATOMIC:

@@ -171,12 +172,12 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch(operationID) {

+		switch (operationID) {

 		case PortandflowsPackage.FLOW_PORT___GET_ICON:

 			return getIcon();

 		}

@@ -185,20 +186,20 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_PORT__BASE_PORT:

-			setBase_Port((Port)newValue);

+			setBase_Port((Port) newValue);

 			return;

 		case PortandflowsPackage.FLOW_PORT__IS_CONJUGATED:

-			setIsConjugated((Boolean)newValue);

+			setIsConjugated((Boolean) newValue);

 			return;

 		case PortandflowsPackage.FLOW_PORT__DIRECTION:

-			setDirection((FlowDirection)newValue);

+			setDirection((FlowDirection) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -206,7 +207,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -216,14 +217,14 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_PORT__BASE_PORT:

-			setBase_Port((Port)null);

+			setBase_Port((Port) null);

 			return;

 		case PortandflowsPackage.FLOW_PORT__IS_CONJUGATED:

 			setIsConjugated(IS_CONJUGATED_EDEFAULT);

@@ -237,16 +238,17 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Port getBase_Port() {

-		if(base_Port != null && base_Port.eIsProxy()) {

-			InternalEObject oldBase_Port = (InternalEObject)base_Port;

-			base_Port = (Port)eResolveProxy(oldBase_Port);

-			if(base_Port != oldBase_Port) {

-				if(eNotificationRequired())

+		if (base_Port != null && base_Port.eIsProxy()) {

+			InternalEObject oldBase_Port = (InternalEObject) base_Port;

+			base_Port = (Port) eResolveProxy(oldBase_Port);

+			if (base_Port != oldBase_Port) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PortandflowsPackage.FLOW_PORT__BASE_PORT, oldBase_Port, base_Port));

+				}

 			}

 		}

 		return base_Port;

@@ -254,7 +256,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public FlowDirection getDirection() {

@@ -265,25 +267,25 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 	 * <!-- begin-user-doc --> Images registered in Profile are : 0 - FlowPort

 	 * (default, similar to INOUT) 1 - FlowPort IN 2 - FlowPort OUT 3 - FlowPort

 	 * INOUT 4 - FlowPort NA (Non Atomic) <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public Image getIcon() {

 

 		Image ImageNotFound = null;

 

-		if(getBase_Port() != null) {

+		if (getBase_Port() != null) {

 

 			Stereotype st = UMLUtil.getStereotype(this);

 

 			Image image = st.getIcons().get(0);

 

-			if(isAtomic()) {

-				if(getDirection() == FlowDirection.IN) {

+			if (isAtomic()) {

+				if (getDirection() == FlowDirection.IN) {

 					image = st.getIcons().get(1);

-				} else if(getDirection() == FlowDirection.OUT) {

+				} else if (getDirection() == FlowDirection.OUT) {

 					image = st.getIcons().get(2);

-				} else if(getDirection() == FlowDirection.INOUT) {

+				} else if (getDirection() == FlowDirection.INOUT) {

 					image = st.getIcons().get(3);

 				}

 

@@ -300,20 +302,21 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Port(Port newBase_Port) {

 		Port oldBase_Port = base_Port;

 		base_Port = newBase_Port;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PORT__BASE_PORT, oldBase_Port, base_Port));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public boolean isAtomic() {

@@ -321,14 +324,14 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 		Boolean isAtomic = true;

 		FlowSpecification flowSpec = null;

 

-		if(getBase_Port() != null) {

+		if (getBase_Port() != null) {

 			// Find FlowPort type

 			Type type = getBase_Port().getType();

-			if((type != null) && (type instanceof Interface)) {

+			if ((type != null) && (type instanceof Interface)) {

 				flowSpec = UMLUtil.getStereotypeApplication(type, FlowSpecification.class);

 			}

 

-			if(flowSpec != null) {

+			if (flowSpec != null) {

 				isAtomic = false;

 			}

 		}

@@ -338,7 +341,7 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public boolean isConjugated() {

@@ -347,19 +350,20 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setDirection(FlowDirection newDirection) {

 		FlowDirection oldDirection = direction;

 		direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PORT__DIRECTION, oldDirection, direction));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public void setIsAtomic(boolean newIsAtomic) {

@@ -370,25 +374,27 @@ public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setIsConjugated(boolean newIsConjugated) {

 		boolean oldIsConjugated = isConjugated;

 		isConjugated = newIsConjugated;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PORT__IS_CONJUGATED, oldIsConjugated, isConjugated));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy())

+		if (eIsProxy()) {

 			return super.toString();

+		}

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (isConjugated: ");

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPropertyImpl.java
index 77cfab47071..cf7ee3d5424 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPropertyImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPropertyImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -37,7 +37,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl#getDirection <em>Direction</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements FlowProperty {

@@ -46,7 +46,7 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Property()

 	 * @generated

 	 * @ordered

@@ -56,7 +56,7 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 	/**

 	 * The default value of the '{@link #getDirection() <em>Direction</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getDirection()

 	 * @generated

 	 * @ordered

@@ -66,7 +66,7 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 	/**

 	 * The cached value of the '{@link #getDirection() <em>Direction</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getDirection()

 	 * @generated

 	 * @ordered

@@ -75,7 +75,7 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected FlowPropertyImpl() {

@@ -84,7 +84,7 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property basicGetBase_Property() {

@@ -93,15 +93,16 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY:

-			if(resolve)

+			if (resolve) {

 				return getBase_Property();

+			}

 			return basicGetBase_Property();

 		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

 			return getDirection();

@@ -111,12 +112,12 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY:

 			return base_Property != null;

 		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

@@ -128,12 +129,12 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch(operationID) {

+		switch (operationID) {

 		case PortandflowsPackage.FLOW_PROPERTY___GET_ICON:

 			return getIcon();

 		}

@@ -142,17 +143,17 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)newValue);

+			setBase_Property((Property) newValue);

 			return;

 		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

-			setDirection((FlowDirection)newValue);

+			setDirection((FlowDirection) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -160,7 +161,7 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -170,14 +171,14 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property)null);

+			setBase_Property((Property) null);

 			return;

 		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

 			setDirection(DIRECTION_EDEFAULT);

@@ -188,16 +189,17 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property getBase_Property() {

-		if(base_Property != null && base_Property.eIsProxy()) {

-			InternalEObject oldBase_Property = (InternalEObject)base_Property;

-			base_Property = (Property)eResolveProxy(oldBase_Property);

-			if(base_Property != oldBase_Property) {

-				if(eNotificationRequired())

+		if (base_Property != null && base_Property.eIsProxy()) {

+			InternalEObject oldBase_Property = (InternalEObject) base_Property;

+			base_Property = (Property) eResolveProxy(oldBase_Property);

+			if (base_Property != oldBase_Property) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+				}

 			}

 		}

 		return base_Property;

@@ -205,7 +207,7 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public FlowDirection getDirection() {

@@ -216,23 +218,23 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 	 * <!-- begin-user-doc --> Images registered in Profile are : 0 - FlowPort

 	 * (default, similar to INOUT) 1 - FlowPort IN 2 - FlowPort OUT 3 - FlowPort

 	 * INOUT <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public Image getIcon() {

 

 		Image ImageNotFound = null;

 

-		if(getBase_Property() != null) {

+		if (getBase_Property() != null) {

 			Stereotype st = UMLUtil.getStereotype(this);

 

 			Image image = st.getIcons().get(0);

 

-			if(getDirection() == FlowDirection.IN) {

+			if (getDirection() == FlowDirection.IN) {

 				image = st.getIcons().get(1);

-			} else if(getDirection() == FlowDirection.OUT) {

+			} else if (getDirection() == FlowDirection.OUT) {

 				image = st.getIcons().get(2);

-			} else if(getDirection() == FlowDirection.INOUT) {

+			} else if (getDirection() == FlowDirection.INOUT) {

 				image = st.getIcons().get(3);

 			}

 

@@ -245,37 +247,40 @@ public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements Fl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Property(Property newBase_Property) {

 		Property oldBase_Property = base_Property;

 		base_Property = newBase_Property;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setDirection(FlowDirection newDirection) {

 		FlowDirection oldDirection = direction;

 		direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PROPERTY__DIRECTION, oldDirection, direction));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy())

+		if (eIsProxy()) {

 			return super.toString();

+		}

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (direction: ");

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowSpecificationImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowSpecificationImpl.java
index 37fcf54ff9d..23c6ca60595 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowSpecificationImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowSpecificationImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Interface;
  * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowSpecificationImpl#getBase_Interface <em>Base Interface</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implements FlowSpecification {

@@ -39,7 +39,7 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 	 * The cached value of the '{@link #getBase_Interface() <em>Base Interface</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Interface()

 	 * @generated

 	 * @ordered

@@ -48,7 +48,7 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected FlowSpecificationImpl() {

@@ -57,7 +57,7 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Interface basicGetBase_Interface() {

@@ -66,15 +66,16 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE:

-			if(resolve)

+			if (resolve) {

 				return getBase_Interface();

+			}

 			return basicGetBase_Interface();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -82,12 +83,12 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE:

 			return base_Interface != null;

 		}

@@ -96,14 +97,14 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE:

-			setBase_Interface((Interface)newValue);

+			setBase_Interface((Interface) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -111,7 +112,7 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -121,14 +122,14 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE:

-			setBase_Interface((Interface)null);

+			setBase_Interface((Interface) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -136,16 +137,17 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Interface getBase_Interface() {

-		if(base_Interface != null && base_Interface.eIsProxy()) {

-			InternalEObject oldBase_Interface = (InternalEObject)base_Interface;

-			base_Interface = (Interface)eResolveProxy(oldBase_Interface);

-			if(base_Interface != oldBase_Interface) {

-				if(eNotificationRequired())

+		if (base_Interface != null && base_Interface.eIsProxy()) {

+			InternalEObject oldBase_Interface = (InternalEObject) base_Interface;

+			base_Interface = (Interface) eResolveProxy(oldBase_Interface);

+			if (base_Interface != oldBase_Interface) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE, oldBase_Interface, base_Interface));

+				}

 			}

 		}

 		return base_Interface;

@@ -153,14 +155,15 @@ public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implemen
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Interface(Interface newBase_Interface) {

 		Interface oldBase_Interface = base_Interface;

 		base_Interface = newBase_Interface;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE, oldBase_Interface, base_Interface));

+		}

 	}

 

 } // FlowSpecificationImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/ItemFlowImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/ItemFlowImpl.java
index ca967730aa2..7e3c455b2e4 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/ItemFlowImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/ItemFlowImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -32,7 +32,7 @@ import org.eclipse.uml2.uml.Property;
  * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl#getItemProperty <em>Item Property</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFlow {

@@ -41,7 +41,7 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 	 * The cached value of the '{@link #getBase_InformationFlow() <em>Base Information Flow</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_InformationFlow()

 	 * @generated

 	 * @ordered

@@ -52,7 +52,7 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 	 * The cached value of the '{@link #getItemProperty() <em>Item Property</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getItemProperty()

 	 * @generated

 	 * @ordered

@@ -61,7 +61,7 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ItemFlowImpl() {

@@ -70,7 +70,7 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InformationFlow basicGetBase_InformationFlow() {

@@ -79,7 +79,7 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property basicGetItemProperty() {

@@ -88,19 +88,21 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW:

-			if(resolve)

+			if (resolve) {

 				return getBase_InformationFlow();

+			}

 			return basicGetBase_InformationFlow();

 		case PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY:

-			if(resolve)

+			if (resolve) {

 				return getItemProperty();

+			}

 			return basicGetItemProperty();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -108,12 +110,12 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW:

 			return base_InformationFlow != null;

 		case PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY:

@@ -124,17 +126,17 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW:

-			setBase_InformationFlow((InformationFlow)newValue);

+			setBase_InformationFlow((InformationFlow) newValue);

 			return;

 		case PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY:

-			setItemProperty((Property)newValue);

+			setItemProperty((Property) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -142,7 +144,7 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -152,17 +154,17 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW:

-			setBase_InformationFlow((InformationFlow)null);

+			setBase_InformationFlow((InformationFlow) null);

 			return;

 		case PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY:

-			setItemProperty((Property)null);

+			setItemProperty((Property) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -170,16 +172,17 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public InformationFlow getBase_InformationFlow() {

-		if(base_InformationFlow != null && base_InformationFlow.eIsProxy()) {

-			InternalEObject oldBase_InformationFlow = (InternalEObject)base_InformationFlow;

-			base_InformationFlow = (InformationFlow)eResolveProxy(oldBase_InformationFlow);

-			if(base_InformationFlow != oldBase_InformationFlow) {

-				if(eNotificationRequired())

+		if (base_InformationFlow != null && base_InformationFlow.eIsProxy()) {

+			InternalEObject oldBase_InformationFlow = (InternalEObject) base_InformationFlow;

+			base_InformationFlow = (InformationFlow) eResolveProxy(oldBase_InformationFlow);

+			if (base_InformationFlow != oldBase_InformationFlow) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW, oldBase_InformationFlow, base_InformationFlow));

+				}

 			}

 		}

 		return base_InformationFlow;

@@ -187,16 +190,17 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property getItemProperty() {

-		if(itemProperty != null && itemProperty.eIsProxy()) {

-			InternalEObject oldItemProperty = (InternalEObject)itemProperty;

-			itemProperty = (Property)eResolveProxy(oldItemProperty);

-			if(itemProperty != oldItemProperty) {

-				if(eNotificationRequired())

+		if (itemProperty != null && itemProperty.eIsProxy()) {

+			InternalEObject oldItemProperty = (InternalEObject) itemProperty;

+			itemProperty = (Property) eResolveProxy(oldItemProperty);

+			if (itemProperty != oldItemProperty) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY, oldItemProperty, itemProperty));

+				}

 			}

 		}

 		return itemProperty;

@@ -204,26 +208,28 @@ public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFl
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_InformationFlow(InformationFlow newBase_InformationFlow) {

 		InformationFlow oldBase_InformationFlow = base_InformationFlow;

 		base_InformationFlow = newBase_InformationFlow;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW, oldBase_InformationFlow, base_InformationFlow));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setItemProperty(Property newItemProperty) {

 		Property oldItemProperty = itemProperty;

 		itemProperty = newItemProperty;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY, oldItemProperty, itemProperty));

+		}

 	}

 

 } // ItemFlowImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsFactoryImpl.java
index 321023a8824..0c1fc984331 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,14 +30,14 @@ import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class PortandflowsFactoryImpl extends EFactoryImpl implements PortandflowsFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -50,13 +50,13 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static PortandflowsFactory init() {

 		try {

-			PortandflowsFactory thePortandflowsFactory = (PortandflowsFactory)EPackage.Registry.INSTANCE.getEFactory(PortandflowsPackage.eNS_URI);

-			if(thePortandflowsFactory != null) {

+			PortandflowsFactory thePortandflowsFactory = (PortandflowsFactory) EPackage.Registry.INSTANCE.getEFactory(PortandflowsPackage.eNS_URI);

+			if (thePortandflowsFactory != null) {

 				return thePortandflowsFactory;

 			}

 		} catch (Exception exception) {

@@ -69,7 +69,7 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PortandflowsFactoryImpl() {

@@ -78,7 +78,7 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String convertFlowDirectionToString(EDataType eDataType, Object instanceValue) {

@@ -87,12 +87,12 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case PortandflowsPackage.FLOW_DIRECTION:

 			return convertFlowDirectionToString(eDataType, instanceValue);

 		default:

@@ -102,12 +102,12 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		case PortandflowsPackage.FLOW_PORT:

 			return createFlowPort();

 		case PortandflowsPackage.FLOW_PROPERTY:

@@ -123,19 +123,20 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public FlowDirection createFlowDirectionFromString(EDataType eDataType, String initialValue) {

 		FlowDirection result = FlowDirection.get(initialValue);

-		if(result == null)

+		if (result == null) {

 			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		}

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public FlowPort createFlowPort() {

@@ -145,7 +146,7 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public FlowProperty createFlowProperty() {

@@ -155,7 +156,7 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public FlowSpecification createFlowSpecification() {

@@ -165,12 +166,12 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case PortandflowsPackage.FLOW_DIRECTION:

 			return createFlowDirectionFromString(eDataType, initialValue);

 		default:

@@ -180,7 +181,7 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public ItemFlow createItemFlow() {

@@ -190,11 +191,11 @@ public class PortandflowsFactoryImpl extends EFactoryImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PortandflowsPackage getPortandflowsPackage() {

-		return (PortandflowsPackage)getEPackage();

+		return (PortandflowsPackage) getEPackage();

 	}

 

 } // PortandflowsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsPackageImpl.java
index 68422b8d949..19044518771 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -54,36 +54,37 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class PortandflowsPackageImpl extends EPackageImpl implements PortandflowsPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link PortandflowsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link PortandflowsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc

+	 * -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static PortandflowsPackage init() {

-		if(isInited)

-			return (PortandflowsPackage)EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI);

+		if (isInited) {

+			return (PortandflowsPackage) EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PortandflowsPackageImpl());

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PortandflowsPackageImpl());

 

 		isInited = true;

 

@@ -91,16 +92,24 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		thePortandflowsPackage.createPackageContents();

@@ -139,49 +148,49 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass flowPortEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass flowPropertyEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass flowSpecificationEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass itemFlowEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EEnum flowDirectionEEnum = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -191,9 +200,8 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#eNS_URI

 	 * @see #init()

@@ -208,12 +216,13 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create classes and their features

@@ -242,7 +251,7 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EEnum getFlowDirection() {

@@ -251,7 +260,7 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getFlowPort() {

@@ -260,26 +269,26 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getFlowPort_Base_Port() {

-		return (EReference)flowPortEClass.getEStructuralFeatures().get(0);

+		return (EReference) flowPortEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getFlowPort_Direction() {

-		return (EAttribute)flowPortEClass.getEStructuralFeatures().get(3);

+		return (EAttribute) flowPortEClass.getEStructuralFeatures().get(3);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EOperation getFlowPort__GetIcon() {

@@ -288,25 +297,25 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getFlowPort_IsAtomic() {

-		return (EAttribute)flowPortEClass.getEStructuralFeatures().get(1);

+		return (EAttribute) flowPortEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getFlowPort_IsConjugated() {

-		return (EAttribute)flowPortEClass.getEStructuralFeatures().get(2);

+		return (EAttribute) flowPortEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getFlowProperty() {

@@ -315,26 +324,26 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getFlowProperty_Base_Property() {

-		return (EReference)flowPropertyEClass.getEStructuralFeatures().get(0);

+		return (EReference) flowPropertyEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getFlowProperty_Direction() {

-		return (EAttribute)flowPropertyEClass.getEStructuralFeatures().get(1);

+		return (EAttribute) flowPropertyEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EOperation getFlowProperty__GetIcon() {

@@ -343,7 +352,7 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getFlowSpecification() {

@@ -352,16 +361,16 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getFlowSpecification_Base_Interface() {

-		return (EReference)flowSpecificationEClass.getEStructuralFeatures().get(0);

+		return (EReference) flowSpecificationEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getItemFlow() {

@@ -370,41 +379,42 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getItemFlow_Base_InformationFlow() {

-		return (EReference)itemFlowEClass.getEStructuralFeatures().get(0);

+		return (EReference) itemFlowEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getItemFlow_ItemProperty() {

-		return (EReference)itemFlowEClass.getEStructuralFeatures().get(1);

+		return (EReference) itemFlowEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PortandflowsFactory getPortandflowsFactory() {

-		return (PortandflowsFactory)getEFactoryInstance();

+		return (PortandflowsFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

@@ -413,8 +423,8 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 		setNsURI(eNS_URI);

 

 		// Obtain other dependent packages

-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		TypesPackage theTypesPackage = (TypesPackage) EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

 

 		// Create type parameters

 

@@ -432,17 +442,21 @@ public class PortandflowsPackageImpl extends EPackageImpl implements Portandflow
 		initEOperation(getFlowPort__GetIcon(), theUMLPackage.getImage(), "getIcon", 1, 1, IS_UNIQUE, !IS_ORDERED);

 

 		initEClass(flowPropertyEClass, FlowProperty.class, "FlowProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getFlowProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, FlowProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getFlowProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, FlowProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 		initEAttribute(getFlowProperty_Direction(), this.getFlowDirection(), "direction", "inout", 1, 1, FlowProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEOperation(getFlowProperty__GetIcon(), theUMLPackage.getImage(), "getIcon", 1, 1, IS_UNIQUE, !IS_ORDERED);

 

 		initEClass(flowSpecificationEClass, FlowSpecification.class, "FlowSpecification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getFlowSpecification_Base_Interface(), theUMLPackage.getInterface(), null, "base_Interface", null, 1, 1, FlowSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getFlowSpecification_Base_Interface(), theUMLPackage.getInterface(), null, "base_Interface", null, 1, 1, FlowSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

 

 		initEClass(itemFlowEClass, ItemFlow.class, "ItemFlow", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getItemFlow_Base_InformationFlow(), theUMLPackage.getInformationFlow(), null, "base_InformationFlow", null, 1, 1, ItemFlow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getItemFlow_ItemProperty(), theUMLPackage.getProperty(), null, "itemProperty", null, 0, 1, ItemFlow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getItemFlow_Base_InformationFlow(), theUMLPackage.getInformationFlow(), null, "base_InformationFlow", null, 1, 1, ItemFlow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

+		initEReference(getItemFlow_ItemProperty(), theUMLPackage.getProperty(), null, "itemProperty", null, 0, 1, ItemFlow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 

 		// Initialize enums and add enum literals

 		initEEnum(flowDirectionEEnum, FlowDirection.class, "FlowDirection");

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsAdapterFactory.java
index f755f975604..c9a78507dfb 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,7 +27,7 @@ import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides

  * an adapter <code>createXXX</code> method for each class of the model. <!--

  * end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage

  * @generated

  */

@@ -36,7 +36,7 @@ public class PortandflowsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static PortandflowsPackage modelPackage;

@@ -44,7 +44,7 @@ public class PortandflowsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The switch that delegates to the <code>createXXX</code> methods. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected PortandflowsSwitch<Adapter> modelSwitch = new PortandflowsSwitch<Adapter>() {

@@ -79,11 +79,11 @@ public class PortandflowsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PortandflowsAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = PortandflowsPackage.eINSTANCE;

 		}

 	}

@@ -92,22 +92,22 @@ public class PortandflowsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param target

-	 *        the object to adapt.

+	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

 	@Override

 	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

+		return modelSwitch.doSwitch((EObject) target);

 	}

 

 	/**

 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This

 	 * default implementation returns null. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -121,7 +121,7 @@ public class PortandflowsAdapterFactory extends AdapterFactoryImpl {
 	 * returns null so that we can easily ignore cases; it's useful to ignore a

 	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort

 	 * @generated

@@ -136,7 +136,7 @@ public class PortandflowsAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty

 	 * @generated

@@ -151,7 +151,7 @@ public class PortandflowsAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.portandflows.FlowSpecification

 	 * @generated

@@ -166,7 +166,7 @@ public class PortandflowsAdapterFactory extends AdapterFactoryImpl {
 	 * returns null so that we can easily ignore cases; it's useful to ignore a

 	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.portandflows.ItemFlow

 	 * @generated

@@ -180,17 +180,17 @@ public class PortandflowsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if

 	 * the object is either the model's package or is an instance object of the

 	 * model. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

 	}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceFactoryImpl.java
index 878ad83063b..4c10fd326ff 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.util.PortandflowsResourceImpl

  * @generated

  */

@@ -31,7 +31,7 @@ public class PortandflowsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PortandflowsResourceFactoryImpl() {

@@ -42,7 +42,7 @@ public class PortandflowsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceImpl.java
index 395d256d1b0..7014ac0ed82 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.util.PortandflowsResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class PortandflowsResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public PortandflowsResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsSwitch.java
index d18501dc588..5132c613247 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsSwitch.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsSwitch.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -28,7 +28,7 @@ import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
  * starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the

  * result of the switch. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage

  * @generated

  */

@@ -37,7 +37,7 @@ public class PortandflowsSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static PortandflowsPackage modelPackage;

@@ -46,11 +46,11 @@ public class PortandflowsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PortandflowsSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = PortandflowsPackage.eINSTANCE;

 		}

 	}

@@ -58,7 +58,7 @@ public class PortandflowsSwitch<T> extends Switch<T> {
 	/**

 	 * Checks whether this is a switch for the given package. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -73,9 +73,9 @@ public class PortandflowsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Flow Port</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -89,9 +89,9 @@ public class PortandflowsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation

 	 * returns null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Flow Property</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -105,9 +105,9 @@ public class PortandflowsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation

 	 * returns null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Flow Specification</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -121,9 +121,9 @@ public class PortandflowsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Item Flow</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -137,9 +137,9 @@ public class PortandflowsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch, but this is

 	 * the last case anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -153,43 +153,43 @@ public class PortandflowsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case PortandflowsPackage.FLOW_PORT:

-		{

-			FlowPort flowPort = (FlowPort)theEObject;

+		switch (classifierID) {

+		case PortandflowsPackage.FLOW_PORT: {

+			FlowPort flowPort = (FlowPort) theEObject;

 			T result = caseFlowPort(flowPort);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case PortandflowsPackage.FLOW_PROPERTY:

-		{

-			FlowProperty flowProperty = (FlowProperty)theEObject;

+		case PortandflowsPackage.FLOW_PROPERTY: {

+			FlowProperty flowProperty = (FlowProperty) theEObject;

 			T result = caseFlowProperty(flowProperty);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case PortandflowsPackage.FLOW_SPECIFICATION:

-		{

-			FlowSpecification flowSpecification = (FlowSpecification)theEObject;

+		case PortandflowsPackage.FLOW_SPECIFICATION: {

+			FlowSpecification flowSpecification = (FlowSpecification) theEObject;

 			T result = caseFlowSpecification(flowSpecification);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case PortandflowsPackage.ITEM_FLOW:

-		{

-			ItemFlow itemFlow = (ItemFlow)theEObject;

+		case PortandflowsPackage.ITEM_FLOW: {

+			ItemFlow itemFlow = (ItemFlow) theEObject;

 			T result = caseItemFlow(itemFlow);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

 		default:

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsXMLProcessor.java
index cb8f9f3bab2..300ad7f3a1f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class PortandflowsXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class PortandflowsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PortandflowsXMLProcessor() {

@@ -44,12 +44,12 @@ public class PortandflowsXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the PortandflowsResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new PortandflowsResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new PortandflowsResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Copy.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Copy.java
index bf554f0a441..72f7a2ba3d8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Copy.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Copy.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -16,8 +16,8 @@ package org.eclipse.papyrus.sysml.requirements;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Copy</b></em>'. <!-- end-user-doc -->

- * 

- * 

+ *

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getCopy()

  * @model

  * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/DeriveReqt.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/DeriveReqt.java
index bc09960ece6..8c37f516933 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/DeriveReqt.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/DeriveReqt.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -16,8 +16,8 @@ package org.eclipse.papyrus.sysml.requirements;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Derive Reqt</b></em>'. <!-- end-user-doc -->

- * 

- * 

+ *

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getDeriveReqt()

  * @model

  * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java
index 2a464ee46b8..fa5c1acfd64 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.uml2.uml.NamedElement;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Requirement</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -36,7 +36,7 @@ import org.eclipse.uml2.uml.NamedElement;
  * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getBase_Class <em>Base Class</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement()

  * @model

  * @generated

@@ -50,7 +50,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_Base_Class()

@@ -67,7 +67,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Derived</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Derived</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_Derived()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -84,7 +84,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Derived From</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Derived From</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_DerivedFrom()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -100,7 +100,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Id</em>' attribute.

 	 * @see #setId(String)

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_Id()

@@ -116,7 +116,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Master</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Master</em>' reference.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_Master()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -133,7 +133,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Refined By</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Refined By</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_RefinedBy()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -147,9 +147,9 @@ public interface Requirement extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getRefinedBy()

 	 * @generated

@@ -161,13 +161,13 @@ public interface Requirement extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @param ignoreCase

-	 *        Whether to ignore case in {@link java.lang.String} comparisons.

+	 *            Whether to ignore case in {@link java.lang.String} comparisons.

 	 * @param eClass

-	 *        The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getRefinedBy()

 	 * @generated

@@ -182,7 +182,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Satisfied By</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Satisfied By</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_SatisfiedBy()

 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"

@@ -195,9 +195,9 @@ public interface Requirement extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getSatisfiedBy()

 	 * @generated

@@ -209,13 +209,13 @@ public interface Requirement extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @param ignoreCase

-	 *        Whether to ignore case in {@link java.lang.String} comparisons.

+	 *            Whether to ignore case in {@link java.lang.String} comparisons.

 	 * @param eClass

-	 *        The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getSatisfiedBy()

 	 * @generated

@@ -229,7 +229,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Text</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Text</em>' attribute.

 	 * @see #setText(String)

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_Text()

@@ -246,7 +246,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Traced To</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Traced To</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_TracedTo()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -260,9 +260,9 @@ public interface Requirement extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getTracedTo()

 	 * @generated

@@ -274,13 +274,13 @@ public interface Requirement extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @param ignoreCase

-	 *        Whether to ignore case in {@link java.lang.String} comparisons.

+	 *            Whether to ignore case in {@link java.lang.String} comparisons.

 	 * @param eClass

-	 *        The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getTracedTo()

 	 * @generated

@@ -295,7 +295,7 @@ public interface Requirement extends EObject {
 	 * If the meaning of the '<em>Verified By</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Verified By</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_VerifiedBy()

 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"

@@ -308,9 +308,9 @@ public interface Requirement extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getVerifiedBy()

 	 * @generated

@@ -322,13 +322,13 @@ public interface Requirement extends EObject {
 	 * reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param name

-	 *        The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @param ignoreCase

-	 *        Whether to ignore case in {@link java.lang.String} comparisons.

+	 *            Whether to ignore case in {@link java.lang.String} comparisons.

 	 * @param eClass

-	 *        The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

+	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

 	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

 	 * @see #getVerifiedBy()

 	 * @generated

@@ -339,9 +339,9 @@ public interface Requirement extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Class</em>' reference.

+	 *            the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

 	 * @generated

 	 */

@@ -350,9 +350,9 @@ public interface Requirement extends EObject {
 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getId <em>Id</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Id</em>' attribute.

+	 *            the new value of the '<em>Id</em>' attribute.

 	 * @see #getId()

 	 * @generated

 	 */

@@ -361,9 +361,9 @@ public interface Requirement extends EObject {
 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getText <em>Text</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Text</em>' attribute.

+	 *            the new value of the '<em>Text</em>' attribute.

 	 * @see #getText()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementRelated.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementRelated.java
index c47944c642f..d52d8e7a083 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementRelated.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementRelated.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.uml2.uml.NamedElement;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Requirement Related</b></em> '. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.NamedElement;
  * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies <em>Verifies</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated()

  * @model

  * @generated

@@ -44,7 +44,7 @@ public interface RequirementRelated extends EObject {
 	 * If the meaning of the '<em>Base Named Element</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Named Element</em>' reference.

 	 * @see #setBase_NamedElement(NamedElement)

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_Base_NamedElement()

@@ -61,7 +61,7 @@ public interface RequirementRelated extends EObject {
 	 * If the meaning of the '<em>Refines</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Refines</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_Refines()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -78,7 +78,7 @@ public interface RequirementRelated extends EObject {
 	 * If the meaning of the '<em>Satisfies</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Satisfies</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_Satisfies()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -95,7 +95,7 @@ public interface RequirementRelated extends EObject {
 	 * If the meaning of the '<em>Traced From</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Traced From</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_TracedFrom()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -112,7 +112,7 @@ public interface RequirementRelated extends EObject {
 	 * If the meaning of the '<em>Verifies</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Verifies</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_Verifies()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -126,9 +126,9 @@ public interface RequirementRelated extends EObject {
 	 * reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Named Element</em>' reference.

+	 *            the new value of the '<em>Base Named Element</em>' reference.

 	 * @see #getBase_NamedElement()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsFactory.java
index e2594c97eb0..1e3b8f35e3e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface RequirementsFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	RequirementsFactory eINSTANCE = org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsFactoryImpl.init();

@@ -37,7 +37,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Copy</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Copy</em>'.

 	 * @generated

 	 */

@@ -47,7 +47,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Derive Reqt</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Derive Reqt</em>'.

 	 * @generated

 	 */

@@ -57,7 +57,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Requirement</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Requirement</em>'.

 	 * @generated

 	 */

@@ -66,7 +66,7 @@ public interface RequirementsFactory extends EFactory {
 	/**

 	 * Returns a new object of class '<em>Requirement Related</em>'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Requirement Related</em>'.

 	 * @generated

 	 */

@@ -76,7 +76,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Satisfy</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Satisfy</em>'.

 	 * @generated

 	 */

@@ -86,7 +86,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Test Case</em>'.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Test Case</em>'.

 	 * @generated

 	 */

@@ -96,7 +96,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Verify</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Verify</em>'.

 	 * @generated

 	 */

@@ -106,7 +106,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsPackage.java
index b5a4dc68391..cbae5d0f77a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsFactory

  * @model kind="package"

  * @generated

@@ -46,7 +46,7 @@ public interface RequirementsPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -55,7 +55,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.DeriveReqtImpl <em>Derive Reqt</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.DeriveReqtImpl

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getDeriveReqt()

 		 * @generated

@@ -66,7 +66,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.VerifyImpl

 		 * <em>Verify</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.VerifyImpl

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getVerify()

 		 * @generated

@@ -76,7 +76,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.CopyImpl <em>Copy</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.CopyImpl

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getCopy()

 		 * @generated

@@ -87,7 +87,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.SatisfyImpl

 		 * <em>Satisfy</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.SatisfyImpl

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getSatisfy()

 		 * @generated

@@ -98,7 +98,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl

 		 * <em>Test Case</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getTestCase()

 		 * @generated

@@ -108,7 +108,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Behavior</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference TEST_CASE__BASE_BEHAVIOR = eINSTANCE.getTestCase_Base_Behavior();

@@ -116,7 +116,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Operation</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference TEST_CASE__BASE_OPERATION = eINSTANCE.getTestCase_Base_Operation();

@@ -124,7 +124,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Verifies</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference TEST_CASE__VERIFIES = eINSTANCE.getTestCase_Verifies();

@@ -133,7 +133,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl <em>Requirement</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getRequirement()

 		 * @generated

@@ -143,7 +143,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Text</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute REQUIREMENT__TEXT = eINSTANCE.getRequirement_Text();

@@ -151,7 +151,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute REQUIREMENT__ID = eINSTANCE.getRequirement_Id();

@@ -159,7 +159,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Derived</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT__DERIVED = eINSTANCE.getRequirement_Derived();

@@ -167,7 +167,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Derived From</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT__DERIVED_FROM = eINSTANCE.getRequirement_DerivedFrom();

@@ -175,7 +175,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Satisfied By</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT__SATISFIED_BY = eINSTANCE.getRequirement_SatisfiedBy();

@@ -183,7 +183,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Refined By</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT__REFINED_BY = eINSTANCE.getRequirement_RefinedBy();

@@ -191,7 +191,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Traced To</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT__TRACED_TO = eINSTANCE.getRequirement_TracedTo();

@@ -199,7 +199,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Verified By</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT__VERIFIED_BY = eINSTANCE.getRequirement_VerifiedBy();

@@ -207,7 +207,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Master</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT__MASTER = eINSTANCE.getRequirement_Master();

@@ -215,7 +215,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT__BASE_CLASS = eINSTANCE.getRequirement_Base_Class();

@@ -225,7 +225,7 @@ public interface RequirementsPackage extends EPackage {
 		 * <em>Requirement Related</em>}' class.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl

 		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getRequirementRelated()

 		 * @generated

@@ -235,7 +235,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Base Named Element</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT_RELATED__BASE_NAMED_ELEMENT = eINSTANCE.getRequirementRelated_Base_NamedElement();

@@ -243,7 +243,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Traced From</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT_RELATED__TRACED_FROM = eINSTANCE.getRequirementRelated_TracedFrom();

@@ -251,7 +251,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Satisfies</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT_RELATED__SATISFIES = eINSTANCE.getRequirementRelated_Satisfies();

@@ -259,7 +259,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Refines</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT_RELATED__REFINES = eINSTANCE.getRequirementRelated_Refines();

@@ -267,7 +267,7 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Verifies</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference REQUIREMENT_RELATED__VERIFIES = eINSTANCE.getRequirementRelated_Verifies();

@@ -277,7 +277,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "requirements";

@@ -285,7 +285,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements";

@@ -293,7 +293,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "Requirements";

@@ -302,7 +302,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	RequirementsPackage eINSTANCE = org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl.init();

@@ -311,7 +311,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.DeriveReqtImpl

 	 * <em>Derive Reqt</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.DeriveReqtImpl

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getDeriveReqt()

 	 * @generated

@@ -321,7 +321,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -330,7 +330,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Derive Reqt</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -340,7 +340,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of operations of the '<em>Derive Reqt</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -349,7 +349,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.VerifyImpl <em>Verify</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.VerifyImpl

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getVerify()

 	 * @generated

@@ -359,7 +359,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -368,7 +368,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Verify</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -378,7 +378,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of operations of the '<em>Verify</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -387,7 +387,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.CopyImpl <em>Copy</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.CopyImpl

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getCopy()

 	 * @generated

@@ -397,7 +397,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -406,7 +406,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Copy</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -416,7 +416,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of operations of the '<em>Copy</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -425,7 +425,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.SatisfyImpl <em>Satisfy</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.SatisfyImpl

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getSatisfy()

 	 * @generated

@@ -435,7 +435,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -444,7 +444,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Satisfy</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -454,7 +454,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of operations of the '<em>Satisfy</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -463,7 +463,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl <em>Test Case</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getTestCase()

 	 * @generated

@@ -473,7 +473,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Behavior</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -482,7 +482,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Operation</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -491,7 +491,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Verifies</b></em>' reference list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -500,7 +500,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Test Case</em>' class. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -510,7 +510,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of operations of the '<em>Test Case</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -520,7 +520,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl

 	 * <em>Requirement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getRequirement()

 	 * @generated

@@ -530,7 +530,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Text</b></em>' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -539,7 +539,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Id</b></em>' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -548,7 +548,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Derived</b></em>' reference list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -557,7 +557,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Derived From</b></em>' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -566,7 +566,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Satisfied By</b></em>' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -575,7 +575,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Refined By</b></em>' reference list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -584,7 +584,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Traced To</b></em>' reference list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -593,7 +593,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Verified By</b></em>' reference list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -602,7 +602,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Master</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -611,7 +611,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Class</b></em>' reference. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -620,7 +620,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Requirement</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -630,7 +630,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of operations of the '<em>Requirement</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -641,7 +641,7 @@ public interface RequirementsPackage extends EPackage {
 	 * class.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl

 	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getRequirementRelated()

 	 * @generated

@@ -651,7 +651,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -660,7 +660,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Traced From</b></em>' reference list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -669,7 +669,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Satisfies</b></em>' reference list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -678,7 +678,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Refines</b></em>' reference list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -687,7 +687,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The feature id for the '<em><b>Verifies</b></em>' reference list. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -696,7 +696,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The number of structural features of the '<em>Requirement Related</em>' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -706,7 +706,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of operations of the '<em>Requirement Related</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -715,7 +715,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.requirements.Copy <em>Copy</em>}'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Copy</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Copy

 	 * @generated

@@ -725,7 +725,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.DeriveReqt <em>Derive Reqt</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Derive Reqt</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.DeriveReqt

 	 * @generated

@@ -735,7 +735,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.Requirement <em>Requirement</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Requirement</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement

 	 * @generated

@@ -745,7 +745,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getBase_Class()

 	 * @see #getRequirement()

@@ -756,7 +756,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerived <em>Derived</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Derived</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getDerived()

 	 * @see #getRequirement()

@@ -765,10 +765,9 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirement_Derived();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom <em>Derived From</em>}

-	 * '.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom <em>Derived From</em>} '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Derived From</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom()

 	 * @see #getRequirement()

@@ -779,7 +778,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getId <em>Id</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Id</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getId()

 	 * @see #getRequirement()

@@ -790,7 +789,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getMaster <em>Master</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Master</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getMaster()

 	 * @see #getRequirement()

@@ -801,7 +800,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy <em>Refined By</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Refined By</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy()

 	 * @see #getRequirement()

@@ -810,10 +809,9 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirement_RefinedBy();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy <em>Satisfied By</em>}

-	 * '.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy <em>Satisfied By</em>} '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Satisfied By</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy()

 	 * @see #getRequirement()

@@ -824,7 +822,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getText <em>Text</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Text</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getText()

 	 * @see #getRequirement()

@@ -835,7 +833,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo <em>Traced To</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Traced To</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo()

 	 * @see #getRequirement()

@@ -846,7 +844,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy <em>Verified By</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Verified By</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy()

 	 * @see #getRequirement()

@@ -858,7 +856,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated

 	 * <em>Requirement Related</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Requirement Related</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated

 	 * @generated

@@ -869,7 +867,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getBase_NamedElement

 	 * <em>Base Named Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Named Element</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getBase_NamedElement()

 	 * @see #getRequirementRelated()

@@ -880,7 +878,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines <em>Refines</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Refines</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines()

 	 * @see #getRequirementRelated()

@@ -892,7 +890,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies

 	 * <em>Satisfies</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Satisfies</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies()

 	 * @see #getRequirementRelated()

@@ -904,7 +902,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom

 	 * <em>Traced From</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Traced From</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom()

 	 * @see #getRequirementRelated()

@@ -913,10 +911,9 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementRelated_TracedFrom();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies <em>Verifies</em>}

-	 * '.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies <em>Verifies</em>} '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Verifies</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies()

 	 * @see #getRequirementRelated()

@@ -927,7 +924,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -936,7 +933,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.Satisfy <em>Satisfy</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Satisfy</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Satisfy

 	 * @generated

@@ -946,7 +943,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.TestCase <em>Test Case</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Test Case</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.TestCase

 	 * @generated

@@ -956,7 +953,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Behavior <em>Base Behavior</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Behavior</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Behavior()

 	 * @see #getTestCase()

@@ -967,7 +964,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Operation <em>Base Operation</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Operation</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Operation()

 	 * @see #getTestCase()

@@ -978,7 +975,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies <em>Verifies</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference list '<em>Verifies</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies()

 	 * @see #getTestCase()

@@ -989,7 +986,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.Verify <em>Verify</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Verify</em>'.

 	 * @see org.eclipse.papyrus.sysml.requirements.Verify

 	 * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Satisfy.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Satisfy.java
index 8da5a577c10..dafc2ef8a4e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Satisfy.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Satisfy.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -16,8 +16,8 @@ package org.eclipse.papyrus.sysml.requirements;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Satisfy</b></em>'. <!-- end-user-doc -->

- * 

- * 

+ *

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getSatisfy()

  * @model

  * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/TestCase.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/TestCase.java
index 4efaf5f14dc..1492252e6a7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/TestCase.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/TestCase.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.uml2.uml.Operation;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Test Case</b></em>'. <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.Operation;
  * <li>{@link org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies <em>Verifies</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getTestCase()

  * @model

  * @generated

@@ -43,7 +43,7 @@ public interface TestCase extends EObject {
 	 * If the meaning of the '<em>Base Behavior</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Behavior</em>' reference.

 	 * @see #setBase_Behavior(Behavior)

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getTestCase_Base_Behavior()

@@ -59,7 +59,7 @@ public interface TestCase extends EObject {
 	 * If the meaning of the '<em>Base Operation</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Operation</em>' reference.

 	 * @see #setBase_Operation(Operation)

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getTestCase_Base_Operation()

@@ -76,7 +76,7 @@ public interface TestCase extends EObject {
 	 * If the meaning of the '<em>Verifies</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Verifies</em>' reference list.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getTestCase_Verifies()

 	 * @model transient="true" changeable="false" volatile="true" derived="true"

@@ -89,9 +89,9 @@ public interface TestCase extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Behavior <em>Base Behavior</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Behavior</em>' reference.

+	 *            the new value of the '<em>Base Behavior</em>' reference.

 	 * @see #getBase_Behavior()

 	 * @generated

 	 */

@@ -101,9 +101,9 @@ public interface TestCase extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Operation <em>Base Operation</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param value

-	 *        the new value of the '<em>Base Operation</em>' reference.

+	 *            the new value of the '<em>Base Operation</em>' reference.

 	 * @see #getBase_Operation()

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/VerdictKind.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/VerdictKind.java
index 632af2f392c..42cadbd24b2 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/VerdictKind.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/VerdictKind.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-user-doc --> A representation of the literals of the enumeration ' <em><b>Verdict Kind</b></em>', and utility methods for working with

  * them.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getVerdictKind()

  * @model

  * @generated

@@ -32,7 +32,7 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * The '<em><b>Pass</b></em>' literal object. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #PASS_VALUE

 	 * @generated

 	 * @ordered

@@ -42,7 +42,7 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * The '<em><b>Fail</b></em>' literal object. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #FAIL_VALUE

 	 * @generated

 	 * @ordered

@@ -52,7 +52,7 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * The '<em><b>Inconclusive</b></em>' literal object. <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #INCONCLUSIVE_VALUE

 	 * @generated

 	 * @ordered

@@ -62,7 +62,7 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * The '<em><b>Error</b></em>' literal object. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #ERROR_VALUE

 	 * @generated

 	 * @ordered

@@ -75,7 +75,7 @@ public enum VerdictKind implements Enumerator {
 	 * If the meaning of '<em><b>Pass</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #PASS

 	 * @model name="pass"

 	 * @generated

@@ -89,7 +89,7 @@ public enum VerdictKind implements Enumerator {
 	 * If the meaning of '<em><b>Fail</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #FAIL

 	 * @model name="fail"

 	 * @generated

@@ -103,7 +103,7 @@ public enum VerdictKind implements Enumerator {
 	 * If the meaning of '<em><b>Inconclusive</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #INCONCLUSIVE

 	 * @model name="inconclusive"

 	 * @generated

@@ -117,7 +117,7 @@ public enum VerdictKind implements Enumerator {
 	 * If the meaning of '<em><b>Error</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #ERROR

 	 * @model name="error"

 	 * @generated

@@ -128,15 +128,15 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * An array of all the '<em><b>Verdict Kind</b></em>' enumerators. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

-	private static final VerdictKind[] VALUES_ARRAY = new VerdictKind[]{ PASS, FAIL, INCONCLUSIVE, ERROR, };

+	private static final VerdictKind[] VALUES_ARRAY = new VerdictKind[] { PASS, FAIL, INCONCLUSIVE, ERROR, };

 

 	/**

 	 * A public read-only list of all the '<em><b>Verdict Kind</b></em>'

 	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static final List<VerdictKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -144,11 +144,11 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * Returns the '<em><b>Verdict Kind</b></em>' literal with the specified

 	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static VerdictKind get(int value) {

-		switch(value) {

+		switch (value) {

 		case PASS_VALUE:

 			return PASS;

 		case FAIL_VALUE:

@@ -164,13 +164,13 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * Returns the '<em><b>Verdict Kind</b></em>' literal with the specified

 	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static VerdictKind get(String literal) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			VerdictKind result = VALUES_ARRAY[i];

-			if(result.toString().equals(literal)) {

+			if (result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -180,13 +180,13 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * Returns the '<em><b>Verdict Kind</b></em>' literal with the specified

 	 * name. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static VerdictKind getByName(String name) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			VerdictKind result = VALUES_ARRAY[i];

-			if(result.getName().equals(name)) {

+			if (result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -195,21 +195,21 @@ public enum VerdictKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final int value;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final String name;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final String literal;

@@ -217,7 +217,7 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * Only this class can construct instances. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private VerdictKind(int value, String name, String literal) {

@@ -228,7 +228,7 @@ public enum VerdictKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String getLiteral() {

@@ -237,7 +237,7 @@ public enum VerdictKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String getName() {

@@ -246,7 +246,7 @@ public enum VerdictKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public int getValue() {

@@ -256,7 +256,7 @@ public enum VerdictKind implements Enumerator {
 	/**

 	 * Returns the literal value of the enumerator, which is its string

 	 * representation. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Verify.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Verify.java
index 21c5356aba3..7c2ce97f401 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Verify.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Verify.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -16,8 +16,8 @@ package org.eclipse.papyrus.sysml.requirements;
 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Verify</b></em>'. <!-- end-user-doc -->

- * 

- * 

+ *

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getVerify()

  * @model

  * @generated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/CopyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/CopyImpl.java
index 30446899c02..2b3e84c0de4 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/CopyImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/CopyImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,14 +21,14 @@ import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Copy</b></em>'. <!-- end-user-doc -->

  * <p>

  * </p>

- * 

+ *

  * @generated

  */

 public class CopyImpl extends org.eclipse.uml2.uml.profile.standard.internal.impl.TraceImpl implements Copy {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected CopyImpl() {

@@ -37,7 +37,7 @@ public class CopyImpl extends org.eclipse.uml2.uml.profile.standard.internal.imp
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/DeriveReqtImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/DeriveReqtImpl.java
index 03e10344009..a23e5cc05ce 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/DeriveReqtImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/DeriveReqtImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,14 +21,14 @@ import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Derive Reqt</b></em>'. <!-- end-user-doc -->

  * <p>

  * </p>

- * 

+ *

  * @generated

  */

 public class DeriveReqtImpl extends org.eclipse.uml2.uml.profile.standard.internal.impl.TraceImpl implements DeriveReqt {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected DeriveReqtImpl() {

@@ -37,7 +37,7 @@ public class DeriveReqtImpl extends org.eclipse.uml2.uml.profile.standard.intern
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementImpl.java
index 627e2796bad..6858f4d18f6 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -54,7 +54,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getBase_Class <em>Base Class</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class RequirementImpl extends MinimalEObjectImpl.Container implements Requirement {

@@ -62,7 +62,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * The default value of the '{@link #getText() <em>Text</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getText()

 	 * @generated

 	 * @ordered

@@ -72,7 +72,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * The cached value of the '{@link #getText() <em>Text</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getText()

 	 * @generated

 	 * @ordered

@@ -82,7 +82,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getId()

 	 * @generated

 	 * @ordered

@@ -92,7 +92,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getId()

 	 * @generated

 	 * @ordered

@@ -102,7 +102,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Class()

 	 * @generated

 	 * @ordered

@@ -111,7 +111,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RequirementImpl() {

@@ -120,7 +120,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

@@ -129,7 +129,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public Requirement basicGetMaster() {

@@ -140,20 +140,20 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 		Requirement master = null;

 		Copy currentCopy = null;

 

-		if(getBase_Class() != null) {

+		if (getBase_Class() != null) {

 			Iterator<Dependency> itDep = getBase_Class().getClientDependencies().iterator();

 

 			// Find Copy link

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				Dependency currentDep = itDep.next();

 				currentCopy = UMLUtil.getStereotypeApplication(currentDep, Copy.class);

 

-				if(currentCopy != null) {

+				if (currentCopy != null) {

 					EList<NamedElement> suppliers = currentCopy.getBase_Abstraction().getSuppliers();

 					Iterator<NamedElement> it = suppliers.iterator();

-					while(it.hasNext() && (master == null)) {

+					while (it.hasNext() && (master == null)) {

 						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if(currentRequirement != null) {

+						if (currentRequirement != null) {

 							master = currentRequirement;

 						}

 					}

@@ -165,12 +165,12 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.REQUIREMENT__TEXT:

 			return getText();

 		case RequirementsPackage.REQUIREMENT__ID:

@@ -188,12 +188,14 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 		case RequirementsPackage.REQUIREMENT__VERIFIED_BY:

 			return getVerifiedBy();

 		case RequirementsPackage.REQUIREMENT__MASTER:

-			if(resolve)

+			if (resolve) {

 				return getMaster();

+			}

 			return basicGetMaster();

 		case RequirementsPackage.REQUIREMENT__BASE_CLASS:

-			if(resolve)

+			if (resolve) {

 				return getBase_Class();

+			}

 			return basicGetBase_Class();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -201,12 +203,12 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.REQUIREMENT__TEXT:

 			return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT.equals(text);

 		case RequirementsPackage.REQUIREMENT__ID:

@@ -233,20 +235,20 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.REQUIREMENT__TEXT:

-			setText((String)newValue);

+			setText((String) newValue);

 			return;

 		case RequirementsPackage.REQUIREMENT__ID:

-			setId((String)newValue);

+			setId((String) newValue);

 			return;

 		case RequirementsPackage.REQUIREMENT__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class)newValue);

+			setBase_Class((org.eclipse.uml2.uml.Class) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -254,7 +256,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -264,12 +266,12 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.REQUIREMENT__TEXT:

 			setText(TEXT_EDEFAULT);

 			return;

@@ -277,7 +279,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 			setId(ID_EDEFAULT);

 			return;

 		case RequirementsPackage.REQUIREMENT__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class)null);

+			setBase_Class((org.eclipse.uml2.uml.Class) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -285,16 +287,17 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class getBase_Class() {

-		if(base_Class != null && base_Class.eIsProxy()) {

-			InternalEObject oldBase_Class = (InternalEObject)base_Class;

-			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);

-			if(base_Class != oldBase_Class) {

-				if(eNotificationRequired())

+		if (base_Class != null && base_Class.eIsProxy()) {

+			InternalEObject oldBase_Class = (InternalEObject) base_Class;

+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);

+			if (base_Class != oldBase_Class) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENT__BASE_CLASS, oldBase_Class, base_Class));

+				}

 			}

 		}

 		return base_Class;

@@ -302,7 +305,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<Requirement> getDerived() {

@@ -310,20 +313,20 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 		EList<Requirement> derived = new BasicEList<Requirement>();

 		DeriveReqt currentDeriveReqt = null;

 

-		if(getBase_Class() != null) {

+		if (getBase_Class() != null) {

 			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

 

 			// Find DeriveReqt link

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				DirectedRelationship currentDirectedRelationship = itDep.next();

 				currentDeriveReqt = UMLUtil.getStereotypeApplication(currentDirectedRelationship, DeriveReqt.class);

 

-				if(currentDeriveReqt != null) {

+				if (currentDeriveReqt != null) {

 					EList<NamedElement> clients = currentDeriveReqt.getBase_Abstraction().getClients();

 					Iterator<NamedElement> it = clients.iterator();

-					while(it.hasNext()) {

+					while (it.hasNext()) {

 						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if(currentRequirement != null) {

+						if (currentRequirement != null) {

 							derived.add(currentRequirement);

 						}

 					}

@@ -337,7 +340,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<Requirement> getDerivedFrom() {

@@ -345,20 +348,20 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 		// from

 		EList<Requirement> derivedFrom = new BasicEList<Requirement>();

 		DeriveReqt currentDeriveReqt = null;

-		if(getBase_Class() != null) {

+		if (getBase_Class() != null) {

 			Iterator<DirectedRelationship> itDep = getBase_Class().getSourceDirectedRelationships().iterator();

 

 			// Find DeriveReqt link

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				DirectedRelationship currentDRelationship = itDep.next();

 				currentDeriveReqt = UMLUtil.getStereotypeApplication(currentDRelationship, DeriveReqt.class);

 

-				if(currentDeriveReqt != null) {

+				if (currentDeriveReqt != null) {

 					EList<NamedElement> suppliers = currentDeriveReqt.getBase_Abstraction().getSuppliers();

 					Iterator<NamedElement> it = suppliers.iterator();

-					while(it.hasNext()) {

+					while (it.hasNext()) {

 						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if(currentRequirement != null) {

+						if (currentRequirement != null) {

 							derivedFrom.add(currentRequirement);

 						}

 					}

@@ -372,7 +375,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String getId() {

@@ -381,17 +384,17 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Requirement getMaster() {

 		Requirement master = basicGetMaster();

-		return master != null && master.eIsProxy() ? (Requirement)eResolveProxy((InternalEObject)master) : master;

+		return master != null && master.eIsProxy() ? (Requirement) eResolveProxy((InternalEObject) master) : master;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<NamedElement> getRefinedBy() {

@@ -400,15 +403,15 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 		EList<NamedElement> refinedBy = new BasicEList<NamedElement>();

 		Refine currentRefine = null;

 

-		if(getBase_Class() != null) {

+		if (getBase_Class() != null) {

 			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

 

 			// Find Refine link

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				DirectedRelationship currentDRelationship = itDep.next();

 				currentRefine = UMLUtil.getStereotypeApplication(currentDRelationship, Refine.class);

 

-				if(currentRefine != null) {

+				if (currentRefine != null) {

 					refinedBy.addAll(currentRefine.getBase_Abstraction().getClients());

 				}

 			}

@@ -421,7 +424,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getRefinedBy(String name) {

@@ -431,15 +434,17 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getRefinedBy(String name, boolean ignoreCase, EClass eClass) {

-		refinedByLoop: for(NamedElement refinedBy : getRefinedBy()) {

-			if(eClass != null && !eClass.isInstance(refinedBy))

+		refinedByLoop: for (NamedElement refinedBy : getRefinedBy()) {

+			if (eClass != null && !eClass.isInstance(refinedBy)) {

 				continue refinedByLoop;

-			if(name != null && !(ignoreCase ? name.equalsIgnoreCase(refinedBy.getName()) : name.equals(refinedBy.getName())))

+			}

+			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(refinedBy.getName()) : name.equals(refinedBy.getName()))) {

 				continue refinedByLoop;

+			}

 			return refinedBy;

 		}

 		return null;

@@ -447,7 +452,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<NamedElement> getSatisfiedBy() {

@@ -456,15 +461,15 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 		EList<NamedElement> satisfyBy = new BasicEList<NamedElement>();

 		Satisfy currentSatisfy = null;

 

-		if(getBase_Class() != null) {

+		if (getBase_Class() != null) {

 			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

 

 			// Find Satisfy link

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				DirectedRelationship currentDRelationship = itDep.next();

 				currentSatisfy = UMLUtil.getStereotypeApplication(currentDRelationship, Satisfy.class);

 

-				if(currentSatisfy != null) {

+				if (currentSatisfy != null) {

 					satisfyBy.addAll(currentSatisfy.getBase_Abstraction().getClients());

 				}

 			}

@@ -477,7 +482,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getSatisfiedBy(String name) {

@@ -487,15 +492,17 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getSatisfiedBy(String name, boolean ignoreCase, EClass eClass) {

-		satisfiedByLoop: for(NamedElement satisfiedBy : getSatisfiedBy()) {

-			if(eClass != null && !eClass.isInstance(satisfiedBy))

+		satisfiedByLoop: for (NamedElement satisfiedBy : getSatisfiedBy()) {

+			if (eClass != null && !eClass.isInstance(satisfiedBy)) {

 				continue satisfiedByLoop;

-			if(name != null && !(ignoreCase ? name.equalsIgnoreCase(satisfiedBy.getName()) : name.equals(satisfiedBy.getName())))

+			}

+			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(satisfiedBy.getName()) : name.equals(satisfiedBy.getName()))) {

 				continue satisfiedByLoop;

+			}

 			return satisfiedBy;

 		}

 		return null;

@@ -503,7 +510,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String getText() {

@@ -512,7 +519,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<NamedElement> getTracedTo() {

@@ -523,16 +530,16 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 		EList<NamedElement> tracedTo = new BasicEList<NamedElement>();

 		Trace currentTrace = null;

 

-		if(getBase_Class() != null) {

+		if (getBase_Class() != null) {

 			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

 

 			// Find Trace link

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				DirectedRelationship currentDR = itDep.next();

 				currentTrace = UMLUtil.getStereotypeApplication(currentDR, Trace.class);

 

 				// Must be a Trace not a subtype (see bug #352563).

-				if((currentTrace != null) && (currentTrace.eClass() == StandardPackage.eINSTANCE.getTrace())) {

+				if ((currentTrace != null) && (currentTrace.eClass() == StandardPackage.eINSTANCE.getTrace())) {

 					EList<NamedElement> suppliers = currentTrace.getBase_Abstraction().getClients();

 					tracedTo.addAll(suppliers);

 				}

@@ -546,7 +553,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getTracedTo(String name) {

@@ -556,15 +563,17 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getTracedTo(String name, boolean ignoreCase, EClass eClass) {

-		tracedToLoop: for(NamedElement tracedTo : getTracedTo()) {

-			if(eClass != null && !eClass.isInstance(tracedTo))

+		tracedToLoop: for (NamedElement tracedTo : getTracedTo()) {

+			if (eClass != null && !eClass.isInstance(tracedTo)) {

 				continue tracedToLoop;

-			if(name != null && !(ignoreCase ? name.equalsIgnoreCase(tracedTo.getName()) : name.equals(tracedTo.getName())))

+			}

+			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(tracedTo.getName()) : name.equals(tracedTo.getName()))) {

 				continue tracedToLoop;

+			}

 			return tracedTo;

 		}

 		return null;

@@ -572,7 +581,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<NamedElement> getVerifiedBy() {

@@ -581,15 +590,15 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 		EList<NamedElement> verifiedBy = new BasicEList<NamedElement>();

 		Verify currentVerify = null;

 

-		if(getBase_Class() != null) {

+		if (getBase_Class() != null) {

 			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

 

 			// Find Verify link

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				DirectedRelationship currentDRelationship = itDep.next();

 				currentVerify = UMLUtil.getStereotypeApplication(currentDRelationship, Verify.class);

 

-				if(currentVerify != null) {

+				if (currentVerify != null) {

 					verifiedBy.addAll(currentVerify.getBase_Abstraction().getClients());

 				}

 			}

@@ -602,7 +611,7 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getVerifiedBy(String name) {

@@ -612,15 +621,17 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getVerifiedBy(String name, boolean ignoreCase, EClass eClass) {

-		verifiedByLoop: for(NamedElement verifiedBy : getVerifiedBy()) {

-			if(eClass != null && !eClass.isInstance(verifiedBy))

+		verifiedByLoop: for (NamedElement verifiedBy : getVerifiedBy()) {

+			if (eClass != null && !eClass.isInstance(verifiedBy)) {

 				continue verifiedByLoop;

-			if(name != null && !(ignoreCase ? name.equalsIgnoreCase(verifiedBy.getName()) : name.equals(verifiedBy.getName())))

+			}

+			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(verifiedBy.getName()) : name.equals(verifiedBy.getName()))) {

 				continue verifiedByLoop;

+			}

 			return verifiedBy;

 		}

 		return null;

@@ -628,31 +639,33 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {

 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;

 		base_Class = newBase_Class;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__BASE_CLASS, oldBase_Class, base_Class));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setId(String newId) {

 		String oldId = id;

 		id = newId;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__ID, oldId, id));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public void setMaster(Requirement newMaster) {

@@ -661,25 +674,27 @@ public class RequirementImpl extends MinimalEObjectImpl.Container implements Req
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setText(String newText) {

 		String oldText = text;

 		text = newText;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__TEXT, oldText, text));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy())

+		if (eIsProxy()) {

 			return super.toString();

+		}

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (text: ");

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementRelatedImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementRelatedImpl.java
index f4b124a8334..3302f43eae5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementRelatedImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementRelatedImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -48,7 +48,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl#getVerifies <em>Verifies</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class RequirementRelatedImpl extends MinimalEObjectImpl.Container implements RequirementRelated {

@@ -57,7 +57,7 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 	 * The cached value of the '{@link #getBase_NamedElement() <em>Base Named Element</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_NamedElement()

 	 * @generated

 	 * @ordered

@@ -66,7 +66,7 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RequirementRelatedImpl() {

@@ -75,7 +75,7 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement basicGetBase_NamedElement() {

@@ -84,15 +84,16 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT:

-			if(resolve)

+			if (resolve) {

 				return getBase_NamedElement();

+			}

 			return basicGetBase_NamedElement();

 		case RequirementsPackage.REQUIREMENT_RELATED__TRACED_FROM:

 			return getTracedFrom();

@@ -108,12 +109,12 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT:

 			return base_NamedElement != null;

 		case RequirementsPackage.REQUIREMENT_RELATED__TRACED_FROM:

@@ -130,14 +131,14 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT:

-			setBase_NamedElement((NamedElement)newValue);

+			setBase_NamedElement((NamedElement) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -145,7 +146,7 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -155,14 +156,14 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT:

-			setBase_NamedElement((NamedElement)null);

+			setBase_NamedElement((NamedElement) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -170,16 +171,17 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NamedElement getBase_NamedElement() {

-		if(base_NamedElement != null && base_NamedElement.eIsProxy()) {

-			InternalEObject oldBase_NamedElement = (InternalEObject)base_NamedElement;

-			base_NamedElement = (NamedElement)eResolveProxy(oldBase_NamedElement);

-			if(base_NamedElement != oldBase_NamedElement) {

-				if(eNotificationRequired())

+		if (base_NamedElement != null && base_NamedElement.eIsProxy()) {

+			InternalEObject oldBase_NamedElement = (InternalEObject) base_NamedElement;

+			base_NamedElement = (NamedElement) eResolveProxy(oldBase_NamedElement);

+			if (base_NamedElement != oldBase_NamedElement) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));

+				}

 			}

 		}

 		return base_NamedElement;

@@ -187,7 +189,7 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<Requirement> getRefines() {

@@ -195,20 +197,20 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 		EList<Requirement> refines = new BasicEList<Requirement>();

 		Refine currentRefine = null;

 

-		if(getBase_NamedElement() != null) {

+		if (getBase_NamedElement() != null) {

 			// Find Refine link

 			Iterator<Dependency> itDep = getBase_NamedElement().getClientDependencies().iterator();

 

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				Dependency currentDependency = itDep.next();

 				currentRefine = UMLUtil.getStereotypeApplication(currentDependency, Refine.class);

 

-				if(currentRefine != null) {

+				if (currentRefine != null) {

 					EList<NamedElement> suppliers = currentRefine.getBase_Abstraction().getSuppliers();

 					Iterator<NamedElement> it = suppliers.iterator();

-					while(it.hasNext()) {

+					while (it.hasNext()) {

 						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if(currentRequirement != null) {

+						if (currentRequirement != null) {

 							refines.add(currentRequirement);

 						}

 					}

@@ -222,7 +224,7 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<Requirement> getSatisfies() {

@@ -230,20 +232,20 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 		EList<Requirement> satisfies = new BasicEList<Requirement>();

 		Satisfy currentSatisfy = null;

 

-		if(getBase_NamedElement() != null) {

+		if (getBase_NamedElement() != null) {

 			// Find Satisfy link

 			Iterator<Dependency> itDep = getBase_NamedElement().getClientDependencies().iterator();

 

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				Dependency currentDependency = itDep.next();

 				currentSatisfy = UMLUtil.getStereotypeApplication(currentDependency, Satisfy.class);

 

-				if(currentSatisfy != null) {

+				if (currentSatisfy != null) {

 					EList<NamedElement> suppliers = currentSatisfy.getBase_Abstraction().getSuppliers();

 					Iterator<NamedElement> it = suppliers.iterator();

-					while(it.hasNext()) {

+					while (it.hasNext()) {

 						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if(currentRequirement != null) {

+						if (currentRequirement != null) {

 							satisfies.add(currentRequirement);

 						}

 					}

@@ -257,7 +259,7 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<Requirement> getTracedFrom() {

@@ -269,22 +271,22 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 		EList<Requirement> tracedFrom = new BasicEList<Requirement>();

 		Trace currentTrace = null;

 

-		if(getBase_NamedElement() != null) {

+		if (getBase_NamedElement() != null) {

 			// Find Trace link

 			EList<DirectedRelationship> relationships = getBase_NamedElement().getSourceDirectedRelationships();

 			Iterator<DirectedRelationship> itDep = relationships.iterator();

 

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				DirectedRelationship currentDRelationship = itDep.next();

 				currentTrace = UMLUtil.getStereotypeApplication(currentDRelationship, Trace.class);

 

 				// Must be a Trace not a subtype (see bug #352563).

-				if((currentTrace != null) && (currentTrace.eClass() == StandardPackage.eINSTANCE.getTrace())) {

+				if ((currentTrace != null) && (currentTrace.eClass() == StandardPackage.eINSTANCE.getTrace())) {

 					EList<NamedElement> clients = currentTrace.getBase_Abstraction().getSuppliers();

 					Iterator<NamedElement> it = clients.iterator();

-					while(it.hasNext()) {

+					while (it.hasNext()) {

 						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if(currentRequirement != null) {

+						if (currentRequirement != null) {

 							tracedFrom.add(currentRequirement);

 						}

 					}

@@ -298,7 +300,7 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<Requirement> getVerifies() {

@@ -306,20 +308,20 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 		EList<Requirement> verifies = new BasicEList<Requirement>();

 		Verify currentVerify = null;

 

-		if(getBase_NamedElement() != null) {

+		if (getBase_NamedElement() != null) {

 			// Find Satisfy link

 			Iterator<Dependency> itDep = getBase_NamedElement().getClientDependencies().iterator();

 

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				Dependency currentDependency = itDep.next();

 				currentVerify = UMLUtil.getStereotypeApplication(currentDependency, Verify.class);

 

-				if(currentVerify != null) {

+				if (currentVerify != null) {

 					EList<NamedElement> suppliers = currentVerify.getBase_Abstraction().getSuppliers();

 					Iterator<NamedElement> it = suppliers.iterator();

-					while(it.hasNext()) {

+					while (it.hasNext()) {

 						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if(currentRequirement != null) {

+						if (currentRequirement != null) {

 							verifies.add(currentRequirement);

 						}

 					}

@@ -334,14 +336,15 @@ public class RequirementRelatedImpl extends MinimalEObjectImpl.Container impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_NamedElement(NamedElement newBase_NamedElement) {

 		NamedElement oldBase_NamedElement = base_NamedElement;

 		base_NamedElement = newBase_NamedElement;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));

+		}

 	}

 

 } // RequirementRelatedImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsFactoryImpl.java
index bda2510dfe9..19ecac49983 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -31,14 +31,14 @@ import org.eclipse.papyrus.sysml.requirements.Verify;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class RequirementsFactoryImpl extends EFactoryImpl implements RequirementsFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -51,13 +51,13 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static RequirementsFactory init() {

 		try {

-			RequirementsFactory theRequirementsFactory = (RequirementsFactory)EPackage.Registry.INSTANCE.getEFactory(RequirementsPackage.eNS_URI);

-			if(theRequirementsFactory != null) {

+			RequirementsFactory theRequirementsFactory = (RequirementsFactory) EPackage.Registry.INSTANCE.getEFactory(RequirementsPackage.eNS_URI);

+			if (theRequirementsFactory != null) {

 				return theRequirementsFactory;

 			}

 		} catch (Exception exception) {

@@ -70,7 +70,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementsFactoryImpl() {

@@ -79,12 +79,12 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		case RequirementsPackage.DERIVE_REQT:

 			return createDeriveReqt();

 		case RequirementsPackage.VERIFY:

@@ -106,7 +106,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Copy createCopy() {

@@ -116,7 +116,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public DeriveReqt createDeriveReqt() {

@@ -126,7 +126,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Requirement createRequirement() {

@@ -136,7 +136,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementRelated createRequirementRelated() {

@@ -146,7 +146,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Satisfy createSatisfy() {

@@ -156,7 +156,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public TestCase createTestCase() {

@@ -166,7 +166,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Verify createVerify() {

@@ -176,11 +176,11 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementsPackage getRequirementsPackage() {

-		return (RequirementsPackage)getEPackage();

+		return (RequirementsPackage) getEPackage();

 	}

 

 } // RequirementsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsPackageImpl.java
index c932e814425..573a688091c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -54,36 +54,37 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class RequirementsPackageImpl extends EPackageImpl implements RequirementsPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link RequirementsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link RequirementsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc

+	 * -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static RequirementsPackage init() {

-		if(isInited)

-			return (RequirementsPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);

+		if (isInited) {

+			return (RequirementsPackage) EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RequirementsPackageImpl());

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RequirementsPackageImpl());

 

 		isInited = true;

 

@@ -91,16 +92,24 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theRequirementsPackage.createPackageContents();

@@ -139,63 +148,63 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass deriveReqtEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass verifyEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass copyEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass satisfyEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass testCaseEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass requirementEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass requirementRelatedEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -205,9 +214,8 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#eNS_URI

 	 * @see #init()

@@ -222,12 +230,13 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create classes and their features

@@ -266,7 +275,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getCopy() {

@@ -275,7 +284,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getDeriveReqt() {

@@ -284,7 +293,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getRequirement() {

@@ -293,97 +302,97 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirement_Base_Class() {

-		return (EReference)requirementEClass.getEStructuralFeatures().get(9);

+		return (EReference) requirementEClass.getEStructuralFeatures().get(9);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirement_Derived() {

-		return (EReference)requirementEClass.getEStructuralFeatures().get(2);

+		return (EReference) requirementEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirement_DerivedFrom() {

-		return (EReference)requirementEClass.getEStructuralFeatures().get(3);

+		return (EReference) requirementEClass.getEStructuralFeatures().get(3);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getRequirement_Id() {

-		return (EAttribute)requirementEClass.getEStructuralFeatures().get(1);

+		return (EAttribute) requirementEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirement_Master() {

-		return (EReference)requirementEClass.getEStructuralFeatures().get(8);

+		return (EReference) requirementEClass.getEStructuralFeatures().get(8);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirement_RefinedBy() {

-		return (EReference)requirementEClass.getEStructuralFeatures().get(5);

+		return (EReference) requirementEClass.getEStructuralFeatures().get(5);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirement_SatisfiedBy() {

-		return (EReference)requirementEClass.getEStructuralFeatures().get(4);

+		return (EReference) requirementEClass.getEStructuralFeatures().get(4);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EAttribute getRequirement_Text() {

-		return (EAttribute)requirementEClass.getEStructuralFeatures().get(0);

+		return (EAttribute) requirementEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirement_TracedTo() {

-		return (EReference)requirementEClass.getEStructuralFeatures().get(6);

+		return (EReference) requirementEClass.getEStructuralFeatures().get(6);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirement_VerifiedBy() {

-		return (EReference)requirementEClass.getEStructuralFeatures().get(7);

+		return (EReference) requirementEClass.getEStructuralFeatures().get(7);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getRequirementRelated() {

@@ -392,61 +401,61 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirementRelated_Base_NamedElement() {

-		return (EReference)requirementRelatedEClass.getEStructuralFeatures().get(0);

+		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirementRelated_Refines() {

-		return (EReference)requirementRelatedEClass.getEStructuralFeatures().get(3);

+		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(3);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirementRelated_Satisfies() {

-		return (EReference)requirementRelatedEClass.getEStructuralFeatures().get(2);

+		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirementRelated_TracedFrom() {

-		return (EReference)requirementRelatedEClass.getEStructuralFeatures().get(1);

+		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getRequirementRelated_Verifies() {

-		return (EReference)requirementRelatedEClass.getEStructuralFeatures().get(4);

+		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(4);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementsFactory getRequirementsFactory() {

-		return (RequirementsFactory)getEFactoryInstance();

+		return (RequirementsFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getSatisfy() {

@@ -455,7 +464,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getTestCase() {

@@ -464,34 +473,34 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getTestCase_Base_Behavior() {

-		return (EReference)testCaseEClass.getEStructuralFeatures().get(0);

+		return (EReference) testCaseEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getTestCase_Base_Operation() {

-		return (EReference)testCaseEClass.getEStructuralFeatures().get(1);

+		return (EReference) testCaseEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EReference getTestCase_Verifies() {

-		return (EReference)testCaseEClass.getEStructuralFeatures().get(2);

+		return (EReference) testCaseEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EClass getVerify() {

@@ -502,12 +511,13 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

@@ -516,9 +526,9 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 		setNsURI(eNS_URI);

 

 		// Obtain other dependent packages

-		StandardPackage theStandardPackage = (StandardPackage)EPackage.Registry.INSTANCE.getEPackage(StandardPackage.eNS_URI);

-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

+		StandardPackage theStandardPackage = (StandardPackage) EPackage.Registry.INSTANCE.getEPackage(StandardPackage.eNS_URI);

+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		TypesPackage theTypesPackage = (TypesPackage) EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

 

 		// Create type parameters

 

@@ -540,8 +550,10 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 		initEClass(satisfyEClass, Satisfy.class, "Satisfy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

 		initEClass(testCaseEClass, TestCase.class, "TestCase", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getTestCase_Base_Behavior(), theUMLPackage.getBehavior(), null, "base_Behavior", null, 1, 1, TestCase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getTestCase_Base_Operation(), theUMLPackage.getOperation(), null, "base_Operation", null, 1, 1, TestCase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getTestCase_Base_Behavior(), theUMLPackage.getBehavior(), null, "base_Behavior", null, 1, 1, TestCase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

+		initEReference(getTestCase_Base_Operation(), theUMLPackage.getOperation(), null, "base_Operation", null, 1, 1, TestCase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 		initEReference(getTestCase_Verifies(), this.getRequirement(), null, "verifies", null, 0, -1, TestCase.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

 

 		initEClass(requirementEClass, Requirement.class, "Requirement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

@@ -549,19 +561,29 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 		initEAttribute(getRequirement_Id(), theTypesPackage.getString(), "id", null, 1, 1, Requirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getRequirement_Derived(), this.getRequirement(), null, "derived", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

 		initEReference(getRequirement_DerivedFrom(), this.getRequirement(), null, "derivedFrom", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_SatisfiedBy(), theUMLPackage.getNamedElement(), null, "satisfiedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_RefinedBy(), theUMLPackage.getNamedElement(), null, "refinedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_TracedTo(), theUMLPackage.getNamedElement(), null, "tracedTo", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_VerifiedBy(), theUMLPackage.getNamedElement(), null, "verifiedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

+		initEReference(getRequirement_SatisfiedBy(), theUMLPackage.getNamedElement(), null, "satisfiedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

+		initEReference(getRequirement_RefinedBy(), theUMLPackage.getNamedElement(), null, "refinedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

+		initEReference(getRequirement_TracedTo(), theUMLPackage.getNamedElement(), null, "tracedTo", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

+		initEReference(getRequirement_VerifiedBy(), theUMLPackage.getNamedElement(), null, "verifiedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

 		initEReference(getRequirement_Master(), this.getRequirement(), null, "master", null, 0, 1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, Requirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getRequirement_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, Requirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

+				!IS_ORDERED);

 

 		initEClass(requirementRelatedEClass, RequirementRelated.class, "RequirementRelated", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRequirementRelated_Base_NamedElement(), theUMLPackage.getNamedElement(), null, "base_NamedElement", null, 1, 1, RequirementRelated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirementRelated_TracedFrom(), this.getRequirement(), null, "tracedFrom", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirementRelated_Satisfies(), this.getRequirement(), null, "satisfies", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirementRelated_Refines(), this.getRequirement(), null, "refines", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirementRelated_Verifies(), this.getRequirement(), null, "verifies", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

+		initEReference(getRequirementRelated_Base_NamedElement(), theUMLPackage.getNamedElement(), null, "base_NamedElement", null, 1, 1, RequirementRelated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getRequirementRelated_TracedFrom(), this.getRequirement(), null, "tracedFrom", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

+		initEReference(getRequirementRelated_Satisfies(), this.getRequirement(), null, "satisfies", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

+		initEReference(getRequirementRelated_Refines(), this.getRequirement(), null, "refines", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

+		initEReference(getRequirementRelated_Verifies(), this.getRequirement(), null, "verifies", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

+				!IS_ORDERED);

 	}

 

 } // RequirementsPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/SatisfyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/SatisfyImpl.java
index 918b79b6ea4..7e3d5226746 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/SatisfyImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/SatisfyImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,14 +21,14 @@ import org.eclipse.papyrus.sysml.requirements.Satisfy;
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Satisfy</b></em>'. <!-- end-user-doc -->

  * <p>

  * </p>

- * 

+ *

  * @generated

  */

 public class SatisfyImpl extends org.eclipse.uml2.uml.profile.standard.internal.impl.TraceImpl implements Satisfy {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected SatisfyImpl() {

@@ -37,7 +37,7 @@ public class SatisfyImpl extends org.eclipse.uml2.uml.profile.standard.internal.
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/TestCaseImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/TestCaseImpl.java
index bba8f3bdc14..977b9858d77 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/TestCaseImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/TestCaseImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -42,7 +42,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl#getVerifies <em>Verifies</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCase {

@@ -51,7 +51,7 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 	 * The cached value of the '{@link #getBase_Behavior() <em>Base Behavior</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Behavior()

 	 * @generated

 	 * @ordered

@@ -62,7 +62,7 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 	 * The cached value of the '{@link #getBase_Operation() <em>Base Operation</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Operation()

 	 * @generated

 	 * @ordered

@@ -71,7 +71,7 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected TestCaseImpl() {

@@ -80,7 +80,7 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Behavior basicGetBase_Behavior() {

@@ -89,7 +89,7 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Operation basicGetBase_Operation() {

@@ -98,19 +98,21 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.TEST_CASE__BASE_BEHAVIOR:

-			if(resolve)

+			if (resolve) {

 				return getBase_Behavior();

+			}

 			return basicGetBase_Behavior();

 		case RequirementsPackage.TEST_CASE__BASE_OPERATION:

-			if(resolve)

+			if (resolve) {

 				return getBase_Operation();

+			}

 			return basicGetBase_Operation();

 		case RequirementsPackage.TEST_CASE__VERIFIES:

 			return getVerifies();

@@ -120,12 +122,12 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.TEST_CASE__BASE_BEHAVIOR:

 			return base_Behavior != null;

 		case RequirementsPackage.TEST_CASE__BASE_OPERATION:

@@ -138,17 +140,17 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.TEST_CASE__BASE_BEHAVIOR:

-			setBase_Behavior((Behavior)newValue);

+			setBase_Behavior((Behavior) newValue);

 			return;

 		case RequirementsPackage.TEST_CASE__BASE_OPERATION:

-			setBase_Operation((Operation)newValue);

+			setBase_Operation((Operation) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -156,7 +158,7 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -166,17 +168,17 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

+		switch (featureID) {

 		case RequirementsPackage.TEST_CASE__BASE_BEHAVIOR:

-			setBase_Behavior((Behavior)null);

+			setBase_Behavior((Behavior) null);

 			return;

 		case RequirementsPackage.TEST_CASE__BASE_OPERATION:

-			setBase_Operation((Operation)null);

+			setBase_Operation((Operation) null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -184,16 +186,17 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Behavior getBase_Behavior() {

-		if(base_Behavior != null && base_Behavior.eIsProxy()) {

-			InternalEObject oldBase_Behavior = (InternalEObject)base_Behavior;

-			base_Behavior = (Behavior)eResolveProxy(oldBase_Behavior);

-			if(base_Behavior != oldBase_Behavior) {

-				if(eNotificationRequired())

+		if (base_Behavior != null && base_Behavior.eIsProxy()) {

+			InternalEObject oldBase_Behavior = (InternalEObject) base_Behavior;

+			base_Behavior = (Behavior) eResolveProxy(oldBase_Behavior);

+			if (base_Behavior != oldBase_Behavior) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.TEST_CASE__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));

+				}

 			}

 		}

 		return base_Behavior;

@@ -201,16 +204,17 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Operation getBase_Operation() {

-		if(base_Operation != null && base_Operation.eIsProxy()) {

-			InternalEObject oldBase_Operation = (InternalEObject)base_Operation;

-			base_Operation = (Operation)eResolveProxy(oldBase_Operation);

-			if(base_Operation != oldBase_Operation) {

-				if(eNotificationRequired())

+		if (base_Operation != null && base_Operation.eIsProxy()) {

+			InternalEObject oldBase_Operation = (InternalEObject) base_Operation;

+			base_Operation = (Operation) eResolveProxy(oldBase_Operation);

+			if (base_Operation != oldBase_Operation) {

+				if (eNotificationRequired()) {

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.TEST_CASE__BASE_OPERATION, oldBase_Operation, base_Operation));

+				}

 			}

 		}

 		return base_Operation;

@@ -218,7 +222,7 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

 	public EList<Requirement> getVerifies() {

@@ -226,25 +230,25 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 		EList<Requirement> verifies = new BasicEList<Requirement>();

 		Verify currentVerify = null;

 

-		if((getBase_Behavior() != null) || (getBase_Operation() != null)) {

+		if ((getBase_Behavior() != null) || (getBase_Operation() != null)) {

 			// Find Verify link

 			Iterator<Dependency> itDep;

-			if(getBase_Behavior() != null) {

+			if (getBase_Behavior() != null) {

 				itDep = getBase_Behavior().getClientDependencies().iterator();

 			} else { // if (getBase_Operation() != null)

 				itDep = getBase_Operation().getClientDependencies().iterator();

 			}

 

-			while(itDep.hasNext()) {

+			while (itDep.hasNext()) {

 				Dependency currentDependency = itDep.next();

 				currentVerify = UMLUtil.getStereotypeApplication(currentDependency, Verify.class);

 

-				if(currentVerify != null) {

+				if (currentVerify != null) {

 					EList<NamedElement> suppliers = currentVerify.getBase_Abstraction().getSuppliers();

 					Iterator<NamedElement> it = suppliers.iterator();

-					while(it.hasNext()) {

+					while (it.hasNext()) {

 						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if(currentRequirement != null) {

+						if (currentRequirement != null) {

 							verifies.add(currentRequirement);

 						}

 					}

@@ -258,26 +262,28 @@ public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCa
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Behavior(Behavior newBase_Behavior) {

 		Behavior oldBase_Behavior = base_Behavior;

 		base_Behavior = newBase_Behavior;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.TEST_CASE__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));

+		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void setBase_Operation(Operation newBase_Operation) {

 		Operation oldBase_Operation = base_Operation;

 		base_Operation = newBase_Operation;

-		if(eNotificationRequired())

+		if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.TEST_CASE__BASE_OPERATION, oldBase_Operation, base_Operation));

+		}

 	}

 

 } // TestCaseImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/VerifyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/VerifyImpl.java
index a7d0d8755b7..c51d0c58864 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/VerifyImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/VerifyImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,14 +21,14 @@ import org.eclipse.papyrus.sysml.requirements.Verify;
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Verify</b></em>'. <!-- end-user-doc -->

  * <p>

  * </p>

- * 

+ *

  * @generated

  */

 public class VerifyImpl extends org.eclipse.uml2.uml.profile.standard.internal.impl.TraceImpl implements Verify {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected VerifyImpl() {

@@ -37,7 +37,7 @@ public class VerifyImpl extends org.eclipse.uml2.uml.profile.standard.internal.i
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsAdapterFactory.java
index 5e85a44e059..d7e1e56a56b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -30,7 +30,7 @@ import org.eclipse.papyrus.sysml.requirements.Verify;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides

  * an adapter <code>createXXX</code> method for each class of the model. <!--

  * end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage

  * @generated

  */

@@ -39,7 +39,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static RequirementsPackage modelPackage;

@@ -47,7 +47,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The switch that delegates to the <code>createXXX</code> methods. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RequirementsSwitch<Adapter> modelSwitch = new RequirementsSwitch<Adapter>() {

@@ -102,11 +102,11 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementsAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = RequirementsPackage.eINSTANCE;

 		}

 	}

@@ -115,15 +115,15 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param target

-	 *        the object to adapt.

+	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

 	@Override

 	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

+		return modelSwitch.doSwitch((EObject) target);

 	}

 

 	/**

@@ -131,7 +131,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * begin-user-doc --> This default implementation returns null so that we

 	 * can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.Copy

 	 * @generated

@@ -146,7 +146,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.DeriveReqt

 	 * @generated

@@ -159,7 +159,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This

 	 * default implementation returns null. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -173,7 +173,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement

 	 * @generated

@@ -188,7 +188,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated

 	 * @generated

@@ -202,7 +202,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.Satisfy

 	 * @generated

@@ -217,7 +217,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * returns null so that we can easily ignore cases; it's useful to ignore a

 	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.TestCase

 	 * @generated

@@ -231,7 +231,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * begin-user-doc --> This default implementation returns null so that we

 	 * can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.uml.standard.Trace

 	 * @generated

@@ -245,7 +245,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.Verify

 	 * @generated

@@ -259,17 +259,17 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if

 	 * the object is either the model's package or is an instance object of the

 	 * model. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

 	}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceFactoryImpl.java
index 62c68e695c6..9c3d4b36d38 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.util.RequirementsResourceImpl

  * @generated

  */

@@ -31,7 +31,7 @@ public class RequirementsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementsResourceFactoryImpl() {

@@ -42,7 +42,7 @@ public class RequirementsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceImpl.java
index e4491bf2a6e..195efc32eb9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.util.RequirementsResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class RequirementsResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public RequirementsResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsSwitch.java
index 3de0cf764f4..57c27806a1c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsSwitch.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsSwitch.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -24,7 +24,7 @@ import org.eclipse.papyrus.sysml.requirements.*;
  * starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the

  * result of the switch. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage

  * @generated

  */

@@ -33,7 +33,7 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static RequirementsPackage modelPackage;

@@ -42,11 +42,11 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementsSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = RequirementsPackage.eINSTANCE;

 		}

 	}

@@ -54,7 +54,7 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	/**

 	 * Checks whether this is a switch for the given package. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -68,9 +68,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of ' <em>Copy</em>'. <!-- begin-user-doc --> This implementation returns null;

 	 * returning a non-null result will terminate the switch. <!-- end-user-doc

 	 * -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of ' <em>Copy</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -84,9 +84,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation

 	 * returns null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Derive Reqt</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -100,9 +100,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation

 	 * returns null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Requirement</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -116,9 +116,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This

 	 * implementation returns null; returning a non-null result will terminate

 	 * the switch. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Requirement Related</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -133,9 +133,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Trace</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -149,9 +149,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Satisfy</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -165,9 +165,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Test Case</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -181,9 +181,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch. <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Verify</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -197,9 +197,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns

 	 * null; returning a non-null result will terminate the switch, but this is

 	 * the last case anyway. <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

-	 *        the target of the switch.

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -213,75 +213,79 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case RequirementsPackage.DERIVE_REQT:

-		{

-			DeriveReqt deriveReqt = (DeriveReqt)theEObject;

+		switch (classifierID) {

+		case RequirementsPackage.DERIVE_REQT: {

+			DeriveReqt deriveReqt = (DeriveReqt) theEObject;

 			T result = caseDeriveReqt(deriveReqt);

-			if(result == null)

+			if (result == null) {

 				result = caseTrace(deriveReqt);

-			if(result == null)

+			}

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case RequirementsPackage.VERIFY:

-		{

-			Verify verify = (Verify)theEObject;

+		case RequirementsPackage.VERIFY: {

+			Verify verify = (Verify) theEObject;

 			T result = caseVerify(verify);

-			if(result == null)

+			if (result == null) {

 				result = caseTrace(verify);

-			if(result == null)

+			}

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case RequirementsPackage.COPY:

-		{

-			Copy copy = (Copy)theEObject;

+		case RequirementsPackage.COPY: {

+			Copy copy = (Copy) theEObject;

 			T result = caseCopy(copy);

-			if(result == null)

+			if (result == null) {

 				result = caseTrace(copy);

-			if(result == null)

+			}

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case RequirementsPackage.SATISFY:

-		{

-			Satisfy satisfy = (Satisfy)theEObject;

+		case RequirementsPackage.SATISFY: {

+			Satisfy satisfy = (Satisfy) theEObject;

 			T result = caseSatisfy(satisfy);

-			if(result == null)

+			if (result == null) {

 				result = caseTrace(satisfy);

-			if(result == null)

+			}

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case RequirementsPackage.TEST_CASE:

-		{

-			TestCase testCase = (TestCase)theEObject;

+		case RequirementsPackage.TEST_CASE: {

+			TestCase testCase = (TestCase) theEObject;

 			T result = caseTestCase(testCase);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case RequirementsPackage.REQUIREMENT:

-		{

-			Requirement requirement = (Requirement)theEObject;

+		case RequirementsPackage.REQUIREMENT: {

+			Requirement requirement = (Requirement) theEObject;

 			T result = caseRequirement(requirement);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

-		case RequirementsPackage.REQUIREMENT_RELATED:

-		{

-			RequirementRelated requirementRelated = (RequirementRelated)theEObject;

+		case RequirementsPackage.REQUIREMENT_RELATED: {

+			RequirementRelated requirementRelated = (RequirementRelated) theEObject;

 			T result = caseRequirementRelated(requirementRelated);

-			if(result == null)

+			if (result == null) {

 				result = defaultCase(theEObject);

+			}

 			return result;

 		}

 		default:

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsXMLProcessor.java
index d5262288087..5866b8bc07f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class RequirementsXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class RequirementsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RequirementsXMLProcessor() {

@@ -44,12 +44,12 @@ public class RequirementsXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the RequirementsResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new RequirementsResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new RequirementsResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesFactory.java
index b3775ceeb80..6a55298e6cb 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface StatemachinesFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	StatemachinesFactory eINSTANCE = org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesFactoryImpl.init();

@@ -37,7 +37,7 @@ public interface StatemachinesFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesPackage.java
index fde102f12da..7f3e90af964 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EPackage;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.statemachines.StatemachinesFactory

  * @model kind="package"

  * @generated

@@ -43,7 +43,7 @@ public interface StatemachinesPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -51,7 +51,7 @@ public interface StatemachinesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em>Dummy</em>' data type. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see java.lang.String

 		 * @see org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl#getDummy()

 		 * @generated

@@ -63,7 +63,7 @@ public interface StatemachinesPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "statemachines";

@@ -71,7 +71,7 @@ public interface StatemachinesPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/StateMachines";

@@ -79,7 +79,7 @@ public interface StatemachinesPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "StateMachines";

@@ -88,7 +88,7 @@ public interface StatemachinesPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	StatemachinesPackage eINSTANCE = org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl.init();

@@ -96,7 +96,7 @@ public interface StatemachinesPackage extends EPackage {
 	/**

 	 * The meta object id for the '<em>Dummy</em>' data type. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see java.lang.String

 	 * @see org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl#getDummy()

 	 * @generated

@@ -106,7 +106,7 @@ public interface StatemachinesPackage extends EPackage {
 	/**

 	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for data type '<em>Dummy</em>'.

 	 * @see java.lang.String

 	 * @model instanceClass="java.lang.String"

@@ -117,7 +117,7 @@ public interface StatemachinesPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesFactoryImpl.java
index 48233eedd21..7862f696c60 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -25,14 +25,14 @@ import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class StatemachinesFactoryImpl extends EFactoryImpl implements StatemachinesFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -45,13 +45,13 @@ public class StatemachinesFactoryImpl extends EFactoryImpl implements Statemachi
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static StatemachinesFactory init() {

 		try {

-			StatemachinesFactory theStatemachinesFactory = (StatemachinesFactory)EPackage.Registry.INSTANCE.getEFactory(StatemachinesPackage.eNS_URI);

-			if(theStatemachinesFactory != null) {

+			StatemachinesFactory theStatemachinesFactory = (StatemachinesFactory) EPackage.Registry.INSTANCE.getEFactory(StatemachinesPackage.eNS_URI);

+			if (theStatemachinesFactory != null) {

 				return theStatemachinesFactory;

 			}

 		} catch (Exception exception) {

@@ -64,7 +64,7 @@ public class StatemachinesFactoryImpl extends EFactoryImpl implements Statemachi
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public StatemachinesFactoryImpl() {

@@ -73,7 +73,7 @@ public class StatemachinesFactoryImpl extends EFactoryImpl implements Statemachi
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String convertDummyToString(EDataType eDataType, Object instanceValue) {

@@ -82,12 +82,12 @@ public class StatemachinesFactoryImpl extends EFactoryImpl implements Statemachi
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case StatemachinesPackage.DUMMY:

 			return convertDummyToString(eDataType, instanceValue);

 		default:

@@ -97,12 +97,12 @@ public class StatemachinesFactoryImpl extends EFactoryImpl implements Statemachi
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		default:

 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

@@ -110,21 +110,21 @@ public class StatemachinesFactoryImpl extends EFactoryImpl implements Statemachi
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String createDummyFromString(EDataType eDataType, String initialValue) {

-		return (String)super.createFromString(eDataType, initialValue);

+		return (String) super.createFromString(eDataType, initialValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case StatemachinesPackage.DUMMY:

 			return createDummyFromString(eDataType, initialValue);

 		default:

@@ -134,11 +134,11 @@ public class StatemachinesFactoryImpl extends EFactoryImpl implements Statemachi
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public StatemachinesPackage getStatemachinesPackage() {

-		return (StatemachinesPackage)getEPackage();

+		return (StatemachinesPackage) getEPackage();

 	}

 

 } // StatemachinesFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesPackageImpl.java
index f192325e99e..eaf3f3dab73 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -43,36 +43,37 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class StatemachinesPackageImpl extends EPackageImpl implements StatemachinesPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link StatemachinesPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link StatemachinesPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc

+	 * -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static StatemachinesPackage init() {

-		if(isInited)

-			return (StatemachinesPackage)EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI);

+		if (isInited) {

+			return (StatemachinesPackage) EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StatemachinesPackageImpl());

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StatemachinesPackageImpl());

 

 		isInited = true;

 

@@ -80,16 +81,24 @@ public class StatemachinesPackageImpl extends EPackageImpl implements Statemachi
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) : UsecasesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

+				: UsecasesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theStatemachinesPackage.createPackageContents();

@@ -128,21 +137,21 @@ public class StatemachinesPackageImpl extends EPackageImpl implements Statemachi
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EDataType dummyEDataType = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -152,9 +161,8 @@ public class StatemachinesPackageImpl extends EPackageImpl implements Statemachi
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage#eNS_URI

 	 * @see #init()

@@ -169,12 +177,13 @@ public class StatemachinesPackageImpl extends EPackageImpl implements Statemachi
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create data types

@@ -183,7 +192,7 @@ public class StatemachinesPackageImpl extends EPackageImpl implements Statemachi
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EDataType getDummy() {

@@ -192,23 +201,24 @@ public class StatemachinesPackageImpl extends EPackageImpl implements Statemachi
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public StatemachinesFactory getStatemachinesFactory() {

-		return (StatemachinesFactory)getEFactoryInstance();

+		return (StatemachinesFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceFactoryImpl.java
index 965906f7719..cdb32d84587 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.statemachines.util.StatemachinesResourceImpl

  * @generated

  */

@@ -30,7 +30,7 @@ public class StatemachinesResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public StatemachinesResourceFactoryImpl() {

@@ -41,7 +41,7 @@ public class StatemachinesResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceImpl.java
index 403c6aec0c6..a35223abb88 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.statemachines.util.StatemachinesResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class StatemachinesResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public StatemachinesResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesXMLProcessor.java
index e41bf25b4b6..43f411aeefa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class StatemachinesXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class StatemachinesXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public StatemachinesXMLProcessor() {

@@ -44,12 +44,12 @@ public class StatemachinesXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the StatemachinesResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new StatemachinesResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new StatemachinesResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesFactory.java
index 2aa98d9ccee..ee22d425c4e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.usecases.UsecasesPackage

  * @generated

  */

@@ -28,7 +28,7 @@ public interface UsecasesFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	UsecasesFactory eINSTANCE = org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesFactoryImpl.init();

@@ -37,7 +37,7 @@ public interface UsecasesFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesPackage.java
index a0938fb7cfd..858cbfce912 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesPackage.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EPackage;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.usecases.UsecasesFactory

  * @model kind="package"

  * @generated

@@ -43,7 +43,7 @@ public interface UsecasesPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -51,7 +51,7 @@ public interface UsecasesPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em>Dummy</em>' data type. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see java.lang.String

 		 * @see org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl#getDummy()

 		 * @generated

@@ -63,7 +63,7 @@ public interface UsecasesPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "usecases";

@@ -71,7 +71,7 @@ public interface UsecasesPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/UseCases";

@@ -79,7 +79,7 @@ public interface UsecasesPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "UseCases";

@@ -88,7 +88,7 @@ public interface UsecasesPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	UsecasesPackage eINSTANCE = org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl.init();

@@ -96,7 +96,7 @@ public interface UsecasesPackage extends EPackage {
 	/**

 	 * The meta object id for the '<em>Dummy</em>' data type. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see java.lang.String

 	 * @see org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl#getDummy()

 	 * @generated

@@ -106,7 +106,7 @@ public interface UsecasesPackage extends EPackage {
 	/**

 	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for data type '<em>Dummy</em>'.

 	 * @see java.lang.String

 	 * @model instanceClass="java.lang.String"

@@ -117,7 +117,7 @@ public interface UsecasesPackage extends EPackage {
 	/**

 	 * Returns the factory that creates the instances of the model. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesFactoryImpl.java
index 4a0045b52fa..65801a38170 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -25,14 +25,14 @@ import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UsecasesFactoryImpl extends EFactoryImpl implements UsecasesFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -45,13 +45,13 @@ public class UsecasesFactoryImpl extends EFactoryImpl implements UsecasesFactory
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static UsecasesFactory init() {

 		try {

-			UsecasesFactory theUsecasesFactory = (UsecasesFactory)EPackage.Registry.INSTANCE.getEFactory(UsecasesPackage.eNS_URI);

-			if(theUsecasesFactory != null) {

+			UsecasesFactory theUsecasesFactory = (UsecasesFactory) EPackage.Registry.INSTANCE.getEFactory(UsecasesPackage.eNS_URI);

+			if (theUsecasesFactory != null) {

 				return theUsecasesFactory;

 			}

 		} catch (Exception exception) {

@@ -64,7 +64,7 @@ public class UsecasesFactoryImpl extends EFactoryImpl implements UsecasesFactory
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UsecasesFactoryImpl() {

@@ -73,7 +73,7 @@ public class UsecasesFactoryImpl extends EFactoryImpl implements UsecasesFactory
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String convertDummyToString(EDataType eDataType, Object instanceValue) {

@@ -82,12 +82,12 @@ public class UsecasesFactoryImpl extends EFactoryImpl implements UsecasesFactory
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case UsecasesPackage.DUMMY:

 			return convertDummyToString(eDataType, instanceValue);

 		default:

@@ -97,12 +97,12 @@ public class UsecasesFactoryImpl extends EFactoryImpl implements UsecasesFactory
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

+		switch (eClass.getClassifierID()) {

 		default:

 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

@@ -110,21 +110,21 @@ public class UsecasesFactoryImpl extends EFactoryImpl implements UsecasesFactory
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String createDummyFromString(EDataType eDataType, String initialValue) {

-		return (String)super.createFromString(eDataType, initialValue);

+		return (String) super.createFromString(eDataType, initialValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch(eDataType.getClassifierID()) {

+		switch (eDataType.getClassifierID()) {

 		case UsecasesPackage.DUMMY:

 			return createDummyFromString(eDataType, initialValue);

 		default:

@@ -134,11 +134,11 @@ public class UsecasesFactoryImpl extends EFactoryImpl implements UsecasesFactory
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UsecasesPackage getUsecasesPackage() {

-		return (UsecasesPackage)getEPackage();

+		return (UsecasesPackage) getEPackage();

 	}

 

 } // UsecasesFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesPackageImpl.java
index 53b1e62638d..09bdd3bbbc8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesPackageImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -43,36 +43,36 @@ import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

  * end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UsecasesPackageImpl extends EPackageImpl implements UsecasesPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>

-	 * This method is used to initialize {@link UsecasesPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * This method is used to initialize {@link UsecasesPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static UsecasesPackage init() {

-		if(isInited)

-			return (UsecasesPackage)EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI);

+		if (isInited) {

+			return (UsecasesPackage) EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UsecasesPackageImpl());

+		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UsecasesPackageImpl());

 

 		isInited = true;

 

@@ -80,16 +80,24 @@ public class UsecasesPackageImpl extends EPackageImpl implements UsecasesPackage
 		StandardPackage.eINSTANCE.eClass();

 

 		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) : PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) : ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) : ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) : AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) : RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) : InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

+		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

+		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

+		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

+		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

+				: PortandflowsPackage.eINSTANCE);

+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

+				: ConstraintsPackage.eINSTANCE);

+		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

+				: ActivitiesPackage.eINSTANCE);

+		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

+				: AllocationsPackage.eINSTANCE);

+		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

+				: RequirementsPackage.eINSTANCE);

+		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

+				: InteractionsPackage.eINSTANCE);

+		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

+				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

 

 		// Create package meta-data objects

 		theUsecasesPackage.createPackageContents();

@@ -128,21 +136,21 @@ public class UsecasesPackageImpl extends EPackageImpl implements UsecasesPackage
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EDataType dummyEDataType = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -152,9 +160,8 @@ public class UsecasesPackageImpl extends EPackageImpl implements UsecasesPackage
 	 * package

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.sysml.usecases.UsecasesPackage#eNS_URI

 	 * @see #init()

@@ -169,12 +176,13 @@ public class UsecasesPackageImpl extends EPackageImpl implements UsecasesPackage
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

+		if (isCreated) {

 			return;

+		}

 		isCreated = true;

 

 		// Create data types

@@ -183,7 +191,7 @@ public class UsecasesPackageImpl extends EPackageImpl implements UsecasesPackage
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EDataType getDummy() {

@@ -192,23 +200,24 @@ public class UsecasesPackageImpl extends EPackageImpl implements UsecasesPackage
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UsecasesFactory getUsecasesFactory() {

-		return (UsecasesFactory)getEFactoryInstance();

+		return (UsecasesFactory) getEFactoryInstance();

 	}

 

 	/**

 	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

+		if (isInitialized) {

 			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceFactoryImpl.java
index 840677c3b67..44b027f4b3a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.usecases.util.UsecasesResourceImpl

  * @generated

  */

@@ -30,7 +30,7 @@ public class UsecasesResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UsecasesResourceFactoryImpl() {

@@ -41,7 +41,7 @@ public class UsecasesResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceImpl.java
index d44b8f1402e..8b7557945cf 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.usecases.util.UsecasesResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class UsecasesResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public UsecasesResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesXMLProcessor.java
index 0fbdae78ce5..14563fb224f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UsecasesXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class UsecasesXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UsecasesXMLProcessor() {

@@ -44,12 +44,12 @@ public class UsecasesXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the UsecasesResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new UsecasesResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new UsecasesResourceFactoryImpl());

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java
index 419801143a3..a62a851f321 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2009 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ public class ElementUtil {
 	 * some dependencies propagated by UMLUtils (jface...). Current UMLUtils
 	 * plug-in should probably be separated into two parts one depending on UML2
 	 * plug-in only, and the other bringing ui related features;
-	 * 
+	 *
 	 * @deprecated prefer using {@link UMLUtil#getStereotypeApplication(Element, Class)}
 	 */
 	@Deprecated
@@ -39,7 +39,7 @@ public class ElementUtil {
 	/**
 	 * Convenient method to retrieve the StereotypeApplication by passing an
 	 * element of the static profile.
-	 * 
+	 *
 	 * @deprecated prefer using {@link UMLUtil#getStereotypeApplication(Element, Class)}
 	 */
 	@Deprecated
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResource.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResource.java
index 89541bd86fb..e0b8514a990 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResource.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResource.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -48,6 +48,7 @@ public class SysmlResource {
 	/**

 	 * @deprecated use VIEW_POINT_ID instead

 	 */

+	@Deprecated

 	public static String VIEWPOINT_ID = VIEW_POINT_ID;

 

 	@Deprecated

@@ -75,6 +76,7 @@ public class SysmlResource {
 	public static String NESTED_CONNECTOR_END_ID = "SysML::Blocks::NestedConnectorEnd";

 

 	/** @deprecated use NESTED_CONNECTOR_END_ID instead */

+	@Deprecated

 	public static String NESTED_CONNECTOREND_ID = NESTED_CONNECTOR_END_ID;

 

 	@Deprecated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceFactoryImpl.java
index f02624cd73a..b016daa3233 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.util.SysmlResourceImpl

  * @generated

  */

@@ -30,7 +30,7 @@ public class SysmlResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public SysmlResourceFactoryImpl() {

@@ -41,7 +41,7 @@ public class SysmlResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceImpl.java
index 087a8aa2f6d..16734d1af82 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.sysml.util.SysmlResourceFactoryImpl

  * @generated

  */

@@ -29,9 +29,9 @@ public class SysmlResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @param uri

-	 *        the URI of the new resource.

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public SysmlResourceImpl(URI uri) {

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlXMLProcessor.java
index 8a333ad0066..47aad158763 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlXMLProcessor.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.SysmlPackage;
 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc --> <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class SysmlXMLProcessor extends XMLProcessor {

@@ -32,7 +32,7 @@ public class SysmlXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public SysmlXMLProcessor() {

@@ -43,12 +43,12 @@ public class SysmlXMLProcessor extends XMLProcessor {
 	/**

 	 * Register for "*" and "xml" file extensions the SysmlResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if(registrations == null) {

+		if (registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new SysmlResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new SysmlResourceFactoryImpl());

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/sysml/properties/Activator.java b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/sysml/properties/Activator.java
index 0c617978f33..2a9c05faf29 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/sysml/properties/Activator.java
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/sysml/properties/Activator.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at