281977: [Use Case diagram] improve subject management

https://bugs.eclipse.org/bugs/show_bug.cgi?id=281977

10 files changed, 1999 insertions, 1007 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java
index 9dbe4495fbb..0207b391e92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java
@@ -50,10 +50,12 @@ public class ElementInitializers {
 	 */

 	public void init_Actor_2011(Actor instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getActor(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(0,

+					UMLPackage.eINSTANCE.getActor(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -62,10 +64,12 @@ public class ElementInitializers {
 	 */

 	public void init_Actor_2012(Actor instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(1, UMLPackage.eINSTANCE.getActor(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(1,

+					UMLPackage.eINSTANCE.getActor(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -74,10 +78,12 @@ public class ElementInitializers {
 	 */

 	public void init_UseCase_2013(UseCase instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getUseCase(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(2,

+					UMLPackage.eINSTANCE.getUseCase(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -86,10 +92,12 @@ public class ElementInitializers {
 	 */

 	public void init_UseCase_2014(UseCase instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(4, UMLPackage.eINSTANCE.getUseCase(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(4,

+					UMLPackage.eINSTANCE.getUseCase(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -99,9 +107,10 @@ public class ElementInitializers {
 	public void init_Component_2015(Component instance) {

 		try {

 			Object value_0 = name_Component_2015(instance);

-			instance.setName((String)value_0);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -111,9 +120,10 @@ public class ElementInitializers {
 	public void init_Class_2020(Class instance) {

 		try {

 			Object value_0 = name_Class_2020(instance);

-			instance.setName((String)value_0);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -123,9 +133,10 @@ public class ElementInitializers {
 	public void init_Interface_2021(Interface instance) {

 		try {

 			Object value_0 = name_Interface_2021(instance);

-			instance.setName((String)value_0);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -134,10 +145,12 @@ public class ElementInitializers {
 	 */

 	public void init_Package_2016(Package instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(9, UMLPackage.eINSTANCE.getPackage(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(9,

+					UMLPackage.eINSTANCE.getPackage(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -146,17 +159,22 @@ public class ElementInitializers {
 	 */

 	public void init_Constraint_2017(Constraint instance) {

 		try {

-			OpaqueExpression newInstance_0_0 = UMLFactory.eINSTANCE.createOpaqueExpression();

+			OpaqueExpression newInstance_0_0 = UMLFactory.eINSTANCE

+					.createOpaqueExpression();

 			instance.setSpecification(newInstance_0_0);

-			Object value_0_0_0 = UMLOCLFactory.getExpression(8, UMLPackage.eINSTANCE.getOpaqueExpression(), null).evaluate(newInstance_0_0);

-			if(value_0_0_0 instanceof Collection) {

+			Object value_0_0_0 = UMLOCLFactory.getExpression(8,

+					UMLPackage.eINSTANCE.getOpaqueExpression(), null).evaluate(

+					newInstance_0_0);

+			if (value_0_0_0 instanceof Collection) {

 				newInstance_0_0.getBodies().clear();

-				newInstance_0_0.getBodies().addAll(((Collection)value_0_0_0));

+				newInstance_0_0.getBodies().addAll(((Collection) value_0_0_0));

 			} else {

-				newInstance_0_0.getBodies().add((String)value_0_0_0);

+				newInstance_0_0.getBodies().add((String) value_0_0_0);

 			}

+

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -165,10 +183,12 @@ public class ElementInitializers {
 	 */

 	public void init_Comment_2018(Comment instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(7, UMLPackage.eINSTANCE.getComment(), null).evaluate(instance);

-			instance.setBody((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(7,

+					UMLPackage.eINSTANCE.getComment(), null).evaluate(instance);

+			instance.setBody((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -177,10 +197,13 @@ public class ElementInitializers {
 	 */

 	public void init_ExtensionPoint_3007(ExtensionPoint instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(3, UMLPackage.eINSTANCE.getExtensionPoint(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(3,

+					UMLPackage.eINSTANCE.getExtensionPoint(), null).evaluate(

+					instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -189,10 +212,13 @@ public class ElementInitializers {
 	 */

 	public void init_ExtensionPoint_3008(ExtensionPoint instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(5, UMLPackage.eINSTANCE.getExtensionPoint(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(5,

+					UMLPackage.eINSTANCE.getExtensionPoint(), null).evaluate(

+					instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -201,10 +227,12 @@ public class ElementInitializers {
 	 */

 	public void init_UseCase_3009(UseCase instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getUseCase(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(2,

+					UMLPackage.eINSTANCE.getUseCase(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -213,10 +241,13 @@ public class ElementInitializers {
 	 */

 	public void init_Component_3016(Component instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(6, UMLPackage.eINSTANCE.getComponent(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(6,

+					UMLPackage.eINSTANCE.getComponent(), null).evaluate(

+					instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -225,10 +256,12 @@ public class ElementInitializers {
 	 */

 	public void init_Comment_3015(Comment instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(7, UMLPackage.eINSTANCE.getComment(), null).evaluate(instance);

-			instance.setBody((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(7,

+					UMLPackage.eINSTANCE.getComment(), null).evaluate(instance);

+			instance.setBody((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -237,17 +270,22 @@ public class ElementInitializers {
 	 */

 	public void init_Constraint_3017(Constraint instance) {

 		try {

-			OpaqueExpression newInstance_0_0 = UMLFactory.eINSTANCE.createOpaqueExpression();

+			OpaqueExpression newInstance_0_0 = UMLFactory.eINSTANCE

+					.createOpaqueExpression();

 			instance.setSpecification(newInstance_0_0);

-			Object value_0_0_0 = UMLOCLFactory.getExpression(8, UMLPackage.eINSTANCE.getOpaqueExpression(), null).evaluate(newInstance_0_0);

-			if(value_0_0_0 instanceof Collection) {

+			Object value_0_0_0 = UMLOCLFactory.getExpression(8,

+					UMLPackage.eINSTANCE.getOpaqueExpression(), null).evaluate(

+					newInstance_0_0);

+			if (value_0_0_0 instanceof Collection) {

 				newInstance_0_0.getBodies().clear();

-				newInstance_0_0.getBodies().addAll(((Collection)value_0_0_0));

+				newInstance_0_0.getBodies().addAll(((Collection) value_0_0_0));

 			} else {

-				newInstance_0_0.getBodies().add((String)value_0_0_0);

+				newInstance_0_0.getBodies().add((String) value_0_0_0);

 			}

+

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -256,10 +294,12 @@ public class ElementInitializers {
 	 */

 	public void init_Actor_3018(Actor instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getActor(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(0,

+					UMLPackage.eINSTANCE.getActor(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -268,17 +308,22 @@ public class ElementInitializers {
 	 */

 	public void init_Constraint_3010(Constraint instance) {

 		try {

-			OpaqueExpression newInstance_0_0 = UMLFactory.eINSTANCE.createOpaqueExpression();

+			OpaqueExpression newInstance_0_0 = UMLFactory.eINSTANCE

+					.createOpaqueExpression();

 			instance.setSpecification(newInstance_0_0);

-			Object value_0_0_0 = UMLOCLFactory.getExpression(8, UMLPackage.eINSTANCE.getOpaqueExpression(), null).evaluate(newInstance_0_0);

-			if(value_0_0_0 instanceof Collection) {

+			Object value_0_0_0 = UMLOCLFactory.getExpression(8,

+					UMLPackage.eINSTANCE.getOpaqueExpression(), null).evaluate(

+					newInstance_0_0);

+			if (value_0_0_0 instanceof Collection) {

 				newInstance_0_0.getBodies().clear();

-				newInstance_0_0.getBodies().addAll(((Collection)value_0_0_0));

+				newInstance_0_0.getBodies().addAll(((Collection) value_0_0_0));

 			} else {

-				newInstance_0_0.getBodies().add((String)value_0_0_0);

+				newInstance_0_0.getBodies().add((String) value_0_0_0);

 			}

+

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -287,10 +332,12 @@ public class ElementInitializers {
 	 */

 	public void init_Actor_3011(Actor instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getActor(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(0,

+					UMLPackage.eINSTANCE.getActor(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -299,10 +346,12 @@ public class ElementInitializers {
 	 */

 	public void init_UseCase_3012(UseCase instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getUseCase(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(2,

+					UMLPackage.eINSTANCE.getUseCase(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -311,10 +360,13 @@ public class ElementInitializers {
 	 */

 	public void init_Component_3013(Component instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(6, UMLPackage.eINSTANCE.getComponent(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(6,

+					UMLPackage.eINSTANCE.getComponent(), null).evaluate(

+					instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -323,10 +375,12 @@ public class ElementInitializers {
 	 */

 	public void init_Package_3014(Package instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(9, UMLPackage.eINSTANCE.getPackage(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(9,

+					UMLPackage.eINSTANCE.getPackage(), null).evaluate(instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -335,10 +389,13 @@ public class ElementInitializers {
 	 */

 	public void init_Association_4011(Association instance) {

 		try {

-			Object value_0 = UMLOCLFactory.getExpression(13, UMLPackage.eINSTANCE.getAssociation(), null).evaluate(instance);

-			instance.setName((String)value_0);

+			Object value_0 = UMLOCLFactory.getExpression(13,

+					UMLPackage.eINSTANCE.getAssociation(), null).evaluate(

+					instance);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -348,9 +405,10 @@ public class ElementInitializers {
 	public void init_Dependency_4013(Dependency instance) {

 		try {

 			Object value_0 = name_Dependency_4013(instance);

-			instance.setName((String)value_0);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -360,9 +418,10 @@ public class ElementInitializers {
 	public void init_Abstraction_4015(Abstraction instance) {

 		try {

 			Object value_0 = name_Abstraction_4015(instance);

-			instance.setName((String)value_0);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -372,9 +431,10 @@ public class ElementInitializers {
 	public void init_Usage_4016(Usage instance) {

 		try {

 			Object value_0 = name_Usage_4016(instance);

-			instance.setName((String)value_0);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -384,9 +444,10 @@ public class ElementInitializers {
 	public void init_Realization_4017(Realization instance) {

 		try {

 			Object value_0 = name_Realization_4017(instance);

-			instance.setName((String)value_0);

+			instance.setName((String) value_0);

 		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Element initialization failed", e); //$NON-NLS-1$						

 		}

 	}

 

@@ -394,21 +455,27 @@ public class ElementInitializers {
 	 * @generated

 	 */

 	private String name_Component_2015(Component self) {

-		return "Subject" + NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());

+		return "Subject"

+				+ NamedElementHelper.EINSTANCE.getNewUMLElementName(

+						self.getOwner(), self.eClass());

 	}

 

 	/**

 	 * @generated

 	 */

 	private String name_Class_2020(Class self) {

-		return "Subject" + NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());

+		return "Subject"

+				+ NamedElementHelper.EINSTANCE.getNewUMLElementName(

+						self.getOwner(), self.eClass());

 	}

 

 	/**

 	 * @generated

 	 */

 	private String name_Interface_2021(Interface self) {

-		return "Subject" + NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());

+		return "Subject"

+				+ NamedElementHelper.EINSTANCE.getNewUMLElementName(

+						self.getOwner(), self.eClass());

 	}

 

 	/**

@@ -443,9 +510,11 @@ public class ElementInitializers {
 	 * @generated

 	 */

 	public static ElementInitializers getInstance() {

-		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers();

-		if(cached == null) {

-			UMLDiagramEditorPlugin.getInstance().setElementInitializers(cached = new ElementInitializers());

+		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance()

+				.getElementInitializers();

+		if (cached == null) {

+			UMLDiagramEditorPlugin.getInstance().setElementInitializers(

+					cached = new ElementInitializers());

 		}

 		return cached;

 	}

@@ -459,6 +528,7 @@ public class ElementInitializers {
 	 * @return the element name

 	 */

 	private static String getName(org.eclipse.uml2.uml.Element self) {

-		return NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());

+		return NamedElementHelper.EINSTANCE.getNewUMLElementName(

+				self.getOwner(), self.eClass());

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLEditPartProvider.java
index 32d77240399..324b423cca4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLEditPartProvider.java
@@ -86,7 +86,7 @@ public class UMLEditPartProvider extends AbstractEditPartProvider {
 	 */

 	protected synchronized void setAllowCaching(boolean allowCaching) {

 		this.allowCaching = allowCaching;

-		if(!allowCaching) {

+		if (!allowCaching) {

 			cachedPart = null;

 			cachedView = null;

 		}

@@ -97,8 +97,8 @@ public class UMLEditPartProvider extends AbstractEditPartProvider {
 	 */

 	protected IGraphicalEditPart createEditPart(View view) {

 		EditPart part = factory.createEditPart(null, view);

-		if(part instanceof IGraphicalEditPart) {

-			return (IGraphicalEditPart)part;

+		if (part instanceof IGraphicalEditPart) {

+			return (IGraphicalEditPart) part;

 		}

 		return null;

 	}

@@ -107,8 +107,8 @@ public class UMLEditPartProvider extends AbstractEditPartProvider {
 	 * @generated

 	 */

 	protected IGraphicalEditPart getCachedPart(View view) {

-		if(cachedView != null && cachedView.get() == view) {

-			return (IGraphicalEditPart)cachedPart.get();

+		if (cachedView != null && cachedView.get() == view) {

+			return (IGraphicalEditPart) cachedPart.get();

 		}

 		return null;

 	}

@@ -117,11 +117,11 @@ public class UMLEditPartProvider extends AbstractEditPartProvider {
 	 * @generated

 	 */

 	public synchronized IGraphicalEditPart createGraphicEditPart(View view) {

-		if(isAllowCaching()) {

+		if (isAllowCaching()) {

 			IGraphicalEditPart part = getCachedPart(view);

 			cachedPart = null;

 			cachedView = null;

-			if(part != null) {

+			if (part != null) {

 				return part;

 			}

 		}

@@ -132,17 +132,18 @@ public class UMLEditPartProvider extends AbstractEditPartProvider {
 	 * @generated

 	 */

 	public synchronized boolean provides(IOperation operation) {

-		if(operation instanceof CreateGraphicEditPartOperation) {

-			View view = ((IEditPartOperation)operation).getView();

-			if(!UseCaseDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view))) {

+		if (operation instanceof CreateGraphicEditPartOperation) {

+			View view = ((IEditPartOperation) operation).getView();

+			if (!UseCaseDiagramEditPart.MODEL_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(isAllowCaching()) {

+			if (part != null) {

+				if (isAllowCaching()) {

 					cachedPart = new WeakReference(part);

 					cachedView = new WeakReference(view);

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java
index 3419a4d2eb8..26cab245bc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java
@@ -278,7 +278,7 @@ public class UMLElementTypes {
 	 * @generated

 	 */

 	private static ImageRegistry getImageRegistry() {

-		if(imageRegistry == null) {

+		if (imageRegistry == null) {

 			imageRegistry = new ImageRegistry();

 		}

 		return imageRegistry;

@@ -294,21 +294,26 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	private static ImageDescriptor getProvidedImageDescriptor(ENamedElement element) {

-		if(element instanceof EStructuralFeature) {

-			EStructuralFeature feature = ((EStructuralFeature)element);

+	private static ImageDescriptor getProvidedImageDescriptor(

+			ENamedElement 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()) {

-				return UMLDiagramEditorPlugin.getInstance().getItemImageDescriptor(eClass.getEPackage().getEFactoryInstance().create(eClass));

+		if (element instanceof EClass) {

+			EClass eClass = (EClass) element;

+			if (!eClass.isAbstract()) {

+				return UMLDiagramEditorPlugin.getInstance()

+						.getItemImageDescriptor(

+								eClass.getEPackage().getEFactoryInstance()

+										.create(eClass));

 			}

 		}

 		// TODO : support structural features

@@ -321,9 +326,9 @@ public class UMLElementTypes {
 	public static ImageDescriptor getImageDescriptor(ENamedElement element) {

 		String key = getImageRegistryKey(element);

 		ImageDescriptor imageDescriptor = getImageRegistry().getDescriptor(key);

-		if(imageDescriptor == null) {

+		if (imageDescriptor == null) {

 			imageDescriptor = getProvidedImageDescriptor(element);

-			if(imageDescriptor == null) {

+			if (imageDescriptor == null) {

 				imageDescriptor = ImageDescriptor.getMissingImageDescriptor();

 			}

 			getImageRegistry().put(key, imageDescriptor);

@@ -337,9 +342,9 @@ public class UMLElementTypes {
 	public static Image getImage(ENamedElement element) {

 		String key = getImageRegistryKey(element);

 		Image image = getImageRegistry().get(key);

-		if(image == null) {

+		if (image == null) {

 			ImageDescriptor imageDescriptor = getProvidedImageDescriptor(element);

-			if(imageDescriptor == null) {

+			if (imageDescriptor == null) {

 				imageDescriptor = ImageDescriptor.getMissingImageDescriptor();

 			}

 			getImageRegistry().put(key, imageDescriptor);

@@ -353,7 +358,7 @@ public class UMLElementTypes {
 	 */

 	public static ImageDescriptor getImageDescriptor(IAdaptable hint) {

 		ENamedElement element = getElement(hint);

-		if(element == null) {

+		if (element == null) {

 			return null;

 		}

 		return getImageDescriptor(element);

@@ -364,7 +369,7 @@ public class UMLElementTypes {
 	 */

 	public static Image getImage(IAdaptable hint) {

 		ENamedElement element = getElement(hint);

-		if(element == null) {

+		if (element == null) {

 			return null;

 		}

 		return getImage(element);

@@ -377,46 +382,92 @@ public class UMLElementTypes {
 	 */

 	public static ENamedElement getElement(IAdaptable hint) {

 		Object type = hint.getAdapter(IElementType.class);

-		if(elements == null) {

+		if (elements == null) {

 			elements = new IdentityHashMap<IElementType, ENamedElement>();

+

 			elements.put(Package_1000, UMLPackage.eINSTANCE.getPackage());

+

 			elements.put(Actor_2011, UMLPackage.eINSTANCE.getActor());

+

 			elements.put(Actor_2012, UMLPackage.eINSTANCE.getActor());

+

 			elements.put(UseCase_2013, UMLPackage.eINSTANCE.getUseCase());

+

 			elements.put(UseCase_2014, UMLPackage.eINSTANCE.getUseCase());

+

 			elements.put(Component_2015, UMLPackage.eINSTANCE.getComponent());

+

 			elements.put(Class_2020, UMLPackage.eINSTANCE.getClass_());

+

 			elements.put(Interface_2021, UMLPackage.eINSTANCE.getInterface());

+

 			elements.put(Package_2016, UMLPackage.eINSTANCE.getPackage());

+

 			elements.put(Constraint_2017, UMLPackage.eINSTANCE.getConstraint());

+

 			elements.put(Comment_2018, UMLPackage.eINSTANCE.getComment());

+

 			elements.put(Diagram_2019, NotationPackage.eINSTANCE.getDiagram());

-			elements.put(ExtensionPoint_3007, UMLPackage.eINSTANCE.getExtensionPoint());

-			elements.put(ExtensionPoint_3008, UMLPackage.eINSTANCE.getExtensionPoint());

+

+			elements.put(ExtensionPoint_3007,

+					UMLPackage.eINSTANCE.getExtensionPoint());

+

+			elements.put(ExtensionPoint_3008,

+					UMLPackage.eINSTANCE.getExtensionPoint());

+

 			elements.put(UseCase_3009, UMLPackage.eINSTANCE.getUseCase());

+

 			elements.put(Component_3016, UMLPackage.eINSTANCE.getComponent());

+

 			elements.put(Comment_3015, UMLPackage.eINSTANCE.getComment());

+

 			elements.put(Constraint_3017, UMLPackage.eINSTANCE.getConstraint());

+

 			elements.put(Actor_3018, UMLPackage.eINSTANCE.getActor());

+

 			elements.put(Constraint_3010, UMLPackage.eINSTANCE.getConstraint());

+

 			elements.put(Actor_3011, UMLPackage.eINSTANCE.getActor());

+

 			elements.put(UseCase_3012, UMLPackage.eINSTANCE.getUseCase());

+

 			elements.put(Component_3013, UMLPackage.eINSTANCE.getComponent());

+

 			elements.put(Package_3014, UMLPackage.eINSTANCE.getPackage());

+

 			elements.put(Include_4008, UMLPackage.eINSTANCE.getInclude());

+

 			elements.put(Extend_4009, UMLPackage.eINSTANCE.getExtend());

-			elements.put(Generalization_4010, UMLPackage.eINSTANCE.getGeneralization());

-			elements.put(Association_4011, UMLPackage.eINSTANCE.getAssociation());

-			elements.put(ConstraintConstrainedElement_4012, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

+

+			elements.put(Generalization_4010,

+					UMLPackage.eINSTANCE.getGeneralization());

+

+			elements.put(Association_4011,

+					UMLPackage.eINSTANCE.getAssociation());

+

+			elements.put(ConstraintConstrainedElement_4012,

+					UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

+

 			elements.put(Dependency_4013, UMLPackage.eINSTANCE.getDependency());

-			elements.put(CommentAnnotatedElement_4014, UMLPackage.eINSTANCE.getComment_AnnotatedElement());

-			elements.put(Abstraction_4015, UMLPackage.eINSTANCE.getAbstraction());

+

+			elements.put(CommentAnnotatedElement_4014,

+					UMLPackage.eINSTANCE.getComment_AnnotatedElement());

+

+			elements.put(Abstraction_4015,

+					UMLPackage.eINSTANCE.getAbstraction());

+

 			elements.put(Usage_4016, UMLPackage.eINSTANCE.getUsage());

-			elements.put(Realization_4017, UMLPackage.eINSTANCE.getRealization());

-			elements.put(PackageMerge_4018, UMLPackage.eINSTANCE.getPackageMerge());

-			elements.put(PackageImport_4019, UMLPackage.eINSTANCE.getPackageImport());

+

+			elements.put(Realization_4017,

+					UMLPackage.eINSTANCE.getRealization());

+

+			elements.put(PackageMerge_4018,

+					UMLPackage.eINSTANCE.getPackageMerge());

+

+			elements.put(PackageImport_4019,

+					UMLPackage.eINSTANCE.getPackageImport());

 		}

-		return (ENamedElement)elements.get(type);

+		return (ENamedElement) elements.get(type);

 	}

 

 	/**

@@ -430,7 +481,7 @@ public class UMLElementTypes {
 	 * @generated

 	 */

 	public static boolean isKnownElementType(IElementType elementType) {

-		if(KNOWN_ELEMENT_TYPES == null) {

+		if (KNOWN_ELEMENT_TYPES == null) {

 			KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();

 			KNOWN_ELEMENT_TYPES.add(Package_1000);

 			KNOWN_ELEMENT_TYPES.add(Actor_2011);

@@ -476,7 +527,7 @@ public class UMLElementTypes {
 	 * @generated

 	 */

 	public static IElementType getElementType(int visualID) {

-		switch(visualID) {

+		switch (visualID) {

 		case UseCaseDiagramEditPart.VISUAL_ID:

 			return Package_1000;

 		case ActorEditPartTN.VISUAL_ID:

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLIconProvider.java
index 51939db1e8f..dedaafc986c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLIconProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLIconProvider.java
@@ -36,8 +36,8 @@ public class UMLIconProvider extends AbstractProvider implements IIconProvider {
 	 * @generated

 	 */

 	public boolean provides(IOperation operation) {

-		if(operation instanceof GetIconOperation) {

-			return ((GetIconOperation)operation).execute(this) != null;

+		if (operation instanceof GetIconOperation) {

+			return ((GetIconOperation) operation).execute(this) != null;

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java
index b7a6281ac3f..4d0c708f0ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java
@@ -18,30 +18,38 @@ import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorUtil;
 /**

  * @generated

  */

-public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationProvider {

+public class UMLMarkerNavigationProvider extends

+		AbstractModelMarkerNavigationProvider {

 

 	/**

 	 * @generated

 	 */

-	public static final String MARKER_TYPE = UMLDiagramEditorPlugin.ID + ".diagnostic"; //$NON-NLS-1$

+	public static final String MARKER_TYPE = UMLDiagramEditorPlugin.ID

+			+ ".diagnostic"; //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

 	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)) {

+		String elementId = marker

+				.getAttribute(

+						org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID,

+						null);

+		if (elementId == null || !(getEditor() instanceof DiagramEditor)) {

 			return;

 		}

-		DiagramEditor editor = (DiagramEditor)getEditor();

-		Map editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry();

-		EObject targetView = editor.getDiagram().eResource().getEObject(elementId);

-		if(targetView == null) {

+		DiagramEditor editor = (DiagramEditor) getEditor();

+		Map editPartRegistry = editor.getDiagramGraphicalViewer()

+				.getEditPartRegistry();

+		EObject targetView = editor.getDiagram().eResource()

+				.getEObject(elementId);

+		if (targetView == null) {

 			return;

 		}

-		EditPart targetEditPart = (EditPart)editPartRegistry.get(targetView);

-		if(targetEditPart != null) {

-			UMLDiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[]{ targetEditPart }));

+		EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView);

+		if (targetEditPart != null) {

+			UMLDiagramEditorUtil.selectElementsInDiagram(editor,

+					Arrays.asList(new EditPart[] { targetEditPart }));

 		}

 	}

 

@@ -52,29 +60,35 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr
 		try {

 			resource.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);

 		} catch (CoreException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Failed to delete validation markers", e); //$NON-NLS-1$

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Failed to delete validation markers", e); //$NON-NLS-1$

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public static IMarker addMarker(IFile file, String elementId, String location, String message, int statusSeverity) {

+	public static IMarker addMarker(IFile file, String elementId,

+			String location, String message, int statusSeverity) {

 		IMarker marker = null;

 		try {

 			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.ui.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);

 		} catch (CoreException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Failed to create validation marker", e); //$NON-NLS-1$

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Failed to create validation marker", e); //$NON-NLS-1$

 		}

 		return marker;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java
index d80567afe1d..5941bf75b26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java
@@ -48,8 +48,11 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassUsecasesEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectComponentUsecasesEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceUsecasesEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

@@ -70,28 +73,29 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 	 * @generated NOT tmp: remove duplicate entries for use case and actor

 	 */

 	public List getTypesForPopupBar(IAdaptable host) {

-		IGraphicalEditPart editPart = (IGraphicalEditPart)host.getAdapter(IGraphicalEditPart.class);

-		if(editPart instanceof UseCaseEditPartTN) {

+		IGraphicalEditPart editPart = (IGraphicalEditPart) host

+				.getAdapter(IGraphicalEditPart.class);

+		if (editPart instanceof UseCaseEditPartTN) {

 			ArrayList types = new ArrayList(1);

 			types.add(UMLElementTypes.ExtensionPoint_3007);

 			return types;

 		}

-		if(editPart instanceof UseCaseAsRectangleEditPartTN) {

+		if (editPart instanceof UseCaseAsRectangleEditPartTN) {

 			ArrayList types = new ArrayList(1);

 			types.add(UMLElementTypes.ExtensionPoint_3008);

 			return types;

 		}

-		if(editPart instanceof UseCaseInComponentEditPart) {

+		if (editPart instanceof UseCaseInComponentEditPart) {

 			ArrayList types = new ArrayList(1);

 			types.add(UMLElementTypes.ExtensionPoint_3007);

 			return types;

 		}

-		if(editPart instanceof UseCaseInPackageEditPart) {

+		if (editPart instanceof UseCaseInPackageEditPart) {

 			ArrayList types = new ArrayList(1);

 			types.add(UMLElementTypes.ExtensionPoint_3007);

 			return types;

 		}

-		if(editPart instanceof ComponentUsecases2EditPart) {

+		if (editPart instanceof ComponentUsecases2EditPart) {

 			ArrayList types = new ArrayList(5);

 			types.add(UMLElementTypes.UseCase_3009);

 			types.add(UMLElementTypes.Component_3016);

@@ -100,7 +104,7 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 			types.add(UMLElementTypes.Actor_3018);

 			return types;

 		}

-		if(editPart instanceof ComponentUsecases3EditPart) {

+		if (editPart instanceof ComponentUsecases3EditPart) {

 			ArrayList types = new ArrayList(5);

 			types.add(UMLElementTypes.UseCase_3009);

 			types.add(UMLElementTypes.Component_3016);

@@ -109,7 +113,7 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 			types.add(UMLElementTypes.Actor_3018);

 			return types;

 		}

-		if(editPart instanceof PackagePackageableElementCompartment2EditPart) {

+		if (editPart instanceof PackagePackageableElementCompartment2EditPart) {

 			ArrayList types = new ArrayList(6);

 			types.add(UMLElementTypes.Constraint_3010);

 			types.add(UMLElementTypes.Actor_3011);

@@ -119,7 +123,7 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 			types.add(UMLElementTypes.Comment_3015);

 			return types;

 		}

-		if(editPart instanceof PackagePackageableElementCompartmentEditPart) {

+		if (editPart instanceof PackagePackageableElementCompartmentEditPart) {

 			ArrayList types = new ArrayList(6);

 			types.add(UMLElementTypes.Constraint_3010);

 			types.add(UMLElementTypes.Actor_3011);

@@ -129,7 +133,7 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 			types.add(UMLElementTypes.Comment_3015);

 			return types;

 		}

-		if(editPart instanceof UseCaseDiagramEditPart) {

+		if (editPart instanceof UseCaseDiagramEditPart) {

 			ArrayList types = new ArrayList(9);

 			types.add(UMLElementTypes.Actor_2011);

 			//types.add(UMLElementTypes.Actor_2012);

@@ -148,66 +152,81 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 	 * @generated

 	 */

 	public List getRelTypesOnSource(IAdaptable source) {

-		IGraphicalEditPart sourceEditPart = (IGraphicalEditPart)source.getAdapter(IGraphicalEditPart.class);

-		if(sourceEditPart instanceof ActorEditPartTN) {

-			return ((ActorEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		IGraphicalEditPart sourceEditPart = (IGraphicalEditPart) source

+				.getAdapter(IGraphicalEditPart.class);

+		if (sourceEditPart instanceof ActorEditPartTN) {

+			return ((ActorEditPartTN) sourceEditPart).getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof ActorAsRectangleEditPartTN) {

-			return ((ActorAsRectangleEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof ActorAsRectangleEditPartTN) {

+			return ((ActorAsRectangleEditPartTN) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof UseCaseEditPartTN) {

-			return ((UseCaseEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof UseCaseEditPartTN) {

+			return ((UseCaseEditPartTN) sourceEditPart).getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof UseCaseAsRectangleEditPartTN) {

-			return ((UseCaseAsRectangleEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof UseCaseAsRectangleEditPartTN) {

+			return ((UseCaseAsRectangleEditPartTN) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof SubjectComponentEditPartTN) {

-			return ((SubjectComponentEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof SubjectComponentEditPartTN) {

+			return ((SubjectComponentEditPartTN) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof SubjectClassEditPartTN) {

-			return ((SubjectClassEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof SubjectClassEditPartTN) {

+			return ((SubjectClassEditPartTN) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof SubjectInterfaceEditPartTN) {

-			return ((SubjectInterfaceEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof SubjectInterfaceEditPartTN) {

+			return ((SubjectInterfaceEditPartTN) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof PackageEditPartTN) {

-			return ((PackageEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof PackageEditPartTN) {

+			return ((PackageEditPartTN) sourceEditPart).getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof ConstraintEditPartTN) {

-			return ((ConstraintEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof ConstraintEditPartTN) {

+			return ((ConstraintEditPartTN) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof CommentEditPartTN) {

-			return ((CommentEditPartTN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof CommentEditPartTN) {

+			return ((CommentEditPartTN) sourceEditPart).getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof UseCaseInComponentEditPart) {

-			return ((UseCaseInComponentEditPart)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof UseCaseInComponentEditPart) {

+			return ((UseCaseInComponentEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof ComponentInComponentEditPart) {

-			return ((ComponentInComponentEditPart)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof ComponentInComponentEditPart) {

+			return ((ComponentInComponentEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof CommentEditPartCN) {

-			return ((CommentEditPartCN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof CommentEditPartCN) {

+			return ((CommentEditPartCN) sourceEditPart).getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof ConstraintInComponentEditPart) {

-			return ((ConstraintInComponentEditPart)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof ConstraintInComponentEditPart) {

+			return ((ConstraintInComponentEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof ActorInComponentEditPart) {

-			return ((ActorInComponentEditPart)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof ActorInComponentEditPart) {

+			return ((ActorInComponentEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof ConstraintInPackageEditPart) {

-			return ((ConstraintInPackageEditPart)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof ConstraintInPackageEditPart) {

+			return ((ConstraintInPackageEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof ActorInPackageEditPart) {

-			return ((ActorInPackageEditPart)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof ActorInPackageEditPart) {

+			return ((ActorInPackageEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof UseCaseInPackageEditPart) {

-			return ((UseCaseInPackageEditPart)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof UseCaseInPackageEditPart) {

+			return ((UseCaseInPackageEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof ComponentInPackageEditPart) {

-			return ((ComponentInPackageEditPart)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof ComponentInPackageEditPart) {

+			return ((ComponentInPackageEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

 		}

-		if(sourceEditPart instanceof PackageEditPartCN) {

-			return ((PackageEditPartCN)sourceEditPart).getMARelTypesOnSource();

+		if (sourceEditPart instanceof PackageEditPartCN) {

+			return ((PackageEditPartCN) sourceEditPart).getMARelTypesOnSource();

 		}

 		return Collections.EMPTY_LIST;

 	}

@@ -216,66 +235,81 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 	 * @generated

 	 */

 	public List getRelTypesOnTarget(IAdaptable target) {

-		IGraphicalEditPart targetEditPart = (IGraphicalEditPart)target.getAdapter(IGraphicalEditPart.class);

-		if(targetEditPart instanceof ActorEditPartTN) {

-			return ((ActorEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		IGraphicalEditPart targetEditPart = (IGraphicalEditPart) target

+				.getAdapter(IGraphicalEditPart.class);

+		if (targetEditPart instanceof ActorEditPartTN) {

+			return ((ActorEditPartTN) targetEditPart).getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

-			return ((ActorAsRectangleEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof ActorAsRectangleEditPartTN) {

+			return ((ActorAsRectangleEditPartTN) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof UseCaseEditPartTN) {

-			return ((UseCaseEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof UseCaseEditPartTN) {

+			return ((UseCaseEditPartTN) targetEditPart).getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

-			return ((UseCaseAsRectangleEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

+			return ((UseCaseAsRectangleEditPartTN) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof SubjectComponentEditPartTN) {

-			return ((SubjectComponentEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof SubjectComponentEditPartTN) {

+			return ((SubjectComponentEditPartTN) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof SubjectClassEditPartTN) {

-			return ((SubjectClassEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof SubjectClassEditPartTN) {

+			return ((SubjectClassEditPartTN) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {

-			return ((SubjectInterfaceEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof SubjectInterfaceEditPartTN) {

+			return ((SubjectInterfaceEditPartTN) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof PackageEditPartTN) {

-			return ((PackageEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof PackageEditPartTN) {

+			return ((PackageEditPartTN) targetEditPart).getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof ConstraintEditPartTN) {

-			return ((ConstraintEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof ConstraintEditPartTN) {

+			return ((ConstraintEditPartTN) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof CommentEditPartTN) {

-			return ((CommentEditPartTN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof CommentEditPartTN) {

+			return ((CommentEditPartTN) targetEditPart).getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof UseCaseInComponentEditPart) {

-			return ((UseCaseInComponentEditPart)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof UseCaseInComponentEditPart) {

+			return ((UseCaseInComponentEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof ComponentInComponentEditPart) {

-			return ((ComponentInComponentEditPart)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof ComponentInComponentEditPart) {

+			return ((ComponentInComponentEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof CommentEditPartCN) {

-			return ((CommentEditPartCN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof CommentEditPartCN) {

+			return ((CommentEditPartCN) targetEditPart).getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof ConstraintInComponentEditPart) {

-			return ((ConstraintInComponentEditPart)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof ConstraintInComponentEditPart) {

+			return ((ConstraintInComponentEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof ActorInComponentEditPart) {

-			return ((ActorInComponentEditPart)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof ActorInComponentEditPart) {

+			return ((ActorInComponentEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof ConstraintInPackageEditPart) {

-			return ((ConstraintInPackageEditPart)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof ConstraintInPackageEditPart) {

+			return ((ConstraintInPackageEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof ActorInPackageEditPart) {

-			return ((ActorInPackageEditPart)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof ActorInPackageEditPart) {

+			return ((ActorInPackageEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof UseCaseInPackageEditPart) {

-			return ((UseCaseInPackageEditPart)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof UseCaseInPackageEditPart) {

+			return ((UseCaseInPackageEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof ComponentInPackageEditPart) {

-			return ((ComponentInPackageEditPart)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof ComponentInPackageEditPart) {

+			return ((ComponentInPackageEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

 		}

-		if(targetEditPart instanceof PackageEditPartCN) {

-			return ((PackageEditPartCN)targetEditPart).getMARelTypesOnTarget();

+		if (targetEditPart instanceof PackageEditPartCN) {

+			return ((PackageEditPartCN) targetEditPart).getMARelTypesOnTarget();

 		}

 		return Collections.EMPTY_LIST;

 	}

@@ -283,68 +317,91 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 	/**

 	 * @generated

 	 */

-	public List getRelTypesOnSourceAndTarget(IAdaptable source, IAdaptable target) {

-		IGraphicalEditPart sourceEditPart = (IGraphicalEditPart)source.getAdapter(IGraphicalEditPart.class);

-		IGraphicalEditPart targetEditPart = (IGraphicalEditPart)target.getAdapter(IGraphicalEditPart.class);

-		if(sourceEditPart instanceof ActorEditPartTN) {

-			return ((ActorEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof ActorAsRectangleEditPartTN) {

-			return ((ActorAsRectangleEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof UseCaseEditPartTN) {

-			return ((UseCaseEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof UseCaseAsRectangleEditPartTN) {

-			return ((UseCaseAsRectangleEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof SubjectComponentEditPartTN) {

-			return ((SubjectComponentEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof SubjectClassEditPartTN) {

-			return ((SubjectClassEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof SubjectInterfaceEditPartTN) {

-			return ((SubjectInterfaceEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof PackageEditPartTN) {

-			return ((PackageEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof ConstraintEditPartTN) {

-			return ((ConstraintEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof CommentEditPartTN) {

-			return ((CommentEditPartTN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof UseCaseInComponentEditPart) {

-			return ((UseCaseInComponentEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof ComponentInComponentEditPart) {

-			return ((ComponentInComponentEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof CommentEditPartCN) {

-			return ((CommentEditPartCN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof ConstraintInComponentEditPart) {

-			return ((ConstraintInComponentEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof ActorInComponentEditPart) {

-			return ((ActorInComponentEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof ConstraintInPackageEditPart) {

-			return ((ConstraintInPackageEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof ActorInPackageEditPart) {

-			return ((ActorInPackageEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof UseCaseInPackageEditPart) {

-			return ((UseCaseInPackageEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof ComponentInPackageEditPart) {

-			return ((ComponentInPackageEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

-		}

-		if(sourceEditPart instanceof PackageEditPartCN) {

-			return ((PackageEditPartCN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

+	public List getRelTypesOnSourceAndTarget(IAdaptable source,

+			IAdaptable target) {

+		IGraphicalEditPart sourceEditPart = (IGraphicalEditPart) source

+				.getAdapter(IGraphicalEditPart.class);

+		IGraphicalEditPart targetEditPart = (IGraphicalEditPart) target

+				.getAdapter(IGraphicalEditPart.class);

+		if (sourceEditPart instanceof ActorEditPartTN) {

+			return ((ActorEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof ActorAsRectangleEditPartTN) {

+			return ((ActorAsRectangleEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof UseCaseEditPartTN) {

+			return ((UseCaseEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof UseCaseAsRectangleEditPartTN) {

+			return ((UseCaseAsRectangleEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SubjectComponentEditPartTN) {

+			return ((SubjectComponentEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SubjectClassEditPartTN) {

+			return ((SubjectClassEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SubjectInterfaceEditPartTN) {

+			return ((SubjectInterfaceEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof PackageEditPartTN) {

+			return ((PackageEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof ConstraintEditPartTN) {

+			return ((ConstraintEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof CommentEditPartTN) {

+			return ((CommentEditPartTN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof UseCaseInComponentEditPart) {

+			return ((UseCaseInComponentEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof ComponentInComponentEditPart) {

+			return ((ComponentInComponentEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof CommentEditPartCN) {

+			return ((CommentEditPartCN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof ConstraintInComponentEditPart) {

+			return ((ConstraintInComponentEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof ActorInComponentEditPart) {

+			return ((ActorInComponentEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof ConstraintInPackageEditPart) {

+			return ((ConstraintInPackageEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof ActorInPackageEditPart) {

+			return ((ActorInPackageEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof UseCaseInPackageEditPart) {

+			return ((UseCaseInPackageEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof ComponentInPackageEditPart) {

+			return ((ComponentInPackageEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof PackageEditPartCN) {

+			return ((PackageEditPartCN) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

 		}

 		return Collections.EMPTY_LIST;

 	}

@@ -352,67 +409,89 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 	/**

 	 * @generated

 	 */

-	public List getTypesForSource(IAdaptable target, IElementType relationshipType) {

-		IGraphicalEditPart targetEditPart = (IGraphicalEditPart)target.getAdapter(IGraphicalEditPart.class);

-		if(targetEditPart instanceof ActorEditPartTN) {

-			return ((ActorEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

-			return ((ActorAsRectangleEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof UseCaseEditPartTN) {

-			return ((UseCaseEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

-			return ((UseCaseAsRectangleEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof SubjectComponentEditPartTN) {

-			return ((SubjectComponentEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof SubjectClassEditPartTN) {

-			return ((SubjectClassEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof SubjectInterfaceEditPartTN) {

-			return ((SubjectInterfaceEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof PackageEditPartTN) {

-			return ((PackageEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof ConstraintEditPartTN) {

-			return ((ConstraintEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof CommentEditPartTN) {

-			return ((CommentEditPartTN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof UseCaseInComponentEditPart) {

-			return ((UseCaseInComponentEditPart)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof ComponentInComponentEditPart) {

-			return ((ComponentInComponentEditPart)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof CommentEditPartCN) {

-			return ((CommentEditPartCN)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof ConstraintInComponentEditPart) {

-			return ((ConstraintInComponentEditPart)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof ActorInComponentEditPart) {

-			return ((ActorInComponentEditPart)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof ConstraintInPackageEditPart) {

-			return ((ConstraintInPackageEditPart)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof ActorInPackageEditPart) {

-			return ((ActorInPackageEditPart)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof UseCaseInPackageEditPart) {

-			return ((UseCaseInPackageEditPart)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof ComponentInPackageEditPart) {

-			return ((ComponentInPackageEditPart)targetEditPart).getMATypesForSource(relationshipType);

-		}

-		if(targetEditPart instanceof PackageEditPartCN) {

-			return ((PackageEditPartCN)targetEditPart).getMATypesForSource(relationshipType);

+	public List getTypesForSource(IAdaptable target,

+			IElementType relationshipType) {

+		IGraphicalEditPart targetEditPart = (IGraphicalEditPart) target

+				.getAdapter(IGraphicalEditPart.class);

+		if (targetEditPart instanceof ActorEditPartTN) {

+			return ((ActorEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof ActorAsRectangleEditPartTN) {

+			return ((ActorAsRectangleEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof UseCaseEditPartTN) {

+			return ((UseCaseEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

+			return ((UseCaseAsRectangleEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SubjectComponentEditPartTN) {

+			return ((SubjectComponentEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SubjectClassEditPartTN) {

+			return ((SubjectClassEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SubjectInterfaceEditPartTN) {

+			return ((SubjectInterfaceEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof PackageEditPartTN) {

+			return ((PackageEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof ConstraintEditPartTN) {

+			return ((ConstraintEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof CommentEditPartTN) {

+			return ((CommentEditPartTN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof UseCaseInComponentEditPart) {

+			return ((UseCaseInComponentEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof ComponentInComponentEditPart) {

+			return ((ComponentInComponentEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof CommentEditPartCN) {

+			return ((CommentEditPartCN) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof ConstraintInComponentEditPart) {

+			return ((ConstraintInComponentEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof ActorInComponentEditPart) {

+			return ((ActorInComponentEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof ConstraintInPackageEditPart) {

+			return ((ConstraintInPackageEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof ActorInPackageEditPart) {

+			return ((ActorInPackageEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof UseCaseInPackageEditPart) {

+			return ((UseCaseInPackageEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof ComponentInPackageEditPart) {

+			return ((ComponentInPackageEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof PackageEditPartCN) {

+			return ((PackageEditPartCN) targetEditPart)

+					.getMATypesForSource(relationshipType);

 		}

 		return Collections.EMPTY_LIST;

 	}

@@ -420,67 +499,89 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 	/**

 	 * @generated

 	 */

-	public List getTypesForTarget(IAdaptable source, IElementType relationshipType) {

-		IGraphicalEditPart sourceEditPart = (IGraphicalEditPart)source.getAdapter(IGraphicalEditPart.class);

-		if(sourceEditPart instanceof ActorEditPartTN) {

-			return ((ActorEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof ActorAsRectangleEditPartTN) {

-			return ((ActorAsRectangleEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof UseCaseEditPartTN) {

-			return ((UseCaseEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof UseCaseAsRectangleEditPartTN) {

-			return ((UseCaseAsRectangleEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof SubjectComponentEditPartTN) {

-			return ((SubjectComponentEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof SubjectClassEditPartTN) {

-			return ((SubjectClassEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof SubjectInterfaceEditPartTN) {

-			return ((SubjectInterfaceEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof PackageEditPartTN) {

-			return ((PackageEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof ConstraintEditPartTN) {

-			return ((ConstraintEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof CommentEditPartTN) {

-			return ((CommentEditPartTN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof UseCaseInComponentEditPart) {

-			return ((UseCaseInComponentEditPart)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof ComponentInComponentEditPart) {

-			return ((ComponentInComponentEditPart)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof CommentEditPartCN) {

-			return ((CommentEditPartCN)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof ConstraintInComponentEditPart) {

-			return ((ConstraintInComponentEditPart)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof ActorInComponentEditPart) {

-			return ((ActorInComponentEditPart)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof ConstraintInPackageEditPart) {

-			return ((ConstraintInPackageEditPart)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof ActorInPackageEditPart) {

-			return ((ActorInPackageEditPart)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof UseCaseInPackageEditPart) {

-			return ((UseCaseInPackageEditPart)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof ComponentInPackageEditPart) {

-			return ((ComponentInPackageEditPart)sourceEditPart).getMATypesForTarget(relationshipType);

-		}

-		if(sourceEditPart instanceof PackageEditPartCN) {

-			return ((PackageEditPartCN)sourceEditPart).getMATypesForTarget(relationshipType);

+	public List getTypesForTarget(IAdaptable source,

+			IElementType relationshipType) {

+		IGraphicalEditPart sourceEditPart = (IGraphicalEditPart) source

+				.getAdapter(IGraphicalEditPart.class);

+		if (sourceEditPart instanceof ActorEditPartTN) {

+			return ((ActorEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof ActorAsRectangleEditPartTN) {

+			return ((ActorAsRectangleEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof UseCaseEditPartTN) {

+			return ((UseCaseEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof UseCaseAsRectangleEditPartTN) {

+			return ((UseCaseAsRectangleEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SubjectComponentEditPartTN) {

+			return ((SubjectComponentEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SubjectClassEditPartTN) {

+			return ((SubjectClassEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SubjectInterfaceEditPartTN) {

+			return ((SubjectInterfaceEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof PackageEditPartTN) {

+			return ((PackageEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof ConstraintEditPartTN) {

+			return ((ConstraintEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof CommentEditPartTN) {

+			return ((CommentEditPartTN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof UseCaseInComponentEditPart) {

+			return ((UseCaseInComponentEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof ComponentInComponentEditPart) {

+			return ((ComponentInComponentEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof CommentEditPartCN) {

+			return ((CommentEditPartCN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof ConstraintInComponentEditPart) {

+			return ((ConstraintInComponentEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof ActorInComponentEditPart) {

+			return ((ActorInComponentEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof ConstraintInPackageEditPart) {

+			return ((ConstraintInPackageEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof ActorInPackageEditPart) {

+			return ((ActorInPackageEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof UseCaseInPackageEditPart) {

+			return ((UseCaseInPackageEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof ComponentInPackageEditPart) {

+			return ((ComponentInPackageEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof PackageEditPartCN) {

+			return ((PackageEditPartCN) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

 		}

 		return Collections.EMPTY_LIST;

 	}

@@ -488,47 +589,55 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 	/**

 	 * @generated

 	 */

-	public EObject selectExistingElementForSource(IAdaptable target, IElementType relationshipType) {

-		return selectExistingElement(target, getTypesForSource(target, relationshipType));

+	public EObject selectExistingElementForSource(IAdaptable target,

+			IElementType relationshipType) {

+		return selectExistingElement(target,

+				getTypesForSource(target, relationshipType));

 	}

 

 	/**

 	 * @generated

 	 */

-	public EObject selectExistingElementForTarget(IAdaptable source, IElementType relationshipType) {

-		return selectExistingElement(source, getTypesForTarget(source, relationshipType));

+	public EObject selectExistingElementForTarget(IAdaptable source,

+			IElementType relationshipType) {

+		return selectExistingElement(source,

+				getTypesForTarget(source, relationshipType));

 	}

 

 	/**

 	 * @generated

 	 */

 	protected EObject selectExistingElement(IAdaptable host, Collection types) {

-		if(types.isEmpty()) {

+		if (types.isEmpty()) {

 			return null;

 		}

-		IGraphicalEditPart editPart = (IGraphicalEditPart)host.getAdapter(IGraphicalEditPart.class);

-		if(editPart == null) {

+		IGraphicalEditPart editPart = (IGraphicalEditPart) host

+				.getAdapter(IGraphicalEditPart.class);

+		if (editPart == null) {

 			return null;

 		}

-		Diagram diagram = (Diagram)editPart.getRoot().getContents().getModel();

+		Diagram diagram = (Diagram) editPart.getRoot().getContents().getModel();

 		HashSet<EObject> elements = new HashSet<EObject>();

-		for(Iterator<EObject> it = diagram.getElement().eAllContents(); it.hasNext();) {

+		for (Iterator<EObject> it = diagram.getElement().eAllContents(); it

+				.hasNext();) {

 			EObject element = it.next();

-			if(isApplicableElement(element, types)) {

+			if (isApplicableElement(element, types)) {

 				elements.add(element);

 			}

 		}

-		if(elements.isEmpty()) {

+		if (elements.isEmpty()) {

 			return null;

 		}

-		return selectElement((EObject[])elements.toArray(new EObject[elements.size()]));

+		return selectElement((EObject[]) elements.toArray(new EObject[elements

+				.size()]));

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean isApplicableElement(EObject element, Collection types) {

-		IElementType type = ElementTypeRegistry.getInstance().getElementType(element);

+		IElementType type = ElementTypeRegistry.getInstance().getElementType(

+				element);

 		return types.contains(type);

 	}

 

@@ -537,15 +646,18 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 	 */

 	protected EObject selectElement(EObject[] elements) {

 		Shell shell = Display.getCurrent().getActiveShell();

-		ILabelProvider labelProvider = new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

-		ElementListSelectionDialog dialog = new ElementListSelectionDialog(shell, labelProvider);

+		ILabelProvider labelProvider = new AdapterFactoryLabelProvider(

+				UMLDiagramEditorPlugin.getInstance()

+						.getItemProvidersAdapterFactory());

+		ElementListSelectionDialog dialog = new ElementListSelectionDialog(

+				shell, labelProvider);

 		dialog.setMessage(Messages.UMLModelingAssistantProviderMessage);

 		dialog.setTitle(Messages.UMLModelingAssistantProviderTitle);

 		dialog.setMultipleSelection(false);

 		dialog.setElements(elements);

 		EObject selected = null;

-		if(dialog.open() == Window.OK) {

-			selected = (EObject)dialog.getFirstResult();

+		if (dialog.open() == Window.OK) {

+			selected = (EObject) dialog.getFirstResult();

 		}

 		return selected;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
index 9f3015e8619..472426652af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
@@ -77,7 +77,8 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**

  * @generated

  */

-public class UMLParserProvider extends AbstractProvider implements IParserProvider {

+public class UMLParserProvider extends AbstractProvider implements

+		IParserProvider {

 

 	/**

 	 * @generated

@@ -88,8 +89,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorName_5014Parser() {

-		if(actorName_5014Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (actorName_5014Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			actorName_5014Parser = parser;

 		}

@@ -105,7 +107,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorLabel_6029Parser() {

-		if(actorLabel_6029Parser == null) {

+		if (actorLabel_6029Parser == null) {

 			actorLabel_6029Parser = new AppliedStereotypeParser();

 		}

 		return actorLabel_6029Parser;

@@ -120,8 +122,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorName_5015Parser() {

-		if(actorName_5015Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (actorName_5015Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			actorName_5015Parser = parser;

 		}

@@ -137,8 +140,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUseCaseName_5016Parser() {

-		if(useCaseName_5016Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (useCaseName_5016Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			useCaseName_5016Parser = parser;

 		}

@@ -154,8 +158,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUseCaseName_5017Parser() {

-		if(useCaseName_5017Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (useCaseName_5017Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			useCaseName_5017Parser = parser;

 		}

@@ -171,8 +176,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getComponentName_5019Parser() {

-		if(componentName_5019Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (componentName_5019Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			componentName_5019Parser = parser;

 		}

@@ -188,8 +194,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getClassName_6037Parser() {

-		if(className_6037Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (className_6037Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			className_6037Parser = parser;

 		}

@@ -205,8 +212,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInterfaceName_6038Parser() {

-		if(interfaceName_6038Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (interfaceName_6038Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interfaceName_6038Parser = parser;

 		}

@@ -222,8 +230,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPackageName_5025Parser() {

-		if(packageName_5025Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (packageName_5025Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			packageName_5025Parser = parser;

 		}

@@ -239,8 +248,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConstraintName_5026Parser() {

-		if(constraintName_5026Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (constraintName_5026Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			constraintName_5026Parser = parser;

 		}

@@ -256,7 +266,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCommentBody_5027Parser() {

-		if(commentBody_5027Parser == null) {

+		if (commentBody_5027Parser == null) {

 			commentBody_5027Parser = new CommentParser();

 		}

 		return commentBody_5027Parser;

@@ -271,8 +281,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDiagramName_5032Parser() {

-		if(diagramName_5032Parser == null) {

-			EAttribute[] features = new EAttribute[]{ NotationPackage.eINSTANCE.getDiagram_Name() };

+		if (diagramName_5032Parser == null) {

+			EAttribute[] features = new EAttribute[] { NotationPackage.eINSTANCE

+					.getDiagram_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			diagramName_5032Parser = parser;

 		}

@@ -288,8 +299,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getExtensionPoint_3007Parser() {

-		if(extensionPoint_3007Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (extensionPoint_3007Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			extensionPoint_3007Parser = parser;

 		}

@@ -305,8 +317,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getExtensionPoint_3008Parser() {

-		if(extensionPoint_3008Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (extensionPoint_3008Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			extensionPoint_3008Parser = parser;

 		}

@@ -322,8 +335,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUseCaseName_5018Parser() {

-		if(useCaseName_5018Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (useCaseName_5018Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			useCaseName_5018Parser = parser;

 		}

@@ -339,8 +353,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getComponentName_5030Parser() {

-		if(componentName_5030Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (componentName_5030Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			componentName_5030Parser = parser;

 		}

@@ -356,7 +371,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCommentBody_5028Parser() {

-		if(commentBody_5028Parser == null) {

+		if (commentBody_5028Parser == null) {

 			commentBody_5028Parser = new CommentParser();

 		}

 		return commentBody_5028Parser;

@@ -371,8 +386,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConstraintName_5029Parser() {

-		if(constraintName_5029Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (constraintName_5029Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			constraintName_5029Parser = parser;

 		}

@@ -388,8 +404,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorName_5031Parser() {

-		if(actorName_5031Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (actorName_5031Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			actorName_5031Parser = parser;

 		}

@@ -405,7 +422,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorLabel_6027Parser() {

-		if(actorLabel_6027Parser == null) {

+		if (actorLabel_6027Parser == null) {

 			actorLabel_6027Parser = new AppliedStereotypeParser();

 		}

 		return actorLabel_6027Parser;

@@ -420,8 +437,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConstraintName_5020Parser() {

-		if(constraintName_5020Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (constraintName_5020Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			constraintName_5020Parser = parser;

 		}

@@ -437,8 +455,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorName_5021Parser() {

-		if(actorName_5021Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (actorName_5021Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			actorName_5021Parser = parser;

 		}

@@ -454,7 +473,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorLabel_6028Parser() {

-		if(actorLabel_6028Parser == null) {

+		if (actorLabel_6028Parser == null) {

 			actorLabel_6028Parser = new AppliedStereotypeParser();

 		}

 		return actorLabel_6028Parser;

@@ -469,8 +488,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUseCaseName_5022Parser() {

-		if(useCaseName_5022Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (useCaseName_5022Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			useCaseName_5022Parser = parser;

 		}

@@ -486,8 +506,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getComponentName_5023Parser() {

-		if(componentName_5023Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (componentName_5023Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			componentName_5023Parser = parser;

 		}

@@ -503,8 +524,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPackageName_5024Parser() {

-		if(packageName_5024Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (packageName_5024Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			packageName_5024Parser = parser;

 		}

@@ -520,7 +542,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getIncludeLabel_6030Parser() {

-		if(includeLabel_6030Parser == null) {

+		if (includeLabel_6030Parser == null) {

 			includeLabel_6030Parser = new AppliedStereotypeParser();

 		}

 		return includeLabel_6030Parser;

@@ -535,7 +557,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getExtendLabel_6031Parser() {

-		if(extendLabel_6031Parser == null) {

+		if (extendLabel_6031Parser == null) {

 			extendLabel_6031Parser = new AppliedStereotypeParser();

 		}

 		return extendLabel_6031Parser;

@@ -550,7 +572,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getGeneralizationLabel_6032Parser() {

-		if(generalizationLabel_6032Parser == null) {

+		if (generalizationLabel_6032Parser == null) {

 			generalizationLabel_6032Parser = new AppliedStereotypeParser();

 		}

 		return generalizationLabel_6032Parser;

@@ -565,8 +587,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getAssociationName_6008Parser() {

-		if(associationName_6008Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (associationName_6008Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			associationName_6008Parser = parser;

 		}

@@ -582,7 +605,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getAssociationLabel_6033Parser() {

-		if(associationLabel_6033Parser == null) {

+		if (associationLabel_6033Parser == null) {

 			associationLabel_6033Parser = new AppliedStereotypeParser();

 		}

 		return associationLabel_6033Parser;

@@ -597,8 +620,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDependencyName_6010Parser() {

-		if(dependencyName_6010Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (dependencyName_6010Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			dependencyName_6010Parser = parser;

 		}

@@ -614,7 +638,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDependencyLabel_6034Parser() {

-		if(dependencyLabel_6034Parser == null) {

+		if (dependencyLabel_6034Parser == null) {

 			dependencyLabel_6034Parser = new AppliedStereotypeParser();

 		}

 		return dependencyLabel_6034Parser;

@@ -629,8 +653,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getAbstractionName_6011Parser() {

-		if(abstractionName_6011Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (abstractionName_6011Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			abstractionName_6011Parser = parser;

 		}

@@ -646,7 +671,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getAbstractionLabel_6014Parser() {

-		if(abstractionLabel_6014Parser == null) {

+		if (abstractionLabel_6014Parser == null) {

 			abstractionLabel_6014Parser = new AppliedStereotypeParser();

 		}

 		return abstractionLabel_6014Parser;

@@ -661,8 +686,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUsageName_6012Parser() {

-		if(usageName_6012Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (usageName_6012Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			usageName_6012Parser = parser;

 		}

@@ -678,7 +704,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUsageLabel_6013Parser() {

-		if(usageLabel_6013Parser == null) {

+		if (usageLabel_6013Parser == null) {

 			usageLabel_6013Parser = new AppliedStereotypeParser();

 		}

 		return usageLabel_6013Parser;

@@ -693,8 +719,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getRealizationName_6015Parser() {

-		if(realizationName_6015Parser == null) {

-			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+		if (realizationName_6015Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE

+					.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			realizationName_6015Parser = parser;

 		}

@@ -710,7 +737,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getRealizationLabel_6035Parser() {

-		if(realizationLabel_6035Parser == null) {

+		if (realizationLabel_6035Parser == null) {

 			realizationLabel_6035Parser = new AppliedStereotypeParser();

 		}

 		return realizationLabel_6035Parser;

@@ -725,7 +752,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPackageMergeLabel_0Parser() {

-		if(packageMergeLabel_0Parser == null) {

+		if (packageMergeLabel_0Parser == null) {

 			packageMergeLabel_0Parser = new AppliedStereotypeParser();

 		}

 		return packageMergeLabel_0Parser;

@@ -740,7 +767,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPackageImportLabel_6036Parser() {

-		if(packageImportLabel_6036Parser == null) {

+		if (packageImportLabel_6036Parser == null) {

 			packageImportLabel_6036Parser = new AppliedStereotypeParser();

 		}

 		return packageImportLabel_6036Parser;

@@ -750,7 +777,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	protected IParser getParser(int visualID) {

-		switch(visualID) {

+		switch (visualID) {

 		case ActorNameEditPartTN.VISUAL_ID:

 			return getActorName_5014Parser();

 		case ActorAppliedStereotypeEditPartTN.VISUAL_ID:

@@ -842,20 +869,22 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * 

 	 * @generated

 	 */

-	public static IParser getParser(IElementType type, EObject object, String parserHint) {

-		return ParserService.getInstance().getParser(new HintAdapter(type, object, parserHint));

+	public static IParser getParser(IElementType type, EObject object,

+			String parserHint) {

+		return ParserService.getInstance().getParser(

+				new HintAdapter(type, object, parserHint));

 	}

 

 	/**

 	 * @generated

 	 */

 	public IParser getParser(IAdaptable hint) {

-		String vid = (String)hint.getAdapter(String.class);

-		if(vid != null) {

+		String vid = (String) hint.getAdapter(String.class);

+		if (vid != null) {

 			return getParser(UMLVisualIDRegistry.getVisualID(vid));

 		}

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

-		if(view != null) {

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

+		if (view != null) {

 			return getParser(UMLVisualIDRegistry.getVisualID(view));

 		}

 		return null;

@@ -865,9 +894,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	public boolean provides(IOperation operation) {

-		if(operation instanceof GetParserOperation) {

-			IAdaptable hint = ((GetParserOperation)operation).getHint();

-			if(UMLElementTypes.getElement(hint) == null) {

+		if (operation instanceof GetParserOperation) {

+			IAdaptable hint = ((GetParserOperation) operation).getHint();

+			if (UMLElementTypes.getElement(hint) == null) {

 				return false;

 			}

 			return getParser(hint) != null;

@@ -898,7 +927,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 		 * @generated

 		 */

 		public Object getAdapter(Class adapter) {

-			if(IElementType.class.equals(adapter)) {

+			if (IElementType.class.equals(adapter)) {

 				return elementType;

 			}

 			return super.getAdapter(adapter);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java
index 4da56aa9864..aede2fcef57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java
@@ -19,27 +19,31 @@ import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;
 /**

  * @generated

  */

-public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider implements IDecoratorProvider {

+public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider

+		implements IDecoratorProvider {

 

 	/**

 	 * @generated

 	 */

 	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 UMLDiagramEditor) {

-				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

+			if (((DiagramEditDomain) ed).getEditorPart() instanceof UMLDiagramEditor) {

+				decoratorTarget.installDecorator(KEY, new StatusDecorator(

+						decoratorTarget));

 			}

 		}

 	}

@@ -48,11 +52,14 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider
 	 * @generated

 	 */

 	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);

-		return view != null && UseCaseDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

+		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation)

+				.getDecoratorTarget();

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

+		return view != null

+				&& UseCaseDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry

+						.getModelID(view));

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java
index 10f544c3eb9..d1af2144369 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java
@@ -26,10 +26,10 @@ public class UMLValidationProvider {
 	/**

 	 * @generated

 	 */

-	public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) {

+	public static void runWithConstraints(

+			TransactionalEditingDomain editingDomain, Runnable operation) {

 		final Runnable op = operation;

 		Runnable task = new Runnable() {

-

 			public void run() {

 				try {

 					constraintsActive = true;

@@ -39,11 +39,12 @@ public class UMLValidationProvider {
 				}

 			}

 		};

-		if(editingDomain != null) {

+		if (editingDomain != null) {

 			try {

 				editingDomain.runExclusive(task);

 			} catch (Exception e) {

-				UMLDiagramEditorPlugin.getInstance().logError("Validation failed", e); //$NON-NLS-1$

+				UMLDiagramEditorPlugin.getInstance().logError(

+						"Validation failed", e); //$NON-NLS-1$

 			}

 		} else {

 			task.run();

@@ -54,11 +55,14 @@ public class UMLValidationProvider {
 	 * @generated

 	 */

 	static boolean isInDefaultEditorContext(Object object) {

-		if(shouldConstraintsBePrivate() && !constraintsActive) {

+		if (shouldConstraintsBePrivate() && !constraintsActive) {

 			return false;

 		}

-		if(object instanceof View) {

-			return constraintsActive && UseCaseDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View)object));

+		if (object instanceof View) {

+			return constraintsActive

+					&& UseCaseDiagramEditPart.MODEL_ID

+							.equals(UMLVisualIDRegistry

+									.getModelID((View) object));

 		}

 		return true;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
index 33271a4d060..bfc672dd202 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
@@ -156,16 +156,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	public final boolean provides(IOperation operation) {

-		if(operation instanceof CreateViewForKindOperation) {

-			return provides((CreateViewForKindOperation)operation);

+		if (operation instanceof CreateViewForKindOperation) {

+			return provides((CreateViewForKindOperation) operation);

 		}

 		assert operation instanceof CreateViewOperation;

-		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;

 	}

@@ -175,20 +175,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */

 	protected boolean provides(CreateViewForKindOperation op) {

 		/*

-		 * if (op.getViewKind() == Node.class)

-		 * return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

-		 * if (op.getViewKind() == Edge.class)

-		 * return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+		 if (op.getViewKind() == Node.class)

+		 return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+		 if (op.getViewKind() == Edge.class)

+		 return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

 		 */

+

 		// check Diagram Type should be the class diagram

 		String modelID = UMLVisualIDRegistry.getModelID(op.getContainerView());

-		if(!getDiagramProvidedId().equals(modelID)) {

+		if (!getDiagramProvidedId().equals(modelID)) {

 			return false;

 		}

+

 		int visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

-		if(Node.class.isAssignableFrom(op.getViewKind())) {

-			return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID);

+		if (Node.class.isAssignableFrom(op.getViewKind())) {

+			return UMLVisualIDRegistry.canCreateNode(op.getContainerView(),

+					visualID);

 		}

+

 		return true;

 	}

 

@@ -208,45 +212,54 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected boolean provides(CreateDiagramViewOperation op) {

-		return UseCaseDiagramEditPart.MODEL_ID.equals(op.getSemanticHint()) && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != -1;

+		return UseCaseDiagramEditPart.MODEL_ID.equals(op.getSemanticHint())

+				&& UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op

+						.getSemanticAdapter())) != -1;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean provides(CreateNodeViewOperation op) {

-		if(op.getContainerView() == null) {

+		if (op.getContainerView() == null) {

 			return false;

 		}

-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());

+		IElementType elementType = getSemanticElementType(op

+				.getSemanticAdapter());

 		EObject domainElement = getSemanticElement(op.getSemanticAdapter());

 		int visualID;

-		if(op.getSemanticHint() == null) {

+		if (op.getSemanticHint() == null) {

 			// Semantic hint is not specified. Can be a result of call from CanonicalEditPolicy.

 			// In this situation there should be NO elementType, visualID will be determined

 			// by VisualIDRegistry.getNodeVisualID() for domainElement.

-			if(elementType != null || domainElement == null) {

+			if (elementType != null || domainElement == null) {

 				return false;

 			}

-			visualID = UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement);

+			visualID = UMLVisualIDRegistry.getNodeVisualID(

+					op.getContainerView(), domainElement);

 		} else {

 			visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

-			if(elementType != null) {

-				if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

+			if (elementType != null) {

+				if (!UMLElementTypes.isKnownElementType(elementType)

+						|| (!(elementType instanceof IHintedType))) {

 					return false; // foreign element type

 				}

-				String elementTypeHint = ((IHintedType)elementType).getSemanticHint();

-				if(!op.getSemanticHint().equals(elementTypeHint)) {

+				String elementTypeHint = ((IHintedType) elementType)

+						.getSemanticHint();

+				if (!op.getSemanticHint().equals(elementTypeHint)) {

 					return false; // if semantic hint is specified it should be the same as in element type

 				}

-				if(domainElement != null && visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {

+				if (domainElement != null

+						&& visualID != UMLVisualIDRegistry.getNodeVisualID(

+								op.getContainerView(), domainElement)) {

 					return false; // visual id for node EClass should match visual id from element type

 				}

 			} else {

-				if(!UseCaseDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

+				if (!UseCaseDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry

+						.getModelID(op.getContainerView()))) {

 					return false; // foreign diagram

 				}

-				switch(visualID) {

+				switch (visualID) {

 				case ActorEditPartTN.VISUAL_ID:

 				case UseCaseEditPartTN.VISUAL_ID:

 				case SubjectComponentEditPartTN.VISUAL_ID:

@@ -270,7 +283,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				case UseCaseInPackageEditPart.VISUAL_ID:

 				case ComponentInPackageEditPart.VISUAL_ID:

 				case PackageEditPartCN.VISUAL_ID:

-					if(domainElement == null || visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {

+					if (domainElement == null

+							|| visualID != UMLVisualIDRegistry.getNodeVisualID(

+									op.getContainerView(), domainElement)) {

 						return false; // visual id in semantic hint should match visual id for domain element

 					}

 					break;

@@ -279,24 +294,52 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				}

 			}

 		}

-		return ActorEditPartTN.VISUAL_ID == visualID || ActorAsRectangleEditPartTN.VISUAL_ID == visualID || UseCaseEditPartTN.VISUAL_ID == visualID || UseCaseAsRectangleEditPartTN.VISUAL_ID == visualID || SubjectComponentEditPartTN.VISUAL_ID == visualID || SubjectClassEditPartTN.VISUAL_ID == visualID || SubjectInterfaceEditPartTN.VISUAL_ID == visualID || PackageEditPartTN.VISUAL_ID == visualID || ConstraintEditPartTN.VISUAL_ID == visualID || CommentEditPartTN.VISUAL_ID == visualID || ShortCutDiagramEditPart.VISUAL_ID == visualID || ExtensionPointEditPart.VISUAL_ID == visualID || ExtensionPointInRectangleEditPart.VISUAL_ID == visualID || UseCaseInComponentEditPart.VISUAL_ID == visualID || ComponentInComponentEditPart.VISUAL_ID == visualID || CommentEditPartCN.VISUAL_ID == visualID || ConstraintInComponentEditPart.VISUAL_ID == visualID || ActorInComponentEditPart.VISUAL_ID == visualID || ConstraintInPackageEditPart.VISUAL_ID == visualID || ActorInPackageEditPart.VISUAL_ID == visualID || UseCaseInPackageEditPart.VISUAL_ID == visualID || ComponentInPackageEditPart.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID;

+		return ActorEditPartTN.VISUAL_ID == visualID

+				|| ActorAsRectangleEditPartTN.VISUAL_ID == visualID

+				|| UseCaseEditPartTN.VISUAL_ID == visualID

+				|| UseCaseAsRectangleEditPartTN.VISUAL_ID == visualID

+				|| SubjectComponentEditPartTN.VISUAL_ID == visualID

+				|| SubjectClassEditPartTN.VISUAL_ID == visualID

+				|| SubjectInterfaceEditPartTN.VISUAL_ID == visualID

+				|| PackageEditPartTN.VISUAL_ID == visualID

+				|| ConstraintEditPartTN.VISUAL_ID == visualID

+				|| CommentEditPartTN.VISUAL_ID == visualID

+				|| ShortCutDiagramEditPart.VISUAL_ID == visualID

+				|| ExtensionPointEditPart.VISUAL_ID == visualID

+				|| ExtensionPointInRectangleEditPart.VISUAL_ID == visualID

+				|| UseCaseInComponentEditPart.VISUAL_ID == visualID

+				|| ComponentInComponentEditPart.VISUAL_ID == visualID

+				|| CommentEditPartCN.VISUAL_ID == visualID

+				|| ConstraintInComponentEditPart.VISUAL_ID == visualID

+				|| ActorInComponentEditPart.VISUAL_ID == visualID

+				|| ConstraintInPackageEditPart.VISUAL_ID == visualID

+				|| ActorInPackageEditPart.VISUAL_ID == visualID

+				|| UseCaseInPackageEditPart.VISUAL_ID == visualID

+				|| ComponentInPackageEditPart.VISUAL_ID == visualID

+				|| PackageEditPartCN.VISUAL_ID == visualID;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean provides(CreateEdgeViewOperation op) {

-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());

-		if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

+		IElementType elementType = getSemanticElementType(op

+				.getSemanticAdapter());

+		if (!UMLElementTypes.isKnownElementType(elementType)

+				|| (!(elementType instanceof IHintedType))) {

 			return false; // foreign element type

 		}

-		String elementTypeHint = ((IHintedType)elementType).getSemanticHint();

-		if(elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {

+		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

+		if (elementTypeHint == null

+				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op

+						.getSemanticHint()))) {

 			return false; // our hint is visual id and must be specified, and it should be the same as in element type

 		}

 		int visualID = UMLVisualIDRegistry.getVisualID(elementTypeHint);

 		EObject domainElement = getSemanticElement(op.getSemanticAdapter());

-		if(domainElement != null && visualID != UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement)) {

+		if (domainElement != null

+				&& visualID != UMLVisualIDRegistry

+						.getLinkWithClassVisualID(domainElement)) {

 			return false; // visual id for link EClass should match visual id from element type

 		}

 		return true;

@@ -305,7 +348,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Diagram createDiagram(IAdaptable semanticAdapter, String diagramKind, PreferencesHint preferencesHint) {

+	public Diagram createDiagram(IAdaptable semanticAdapter,

+			String diagramKind, PreferencesHint preferencesHint) {

 		Diagram diagram = NotationFactory.eINSTANCE.createDiagram();

 		diagram.getStyles().add(NotationFactory.eINSTANCE.createDiagramStyle());

 		diagram.setType(UseCaseDiagramEditPart.MODEL_ID);

@@ -317,61 +361,87 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createNode(IAdaptable semanticAdapter, View containerView,

+			String semanticHint, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		final EObject domainElement = getSemanticElement(semanticAdapter);

 		final int visualID;

-		if(semanticHint == null) {

-			visualID = UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

+		if (semanticHint == null) {

+			visualID = UMLVisualIDRegistry.getNodeVisualID(containerView,

+					domainElement);

 		} else {

 			visualID = UMLVisualIDRegistry.getVisualID(semanticHint);

 		}

-		switch(visualID) {

+		switch (visualID) {

 		case ActorEditPartTN.VISUAL_ID:

-			return createActor_2011(domainElement, containerView, index, persisted, preferencesHint);

+			return createActor_2011(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ActorAsRectangleEditPartTN.VISUAL_ID:

-			return createActor_2012(domainElement, containerView, index, persisted, preferencesHint);

+			return createActor_2012(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case UseCaseEditPartTN.VISUAL_ID:

-			return createUseCase_2013(domainElement, containerView, index, persisted, preferencesHint);

+			return createUseCase_2013(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case UseCaseAsRectangleEditPartTN.VISUAL_ID:

-			return createUseCase_2014(domainElement, containerView, index, persisted, preferencesHint);

+			return createUseCase_2014(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case SubjectComponentEditPartTN.VISUAL_ID:

-			return createComponent_2015(domainElement, containerView, index, persisted, preferencesHint);

+			return createComponent_2015(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case SubjectClassEditPartTN.VISUAL_ID:

-			return createClass_2020(domainElement, containerView, index, persisted, preferencesHint);

+			return createClass_2020(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case SubjectInterfaceEditPartTN.VISUAL_ID:

-			return createInterface_2021(domainElement, containerView, index, persisted, preferencesHint);

+			return createInterface_2021(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case PackageEditPartTN.VISUAL_ID:

-			return createPackage_2016(domainElement, containerView, index, persisted, preferencesHint);

+			return createPackage_2016(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ConstraintEditPartTN.VISUAL_ID:

-			return createConstraint_2017(domainElement, containerView, index, persisted, preferencesHint);

+			return createConstraint_2017(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case CommentEditPartTN.VISUAL_ID:

-			return createComment_2018(domainElement, containerView, index, persisted, preferencesHint);

+			return createComment_2018(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ShortCutDiagramEditPart.VISUAL_ID:

-			return createDiagram_2019(domainElement, containerView, index, persisted, preferencesHint);

+			return createDiagram_2019(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ExtensionPointEditPart.VISUAL_ID:

-			return createExtensionPoint_3007(domainElement, containerView, index, persisted, preferencesHint);

+			return createExtensionPoint_3007(domainElement, containerView,

+					index, persisted, preferencesHint);

 		case ExtensionPointInRectangleEditPart.VISUAL_ID:

-			return createExtensionPoint_3008(domainElement, containerView, index, persisted, preferencesHint);

+			return createExtensionPoint_3008(domainElement, containerView,

+					index, persisted, preferencesHint);

 		case UseCaseInComponentEditPart.VISUAL_ID:

-			return createUseCase_3009(domainElement, containerView, index, persisted, preferencesHint);

+			return createUseCase_3009(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ComponentInComponentEditPart.VISUAL_ID:

-			return createComponent_3016(domainElement, containerView, index, persisted, preferencesHint);

+			return createComponent_3016(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case CommentEditPartCN.VISUAL_ID:

-			return createComment_3015(domainElement, containerView, index, persisted, preferencesHint);

+			return createComment_3015(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ConstraintInComponentEditPart.VISUAL_ID:

-			return createConstraint_3017(domainElement, containerView, index, persisted, preferencesHint);

+			return createConstraint_3017(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ActorInComponentEditPart.VISUAL_ID:

-			return createActor_3018(domainElement, containerView, index, persisted, preferencesHint);

+			return createActor_3018(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ConstraintInPackageEditPart.VISUAL_ID:

-			return createConstraint_3010(domainElement, containerView, index, persisted, preferencesHint);

+			return createConstraint_3010(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ActorInPackageEditPart.VISUAL_ID:

-			return createActor_3011(domainElement, containerView, index, persisted, preferencesHint);

+			return createActor_3011(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case UseCaseInPackageEditPart.VISUAL_ID:

-			return createUseCase_3012(domainElement, containerView, index, persisted, preferencesHint);

+			return createUseCase_3012(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case ComponentInPackageEditPart.VISUAL_ID:

-			return createComponent_3013(domainElement, containerView, index, persisted, preferencesHint);

+			return createComponent_3013(domainElement, containerView, index,

+					persisted, preferencesHint);

 		case PackageEditPartCN.VISUAL_ID:

-			return createPackage_3014(domainElement, containerView, index, persisted, preferencesHint);

+			return createPackage_3014(domainElement, containerView, index,

+					persisted, preferencesHint);

 		}

 		// can't happen, provided #provides(CreateNodeViewOperation) is correct

 		return null;

@@ -380,34 +450,50 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createEdge(IAdaptable semanticAdapter, View containerView,

+			String semanticHint, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		IElementType elementType = getSemanticElementType(semanticAdapter);

-		String elementTypeHint = ((IHintedType)elementType).getSemanticHint();

-		switch(UMLVisualIDRegistry.getVisualID(elementTypeHint)) {

+		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

+		switch (UMLVisualIDRegistry.getVisualID(elementTypeHint)) {

 		case IncludeEditPart.VISUAL_ID:

-			return createInclude_4008(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createInclude_4008(getSemanticElement(semanticAdapter),

+					containerView, index, persisted, preferencesHint);

 		case ExtendEditPart.VISUAL_ID:

-			return createExtend_4009(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createExtend_4009(getSemanticElement(semanticAdapter),

+					containerView, index, persisted, preferencesHint);

 		case GeneralizationEditPart.VISUAL_ID:

-			return createGeneralization_4010(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createGeneralization_4010(

+					getSemanticElement(semanticAdapter), containerView, index,

+					persisted, preferencesHint);

 		case AssociationEditPart.VISUAL_ID:

-			return createAssociation_4011(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createAssociation_4011(getSemanticElement(semanticAdapter),

+					containerView, index, persisted, preferencesHint);

 		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return createConstraintConstrainedElement_4012(containerView, index, persisted, preferencesHint);

+			return createConstraintConstrainedElement_4012(containerView,

+					index, persisted, preferencesHint);

 		case DependencyEditPart.VISUAL_ID:

-			return createDependency_4013(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createDependency_4013(getSemanticElement(semanticAdapter),

+					containerView, index, persisted, preferencesHint);

 		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return createCommentAnnotatedElement_4014(containerView, index, persisted, preferencesHint);

+			return createCommentAnnotatedElement_4014(containerView, index,

+					persisted, preferencesHint);

 		case AbstractionEditPart.VISUAL_ID:

-			return createAbstraction_4015(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createAbstraction_4015(getSemanticElement(semanticAdapter),

+					containerView, index, persisted, preferencesHint);

 		case UsageEditPart.VISUAL_ID:

-			return createUsage_4016(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createUsage_4016(getSemanticElement(semanticAdapter),

+					containerView, index, persisted, preferencesHint);

 		case RealizationEditPart.VISUAL_ID:

-			return createRealization_4017(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createRealization_4017(getSemanticElement(semanticAdapter),

+					containerView, index, persisted, preferencesHint);

 		case PackageMergeEditPart.VISUAL_ID:

-			return createPackageMerge_4018(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createPackageMerge_4018(getSemanticElement(semanticAdapter),

+					containerView, index, persisted, preferencesHint);

 		case PackageImportEditPart.VISUAL_ID:

-			return createPackageImport_4019(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+			return createPackageImport_4019(

+					getSemanticElement(semanticAdapter), containerView, index,

+					persisted, preferencesHint);

 		}

 		// can never happen, provided #provides(CreateEdgeViewOperation) is correct

 		return null;

@@ -416,7 +502,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createActor_2011(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createActor_2011(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ActorEditPartTN.VISUAL_ID));

@@ -424,46 +511,76 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Actor");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Actor");

-		Node label5014 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPartTN.VISUAL_ID));

-		label5014.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5014 = (Location)label5014.getLayoutConstraint();

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Actor");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Actor");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Actor");

+

+		Node label5014 = createLabel(node,

+				UMLVisualIDRegistry.getType(ActorNameEditPartTN.VISUAL_ID));

+		label5014.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+

+		Location location5014 = (Location) label5014.getLayoutConstraint();

 		location5014.setX(0);

 		location5014.setY(5);

-		Node label6029 = createLabel(node, UMLVisualIDRegistry.getType(ActorAppliedStereotypeEditPartTN.VISUAL_ID));

-		label6029.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6029 = (Location)label6029.getLayoutConstraint();

+		Node label6029 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(ActorAppliedStereotypeEditPartTN.VISUAL_ID));

+		label6029.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+

+		Location location6029 = (Location) label6029.getLayoutConstraint();

 		location6029.setX(0);

 		location6029.setY(5);

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createActor_2012(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createActor_2012(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ActorAsRectangleEditPartTN.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ActorAsRectangleEditPartTN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Actor");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Actor");

-		Node label5015 = createLabel(node, UMLVisualIDRegistry.getType(ActorAsRectangleNameEditPartTN.VISUAL_ID));

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Actor");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Actor");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Actor");

+

+		Node label5015 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(ActorAsRectangleNameEditPartTN.VISUAL_ID));

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createUseCase_2013(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createUseCase_2013(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(UseCaseEditPartTN.VISUAL_ID));

@@ -471,443 +588,762 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "UseCase");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "UseCase");

-		Node label5016 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPartTN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(UseCasePointsEditPartTN.VISUAL_ID), false, false, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "UseCase");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "UseCase");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "UseCase");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "UseCase");

+

+		Node label5016 = createLabel(node,

+				UMLVisualIDRegistry.getType(UseCaseNameEditPartTN.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry.getType(UseCasePointsEditPartTN.VISUAL_ID),

+				false, false, true, true);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "UseCase");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createUseCase_2014(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createUseCase_2014(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(UseCaseAsRectangleEditPartTN.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(UseCaseAsRectangleEditPartTN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "UseCase");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "UseCase");

-		Node label5017 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseAsRectangleNameEditPartTN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(UseCasePointsInRectangleEditPart.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "UseCase");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "UseCase");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "UseCase");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "UseCase");

+

+		Node label5017 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(UseCaseAsRectangleNameEditPartTN.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry

+						.getType(UseCasePointsInRectangleEditPart.VISUAL_ID),

+				true, true, true, true);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "UseCase");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createComponent_2015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());

-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		node.getStyles().add(NotationFactory.eINSTANCE.createLineStyle());

+	public Node createComponent_2015(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(SubjectComponentEditPartTN.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(SubjectComponentEditPartTN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Component");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

-		Node label5019 = createLabel(node, UMLVisualIDRegistry.getType(SubjectComponentNameEditPartTN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(SubjectComponentUsecasesEditPart.VISUAL_ID), false, false, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Component");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Component");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Component");

+

+		Node label5019 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(SubjectComponentNameEditPartTN.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry

+						.getType(SubjectComponentUsecasesEditPart.VISUAL_ID),

+				false, false, false, false);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "Component");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createClass_2020(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());

-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		node.getStyles().add(NotationFactory.eINSTANCE.createLineStyle());

+	public Node createClass_2020(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(SubjectClassEditPartTN.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(SubjectClassEditPartTN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Class");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

-		Node label6037 = createLabel(node, UMLVisualIDRegistry.getType(SubjectClassNameEditPartTN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(SubjectClassUsecasesEditPart.VISUAL_ID), false, false, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Class");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Class");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Class");

+

+		Node label6037 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(SubjectClassNameEditPartTN.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry

+						.getType(SubjectClassUsecasesEditPart.VISUAL_ID),

+				false, false, false, false);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "Class");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createInterface_2021(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());

-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		node.getStyles().add(NotationFactory.eINSTANCE.createLineStyle());

+	public Node createInterface_2021(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(SubjectInterfaceEditPartTN.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(SubjectInterfaceEditPartTN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Interface");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

-		Node label6038 = createLabel(node, UMLVisualIDRegistry.getType(SubjectInterfaceNameEditPartTN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(SubjectInterfaceUsecasesEditPart.VISUAL_ID), false, false, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interface");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Interface");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Interface");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Interface");

+

+		Node label6038 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(SubjectInterfaceNameEditPartTN.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry

+						.getType(SubjectInterfaceUsecasesEditPart.VISUAL_ID),

+				false, false, false, false);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "Interface");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createPackage_2016(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createPackage_2016(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(PackageEditPartTN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Package");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Package");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Package");

-		Node label5025 = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPartTN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPart.VISUAL_ID), false, false, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Package");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Package");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Package");

+

+		Node label5025 = createLabel(node,

+				UMLVisualIDRegistry.getType(PackageNameEditPartTN.VISUAL_ID));

+		createCompartment(

+				node,

+				UMLVisualIDRegistry

+						.getType(PackagePackageableElementCompartmentEditPart.VISUAL_ID),

+				false, false, false, false);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "Package");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createConstraint_2017(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createConstraint_2017(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

 		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ConstraintEditPartTN.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ConstraintEditPartTN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

-		Node label5026 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPartTN.VISUAL_ID));

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Constraint");

+

+		Node label5026 = createLabel(node,

+				UMLVisualIDRegistry.getType(ConstraintNameEditPartTN.VISUAL_ID));

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createComment_2018(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComment_2018(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(CommentEditPartTN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Comment");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Comment");

-		Node label5027 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartTN.VISUAL_ID));

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Comment");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Comment");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Comment");

+

+		Node label5027 = createLabel(node,

+				UMLVisualIDRegistry.getType(CommentBodyEditPartTN.VISUAL_ID));

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createDiagram_2019(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDiagram_2019(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ShortCutDiagramEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ShortCutDiagramEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "ShortCutDiagram");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ShortCutDiagram");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "ShortCutDiagram");

-		Node label5032 = createLabel(node, UMLVisualIDRegistry.getType(DiagramNameEditPart.VISUAL_ID));

-		label5032.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5032 = (Location)label5032.getLayoutConstraint();

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "ShortCutDiagram");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "ShortCutDiagram");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "ShortCutDiagram");

+

+		Node label5032 = createLabel(node,

+				UMLVisualIDRegistry.getType(DiagramNameEditPart.VISUAL_ID));

+		label5032.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+

+		Location location5032 = (Location) label5032.getLayoutConstraint();

 		location5032.setX(0);

 		location5032.setY(5);

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createExtensionPoint_3007(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createExtensionPoint_3007(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(ExtensionPointEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ExtensionPointEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExtensionPoint");

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "ExtensionPoint");

+

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "ExtensionPoint");

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "ExtensionPoint");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createExtensionPoint_3008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createExtensionPoint_3008(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(ExtensionPointInRectangleEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ExtensionPointInRectangleEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExtensionPoint");

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "ExtensionPoint");

+

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "ExtensionPoint");

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "ExtensionPoint");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createUseCase_3009(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createUseCase_3009(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(UseCaseInComponentEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(UseCaseInComponentEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "UseCase");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "UseCase");

-		Node label5018 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseInComponentNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(UseCasePointsInComponentEditPart.VISUAL_ID), false, false, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "UseCase");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "UseCase");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "UseCase");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "UseCase");

+

+		Node label5018 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(UseCaseInComponentNameEditPart.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry

+						.getType(UseCasePointsInComponentEditPart.VISUAL_ID),

+				false, false, true, true);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "UseCase");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createComponent_3016(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComponent_3016(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

 		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		node.getStyles().add(NotationFactory.eINSTANCE.createLineStyle());

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ComponentInComponentEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ComponentInComponentEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Component");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

-		Node label5030 = createLabel(node, UMLVisualIDRegistry.getType(ComponentInComponentNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentUsecases2EditPart.VISUAL_ID), false, false, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Component");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Component");

+

+		Node label5030 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(ComponentInComponentNameEditPart.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry

+						.getType(ComponentUsecases2EditPart.VISUAL_ID), false,

+				false, false, false);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "Component");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createComment_3015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComment_3015(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(CommentEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Comment");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Comment");

-		Node label5028 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Comment");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Comment");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Comment");

+

+		Node label5028 = createLabel(node,

+				UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createConstraint_3017(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createConstraint_3017(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

 		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ConstraintInComponentEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ConstraintInComponentEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

-		Node label5029 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintInComponentNameEditPart.VISUAL_ID));

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Constraint");

+

+		Node label5029 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(ConstraintInComponentNameEditPart.VISUAL_ID));

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createActor_3018(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createActor_3018(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ActorInComponentEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ActorInComponentEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Actor");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Actor");

-		Node label5031 = createLabel(node, UMLVisualIDRegistry.getType(ActorInComponentNameEditPart.VISUAL_ID));

-		label5031.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5031 = (Location)label5031.getLayoutConstraint();

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Actor");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Actor");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Actor");

+

+		Node label5031 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(ActorInComponentNameEditPart.VISUAL_ID));

+		label5031.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+

+		Location location5031 = (Location) label5031.getLayoutConstraint();

 		location5031.setX(0);

 		location5031.setY(5);

-		Node label6027 = createLabel(node, UMLVisualIDRegistry.getType(ActorInComponentAppliedStereotypeEditPart.VISUAL_ID));

-		label6027.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6027 = (Location)label6027.getLayoutConstraint();

+		Node label6027 = createLabel(

+				node,

+				UMLVisualIDRegistry

+						.getType(ActorInComponentAppliedStereotypeEditPart.VISUAL_ID));

+		label6027.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+

+		Location location6027 = (Location) label6027.getLayoutConstraint();

 		location6027.setX(0);

 		location6027.setY(5);

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createConstraint_3010(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createConstraint_3010(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

 		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ConstraintInPackageEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ConstraintInPackageEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

-		Node label5020 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintInPackageNameEditPart.VISUAL_ID));

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Constraint");

+

+		Node label5020 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(ConstraintInPackageNameEditPart.VISUAL_ID));

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createActor_3011(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createActor_3011(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ActorInPackageEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ActorInPackageEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Actor");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Actor");

-		Node label5021 = createLabel(node, UMLVisualIDRegistry.getType(ActorInPackageNameEditPart.VISUAL_ID));

-		label5021.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5021 = (Location)label5021.getLayoutConstraint();

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Actor");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Actor");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Actor");

+

+		Node label5021 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(ActorInPackageNameEditPart.VISUAL_ID));

+		label5021.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+

+		Location location5021 = (Location) label5021.getLayoutConstraint();

 		location5021.setX(0);

 		location5021.setY(5);

-		Node label6028 = createLabel(node, UMLVisualIDRegistry.getType(ActorInPackageAppliedStereotypeEditPart.VISUAL_ID));

-		label6028.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6028 = (Location)label6028.getLayoutConstraint();

+		Node label6028 = createLabel(

+				node,

+				UMLVisualIDRegistry

+						.getType(ActorInPackageAppliedStereotypeEditPart.VISUAL_ID));

+		label6028.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+

+		Location location6028 = (Location) label6028.getLayoutConstraint();

 		location6028.setX(0);

 		location6028.setY(5);

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createUseCase_3012(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createUseCase_3012(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(UseCaseInPackageEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(UseCaseInPackageEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "UseCase");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "UseCase");

-		Node label5022 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseInPackageNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(UseCasePointsInPackageEditPart.VISUAL_ID), false, false, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "UseCase");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "UseCase");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "UseCase");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "UseCase");

+

+		Node label5022 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(UseCaseInPackageNameEditPart.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry

+						.getType(UseCasePointsInPackageEditPart.VISUAL_ID),

+				false, false, true, true);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "UseCase");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createComponent_3013(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComponent_3013(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

 		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		node.getStyles().add(NotationFactory.eINSTANCE.createLineStyle());

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ComponentInPackageEditPart.VISUAL_ID));

+		node.setType(UMLVisualIDRegistry

+				.getType(ComponentInPackageEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Component");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

-		Node label5023 = createLabel(node, UMLVisualIDRegistry.getType(ComponentInPackageNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentUsecases3EditPart.VISUAL_ID), false, false, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Component");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Component");

+

+		Node label5023 = createLabel(node,

+				UMLVisualIDRegistry

+						.getType(ComponentInPackageNameEditPart.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry

+						.getType(ComponentUsecases3EditPart.VISUAL_ID), false,

+				false, false, false);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "Component");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createPackage_3014(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createPackage_3014(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.getStyles().add(NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(PackageEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Package");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Package");

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Package");

-		Node label5024 = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartment2EditPart.VISUAL_ID), false, false, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node,

+				prefStore, "Package");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node,

+				prefStore, "Package");

+

+		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node,

+				prefStore, "Package");

+

+		Node label5024 = createLabel(node,

+				UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID));

+		createCompartment(

+				node,

+				UMLVisualIDRegistry

+						.getType(PackagePackageableElementCompartment2EditPart.VISUAL_ID),

+				false, false, false, false);

+

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(

+				node, prefStore, "Package");

+

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createInclude_4008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createInclude_4008(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Edge edge = NotationFactory.eINSTANCE.createEdge();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createRoutingStyle());

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -916,36 +1352,55 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(IncludeEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Include");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "Include");

+

 		//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, "Include");

-		Node label6006 = createLabel(edge, UMLVisualIDRegistry.getType(IncludeLink_fixedEditPart.VISUAL_ID));

-		label6006.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6006 = (Location)label6006.getLayoutConstraint();

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Include");

+

+		Node label6006 = createLabel(edge,

+				UMLVisualIDRegistry

+						.getType(IncludeLink_fixedEditPart.VISUAL_ID));

+		label6006.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6006 = (Location) label6006.getLayoutConstraint();

 		location6006.setX(0);

 		location6006.setY(20);

-		Node label6030 = createLabel(edge, UMLVisualIDRegistry.getType(IncludeAppliedStereotypeEditPart.VISUAL_ID));

-		label6030.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6030 = (Location)label6030.getLayoutConstraint();

+		Node label6030 = createLabel(edge,

+				UMLVisualIDRegistry

+						.getType(IncludeAppliedStereotypeEditPart.VISUAL_ID));

+		label6030.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6030 = (Location) label6030.getLayoutConstraint();

 		location6030.setX(0);

 		location6030.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Include");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "Include");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createExtend_4009(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createExtend_4009(EObject domainElement, View containerView,

+			int index, boolean persisted, PreferencesHint preferencesHint) {

 		Edge edge = NotationFactory.eINSTANCE.createEdge();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createRoutingStyle());

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -954,69 +1409,110 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(ExtendEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Extend");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "Extend");

+

 		//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, "Extend");

-		Node label6007 = createLabel(edge, UMLVisualIDRegistry.getType(ExtendsLink_fixedEditPart.VISUAL_ID));

-		label6007.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6007 = (Location)label6007.getLayoutConstraint();

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Extend");

+

+		Node label6007 = createLabel(edge,

+				UMLVisualIDRegistry

+						.getType(ExtendsLink_fixedEditPart.VISUAL_ID));

+		label6007.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6007 = (Location) label6007.getLayoutConstraint();

 		location6007.setX(0);

 		location6007.setY(20);

-		Node label6031 = createLabel(edge, UMLVisualIDRegistry.getType(ExtendAppliedStereotypeEditPart.VISUAL_ID));

-		label6031.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6031 = (Location)label6031.getLayoutConstraint();

+		Node label6031 = createLabel(edge,

+				UMLVisualIDRegistry

+						.getType(ExtendAppliedStereotypeEditPart.VISUAL_ID));

+		label6031.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6031 = (Location) label6031.getLayoutConstraint();

 		location6031.setX(0);

 		location6031.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Extend");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "Extend");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createGeneralization_4010(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createGeneralization_4010(EObject domainElement,

+			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);

+		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(GeneralizationEditPart.VISUAL_ID));

+		edge.setType(UMLVisualIDRegistry

+				.getType(GeneralizationEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Generalization");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Generalization");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge,

+				prefStore, "Generalization");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "Generalization");

+

 		//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, "Generalization");

-		Node label6032 = createLabel(edge, UMLVisualIDRegistry.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

-		label6032.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6032 = (Location)label6032.getLayoutConstraint();

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Generalization");

+

+		Node label6032 = createLabel(

+				edge,

+				UMLVisualIDRegistry

+						.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

+		label6032.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6032 = (Location) label6032.getLayoutConstraint();

 		location6032.setX(0);

 		location6032.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Generalization");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "Generalization");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createAssociation_4011(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createAssociation_4011(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Edge edge = NotationFactory.eINSTANCE.createEdge();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createRoutingStyle());

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1025,62 +1521,95 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(AssociationEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Association");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "Association");

+

 		//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, "Association");

-		Node label6008 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationNameEditPart.VISUAL_ID));

-		label6008.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6008 = (Location)label6008.getLayoutConstraint();

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Association");

+

+		Node label6008 = createLabel(edge,

+				UMLVisualIDRegistry.getType(AssociationNameEditPart.VISUAL_ID));

+		label6008.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6008 = (Location) label6008.getLayoutConstraint();

 		location6008.setX(0);

 		location6008.setY(40);

-		Node label6033 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationAppliedStereotypeEditPart.VISUAL_ID));

-		label6033.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6033 = (Location)label6033.getLayoutConstraint();

+		Node label6033 = createLabel(

+				edge,

+				UMLVisualIDRegistry

+						.getType(AssociationAppliedStereotypeEditPart.VISUAL_ID));

+		label6033.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6033 = (Location) label6033.getLayoutConstraint();

 		location6033.setX(0);

 		location6033.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Association");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "Association");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createConstraintConstrainedElement_4012(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createConstraintConstrainedElement_4012(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);

+		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(ConstraintConstrainedElementEditPart.VISUAL_ID));

+		edge.setType(UMLVisualIDRegistry

+				.getType(ConstraintConstrainedElementEditPart.VISUAL_ID));

 		edge.setElement(null);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Undefined");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Undefined");

+		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");

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Undefined");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createDependency_4013(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createDependency_4013(EObject domainElement,

+			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);

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1089,63 +1618,97 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(DependencyEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Dependency");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Dependency");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge,

+				prefStore, "Dependency");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "Dependency");

+

 		//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, "Dependency");

-		Node label6010 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID));

-		label6010.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6010 = (Location)label6010.getLayoutConstraint();

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Dependency");

+

+		Node label6010 = createLabel(edge,

+				UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID));

+		label6010.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6010 = (Location) label6010.getLayoutConstraint();

 		location6010.setX(0);

 		location6010.setY(40);

-		Node label6034 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyAppliedStereotypeEditPart.VISUAL_ID));

-		label6034.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6034 = (Location)label6034.getLayoutConstraint();

+		Node label6034 = createLabel(edge,

+				UMLVisualIDRegistry

+						.getType(DependencyAppliedStereotypeEditPart.VISUAL_ID));

+		label6034.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6034 = (Location) label6034.getLayoutConstraint();

 		location6034.setX(0);

 		location6034.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Dependency");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "Dependency");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createCommentAnnotatedElement_4014(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createCommentAnnotatedElement_4014(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);

+		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(CommentAnnotatedElementEditPart.VISUAL_ID));

+		edge.setType(UMLVisualIDRegistry

+				.getType(CommentAnnotatedElementEditPart.VISUAL_ID));

 		edge.setElement(null);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Undefined");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Undefined");

+		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");

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Undefined");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createAbstraction_4015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createAbstraction_4015(EObject domainElement,

+			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);

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1154,36 +1717,57 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(AbstractionEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Abstraction");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Abstraction");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge,

+				prefStore, "Abstraction");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "Abstraction");

+

 		//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, "Abstraction");

-		Node label6011 = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID));

-		label6011.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6011 = (Location)label6011.getLayoutConstraint();

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Abstraction");

+

+		Node label6011 = createLabel(edge,

+				UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID));

+		label6011.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6011 = (Location) label6011.getLayoutConstraint();

 		location6011.setX(0);

 		location6011.setY(40);

-		Node label6014 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeAbstractionEditPart.VISUAL_ID));

-		label6014.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6014 = (Location)label6014.getLayoutConstraint();

+		Node label6014 = createLabel(

+				edge,

+				UMLVisualIDRegistry

+						.getType(AppliedStereotypeAbstractionEditPart.VISUAL_ID));

+		label6014.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6014 = (Location) label6014.getLayoutConstraint();

 		location6014.setX(0);

 		location6014.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Abstraction");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "Abstraction");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createUsage_4016(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createUsage_4016(EObject domainElement, 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);

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1192,36 +1776,57 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(UsageEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Usage");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Usage");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge,

+				prefStore, "Usage");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "Usage");

+

 		//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, "Usage");

-		Node label6012 = createLabel(edge, UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID));

-		label6012.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6012 = (Location)label6012.getLayoutConstraint();

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Usage");

+

+		Node label6012 = createLabel(edge,

+				UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID));

+		label6012.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6012 = (Location) label6012.getLayoutConstraint();

 		location6012.setX(0);

 		location6012.setY(40);

-		Node label6013 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeUsageEditPart.VISUAL_ID));

-		label6013.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6013 = (Location)label6013.getLayoutConstraint();

+		Node label6013 = createLabel(edge,

+				UMLVisualIDRegistry

+						.getType(AppliedStereotypeUsageEditPart.VISUAL_ID));

+		label6013.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6013 = (Location) label6013.getLayoutConstraint();

 		location6013.setX(0);

 		location6013.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Usage");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "Usage");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createRealization_4017(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createRealization_4017(EObject domainElement,

+			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);

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1230,91 +1835,150 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(RealizationEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Realization");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Realization");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge,

+				prefStore, "Realization");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "Realization");

+

 		//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, "Realization");

-		Node label6015 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationNameEditPart.VISUAL_ID));

-		label6015.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6015 = (Location)label6015.getLayoutConstraint();

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "Realization");

+

+		Node label6015 = createLabel(edge,

+				UMLVisualIDRegistry.getType(RealizationNameEditPart.VISUAL_ID));

+		label6015.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6015 = (Location) label6015.getLayoutConstraint();

 		location6015.setX(0);

 		location6015.setY(40);

-		Node label6035 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationAppliedStereotypeEditPart.VISUAL_ID));

-		label6035.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6035 = (Location)label6035.getLayoutConstraint();

+		Node label6035 = createLabel(

+				edge,

+				UMLVisualIDRegistry

+						.getType(RealizationAppliedStereotypeEditPart.VISUAL_ID));

+		label6035.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6035 = (Location) label6035.getLayoutConstraint();

 		location6035.setX(0);

 		location6035.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Realization");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "Realization");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createPackageMerge_4018(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createPackageMerge_4018(EObject domainElement,

+			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);

+		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(PackageMergeEditPart.VISUAL_ID));

+		edge.setType(UMLVisualIDRegistry

+				.getType(PackageMergeEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "PackageMerge");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "PackageMerge");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge,

+				prefStore, "PackageMerge");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "PackageMerge");

+

 		//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, "PackageMerge");

-		Node label0 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypePackageMergeEditPart.VISUAL_ID));

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "PackageMerge");

+

+		Node label0 = createLabel(

+				edge,

+				UMLVisualIDRegistry

+						.getType(AppliedStereotypePackageMergeEditPart.VISUAL_ID));

 		label0.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location0 = (Location)label0.getLayoutConstraint();

+		Location location0 = (Location) label0.getLayoutConstraint();

 		location0.setX(0);

 		location0.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "PackageMerge");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "PackageMerge");

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createPackageImport_4019(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createPackageImport_4019(EObject domainElement,

+			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);

+		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(PackageImportEditPart.VISUAL_ID));

+		edge.setType(UMLVisualIDRegistry

+				.getType(PackageImportEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "PackageImport");

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "PackageImport");

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge,

+				prefStore, "PackageImport");

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge,

+				prefStore, "PackageImport");

+

 		//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, "PackageImport");

-		Node label6036 = createLabel(edge, UMLVisualIDRegistry.getType(PackageImportAppliedStereotypeEditPart.VISUAL_ID));

-		label6036.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6036 = (Location)label6036.getLayoutConstraint();

+

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge,

+				prefStore, "PackageImport");

+

+		Node label6036 = createLabel(

+				edge,

+				UMLVisualIDRegistry

+						.getType(PackageImportAppliedStereotypeEditPart.VISUAL_ID));

+		label6036.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location6036 = (Location) label6036.getLayoutConstraint();

 		location6036.setX(0);

 		location6036.setY(-20);

-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "PackageImport");

+

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(

+				edge, prefStore, "PackageImport");

+

 		return edge;

 	}

 

@@ -1322,10 +1986,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected void stampShortcut(View containerView, Node target) {

-		if(!UseCaseDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) {

-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();

+		if (!UseCaseDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry

+				.getModelID(containerView))) {

+			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE

+					.createEAnnotation();

 			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$

-			shortcutAnnotation.getDetails().put("modelID", UseCaseDiagramEditPart.MODEL_ID); //$NON-NLS-1$

+			shortcutAnnotation.getDetails().put(

+					"modelID", UseCaseDiagramEditPart.MODEL_ID); //$NON-NLS-1$

 			target.getEAnnotations().add(shortcutAnnotation);

 		}

 	}

@@ -1343,27 +2010,31 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	protected Node createCompartment(View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, boolean canFilter) {

+	protected Node createCompartment(View owner, String hint,

+			boolean canCollapse, boolean hasTitle, boolean canSort,

+			boolean canFilter) {

 		//SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();

 		//rv.setShowTitle(showTitle);

 		//rv.setCollapsed(isCollapsed);

 		Node rv;

-		if(canCollapse) {

+		if (canCollapse) {

 			rv = NotationFactory.eINSTANCE.createBasicCompartment();

 		} else {

 			rv = NotationFactory.eINSTANCE.createDecorationNode();

 		}

 		rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		if(hasTitle) {

+

+		if (hasTitle) {

 			TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();

 			ts.setShowTitle(true);

 			rv.getStyles().add(ts);

 		}

-		if(canSort) {

+		if (canSort) {

 			rv.getStyles().add(NotationFactory.eINSTANCE.createSortingStyle());

 		}

-		if(canFilter) {

-			rv.getStyles().add(NotationFactory.eINSTANCE.createFilteringStyle());

+		if (canFilter) {

+			rv.getStyles()

+					.add(NotationFactory.eINSTANCE.createFilteringStyle());

 		}

 		rv.setType(hint);

 		ViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);

@@ -1374,12 +2045,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected EObject getSemanticElement(IAdaptable semanticAdapter) {

-		if(semanticAdapter == null) {

+		if (semanticAdapter == null) {

 			return null;

 		}

-		EObject eObject = (EObject)semanticAdapter.getAdapter(EObject.class);

-		if(eObject != null) {

-			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);

+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);

+		if (eObject != null) {

+			return EMFCoreUtil.resolve(

+					TransactionUtil.getEditingDomain(eObject), eObject);

 		}

 		return null;

 	}

@@ -1388,54 +2060,86 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected IElementType getSemanticElementType(IAdaptable semanticAdapter) {

-		if(semanticAdapter == null) {

+		if (semanticAdapter == null) {

 			return null;

 		}

-		return (IElementType)semanticAdapter.getAdapter(IElementType.class);

+		return (IElementType) semanticAdapter.getAdapter(IElementType.class);

 	}

 

 	/**

 	 * @generated

 	 */

-	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

-		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

-		if(viewFontStyle != null) {

-			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

+	private void initFontStyleFromPrefs(View view,

+			final IPreferenceStore store, String elementName) {

+		String fontConstant = PreferenceConstantHelper.getElementConstant(

+				elementName, PreferenceConstantHelper.FONT);

+		String fontColorConstant = PreferenceConstantHelper.getElementConstant(

+				elementName, PreferenceConstantHelper.COLOR_FONT);

+

+		FontStyle viewFontStyle = (FontStyle) view

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (viewFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(store,

+					fontConstant);

 			viewFontStyle.setFontName(fontData.getName());

 			viewFontStyle.setFontHeight(fontData.getHeight());

 			viewFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

 			viewFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

-			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(store, fontColorConstant);

-			viewFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());

+

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(store, fontColorConstant);

+			viewFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

-		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

-		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

+	private void initForegroundFromPrefs(View view,

+			final IPreferenceStore store, String elementName) {

+		String lineColorConstant = PreferenceConstantHelper.getElementConstant(

+				elementName, PreferenceConstantHelper.COLOR_LINE);

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				store, lineColorConstant);

+		ViewUtil.setStructuralFeatureValue(view,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

 	}

 

 	/**

 	 * @generated

 	 */

-	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

-		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

-		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

-		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

-		fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue());;

-		if(store.getBoolean(gradientPolicyConstant)) {

-			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(gradientColorConstant));

-			fillStyle.setGradient(gradientPreferenceConverter.getGradientData());

-			fillStyle.setTransparency(gradientPreferenceConverter.getTransparency());

+	private void initBackgroundFromPrefs(View view,

+			final IPreferenceStore store, String elementName) {

+		String fillColorConstant = PreferenceConstantHelper.getElementConstant(

+				elementName, PreferenceConstantHelper.COLOR_FILL);

+		String gradientColorConstant = PreferenceConstantHelper

+				.getElementConstant(elementName,

+						PreferenceConstantHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferenceConstantHelper

+				.getElementConstant(elementName,

+						PreferenceConstantHelper.GRADIENT_POLICY);

+

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				store, fillColorConstant);

+		ViewUtil.setStructuralFeatureValue(view,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+

+		FillStyle fillStyle = (FillStyle) view

+				.getStyle(NotationPackage.Literals.FILL_STYLE);

+		fillStyle

+				.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue());

+

+		;

+		if (store.getBoolean(gradientPolicyConstant)) {

+			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(

+					store.getString(gradientColorConstant));

+			fillStyle

+					.setGradient(gradientPreferenceConverter.getGradientData());

+			fillStyle.setTransparency(gradientPreferenceConverter

+					.getTransparency());

 		}

 	}

 }